1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-27 14:57:44 +00:00
Commit graph

791 commits

Author SHA1 Message Date
Adam
586ec3a039
Merge branch 'master' into master 2018-02-03 02:12:35 +11:00
Adam
c156ee2d57 add festival support 2018-02-03 02:11:29 +11:00
Mordred
c4578a4e9e Pretty sure that was not supposed to be a cast 2018-02-01 23:41:27 +01:00
Mordred
ab30d8b344 Fixed zone updates being extremly slow, fixed crash with wrong item reward field, fixed wrong casttime for eventAction 2018-02-01 23:32:59 +01:00
Mordred
7a23d24336
Merge pull request #234 from goaaats/exd_rework
zone, api: Removed old EXD reader
2018-02-01 17:49:35 +01:00
Mordred
2adfdbc47d
Update ActionTeleport.cpp 2018-02-01 17:47:55 +01:00
goaaats
ed9a140ccc Fix cast time 2018-02-01 16:28:14 +01:00
goaaats
4f22c20fa8 Style 2018-02-01 16:28:03 +01:00
Adam
17182d834e update inventory opcodes 2018-02-02 01:23:12 +11:00
Adam
0f50957105 fix session disconnecting issue 2018-02-02 01:22:58 +11:00
goaaats
c460283ca6 Fix for weather crash 2018-02-01 14:50:51 +01:00
Adam
ce032c1345 correct opcode for ActorSetPos 2018-02-01 22:06:02 +11:00
Adam
8362255551 update opcodes 2018-02-01 20:28:04 +11:00
Mordred
8b7779ae67 Changed timestamp(seconds) getter to use std::time internally, should get rid of the DC problem 2018-02-01 00:16:47 +01:00
Mordred
74d119aebc Yet more opcode fixes 2018-01-31 19:20:30 +01:00
Mordred
22f2f029c9 More opcode fixes, updated playerspawn struct 2018-01-31 18:57:04 +01:00
Mordred
56ae3bc583 Various opcodes adjusted 2018-01-31 18:02:23 +01:00
Mordred
458662721c Fixed serverMsg packet 2018-01-31 17:48:12 +01:00
Mordred
7ca987b787 Fixed cras on login due to wrong sociallist packet 2018-01-31 17:24:44 +01:00
Mordred Admin
d40e375e0c Added type for shared_ptr< exdSheet > 2018-01-31 14:55:51 +01:00
goaaats
6793cccaa0
Style 2018-01-31 11:58:29 +01:00
goaaats
8a5d497c21 zone, api: Removed old EXD reader 2018-01-31 11:43:22 +01:00
Mordred
d595515320
Updated some client opcodes 2018-01-31 08:28:14 +01:00
Mordred
416c909e20
Updated various opcodes 2018-01-31 08:22:08 +01:00
Perize
1d82fd6d05 Temp fix for 4.2 shift in action excel 2018-01-31 13:19:07 +09:00
Mordred
ae3011cdce More potential opcode fixes 2018-01-30 23:39:43 +01:00
Mordred
6ec9166f01
Merge pull request #231 from perize/420-network
Correct server opcode (not verified yet)
2018-01-30 22:50:56 +01:00
Mordred
644b73086e
Update Ipcs.h 2018-01-30 22:50:40 +01:00
Adam
379c9eaf24 goat can finish this 2018-01-31 02:06:11 +11:00
Adam
1ce2ca6d65 update generated exd data and some generator fixes 2018-01-31 01:47:58 +11:00
Adam
bc66801c34 actually commit the fixed json... 2018-01-31 01:37:23 +11:00
Adam
8835c5457a update ex.json and take optional param to exd_struct_gen to dat path 2018-01-31 01:37:08 +11:00
Mordred
2ff4084f4e
Removed extra qualifier 2018-01-30 14:47:27 +01:00
Perize
7b4da16e87 Correct server opcode (not verified yet) 2018-01-30 21:20:22 +09:00
Perize
e986477bdb Correct client opcode updatepos 2018-01-30 19:45:39 +09:00
Minho Kang
c4382fcd42 Merge sopcode shift posted by @Adam 2018-01-30 19:41:13 +09:00
Minho Kang
e91546c971 Fix ActionHandler 2018-01-30 19:40:42 +09:00
Mordred Admin
0fc7d293ec Merge remote-tracking branch 'origin/event_rewrite'
Conflicts:
	src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
2018-01-30 07:53:15 +01:00
Mordred
53b499de23 Minor cleanup of InstanceContent class 2018-01-29 19:41:41 +01:00
Mordred
0b7468ead5 Use InstanceContent name instead of placeName for InstanceContent 2018-01-29 19:35:57 +01:00
Mordred
1ae00be022
Merge pull request #228 from AcedArmy/master
Updated SearchInfo IPC's and Fixed OnlineStatus
2018-01-29 11:00:28 +01:00
Biscuit Boy
c4d80da33d Updated ReqSearchInfoHandler Location 2018-01-29 20:49:18 +11:00
Adam
1550414983 return players to last zone if the instance doesnt exist 2018-01-29 20:41:24 +11:00
Adam
0d0db3b41c correctly remove InstanceContent zones 2018-01-29 20:40:32 +11:00
Biscuit Boy
a588cc53c4 Updated SearchInfo Ipcs and Fixed OnlineStatus 2018-01-29 20:36:38 +11:00
Adam
56c6b38966 createInstanceContent and some minor refactoring 2018-01-29 19:40:27 +11:00
Adam
cbefc4cc1f add some more mapped TerritoryIntendedUse values 2018-01-29 18:10:43 +11:00
Adam
2ad9b0efaa remove isPrivate param from constructors 2018-01-29 18:10:11 +11:00
Adam
20ee459e26 instance zoning and returning implemented
instancecontent uses instancecontent class instead of zone too
2018-01-29 13:05:33 +11:00
Adam
9e830ac677 fix weather in zones 2018-01-29 13:03:52 +11:00