1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-24 05:37:45 +00:00
Commit graph

1809 commits

Author SHA1 Message Date
Mordred
1de659e040 Merge pull request #237 from GokuWeedLord/master
add festival support
2018-02-02 17:19:56 +01:00
Adam
811b4af5b1 Merge branch 'master' into master 2018-02-03 02:12:35 +11:00
Adam
6e12c74e78 add festival support 2018-02-03 02:11:29 +11:00
Mordred
d59e958d89 Pretty sure that was not supposed to be a cast 2018-02-01 23:41:27 +01:00
Mordred
9b8df412f3 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
ebbe99805e Merge pull request #234 from goaaats/exd_rework
zone, api: Removed old EXD reader
2018-02-01 17:49:35 +01:00
Mordred
3a9de03abc Merge pull request #236 from GokuWeedLord/master
fix session disconnects & inventory opcodes
2018-02-01 17:48:40 +01:00
Mordred
5550e6f475 Update ActionTeleport.cpp 2018-02-01 17:47:55 +01:00
goaaats
95c8d1b244 Fix cast time 2018-02-01 16:28:14 +01:00
goaaats
64905308d2 Style 2018-02-01 16:28:03 +01:00
Adam
8f52a024ea update inventory opcodes 2018-02-02 01:23:12 +11:00
Adam
13331c696e fix session disconnecting issue 2018-02-02 01:22:58 +11:00
goaaats
3eb0ad0c86 Fix for weather crash 2018-02-01 14:50:51 +01:00
Mordred
640c9178cf Merge pull request #235 from GokuWeedLord/master
update opcodes - #229
2018-02-01 12:28:54 +01:00
Adam
1708e5d510 correct opcode for ActorSetPos 2018-02-01 22:06:02 +11:00
Adam
0eb91cc9a0 update opcodes 2018-02-01 20:28:04 +11:00
Mordred
575a3f61a9 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
31d94f95a9 Yet more opcode fixes 2018-01-31 19:20:30 +01:00
Mordred
7a0fd6d08a More opcode fixes, updated playerspawn struct 2018-01-31 18:57:04 +01:00
Mordred
81e347d164 Various opcodes adjusted 2018-01-31 18:02:23 +01:00
Mordred
5dbdfc7284 Fixed serverMsg packet 2018-01-31 17:48:12 +01:00
Mordred
e25399a010 Fixed cras on login due to wrong sociallist packet 2018-01-31 17:24:44 +01:00
Mordred Admin
0e052e84c6 Added type for shared_ptr< exdSheet > 2018-01-31 14:55:51 +01:00
goaaats
413c9f1007 Style 2018-01-31 11:58:29 +01:00
goaaats
c0b3d3605b zone, api: Removed old EXD reader 2018-01-31 11:43:22 +01:00
Mordred
67b06bce25 Updated some client opcodes 2018-01-31 08:28:14 +01:00
Mordred
450464a23e Updated various opcodes 2018-01-31 08:22:08 +01:00
Mordred
d522a9cded Merge pull request #233 from perize/master
Fix macro import on Windows and action exd stuff
2018-01-31 06:29:40 +01:00
Perize
992a44fc8a Temp fix for 4.2 shift in action excel 2018-01-31 13:19:07 +09:00
Perize
83cd38c831 Fix macro inport on Windows 2018-01-31 13:18:23 +09:00
Mordred
16d5f7c8ee More potential opcode fixes 2018-01-30 23:39:43 +01:00
Mordred
7ca916e282 Merge pull request #231 from perize/420-network
Correct server opcode (not verified yet)
2018-01-30 22:50:56 +01:00
Mordred
d21fa4f708 Update Ipcs.h 2018-01-30 22:50:40 +01:00
Mordred
6259b139e5 Merge pull request #232 from GokuWeedLord/master
fix json & allow optional param for exd_struct_gen to take dat path
2018-01-30 16:07:19 +01:00
Adam
b3cda8ebe6 goat can finish this 2018-01-31 02:06:11 +11:00
Adam
3606ea6ef6 update generated exd data and some generator fixes 2018-01-31 01:47:58 +11:00
Adam
d6bf277183 actually commit the fixed json... 2018-01-31 01:37:23 +11:00
Adam
3d8e56ede4 update ex.json and take optional param to exd_struct_gen to dat path 2018-01-31 01:37:08 +11:00
Mordred
6bbe0385cd Removed extra qualifier 2018-01-30 14:47:27 +01:00
Mordred
f3d3b86dea Merge pull request #230 from perize/master
Update opcode #1
2018-01-30 13:27:08 +01:00
Perize
7d41839f0d Correct server opcode (not verified yet) 2018-01-30 21:20:22 +09:00
Perize
111aa8c383 Correct client opcode updatepos 2018-01-30 19:45:39 +09:00
Adam
709e1c1b94 Merge sopcode shift posted by @Adam 2018-01-30 19:41:13 +09:00
Adam
e9142af286 Fix ActionHandler 2018-01-30 19:40:42 +09:00
Mordred Admin
d63ba00094 Do not build pcb_reader by default 2018-01-30 08:04:50 +01:00
Mordred Admin
2a6c505f9f Merge remote-tracking branch 'origin/event_rewrite'
Conflicts:
	src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
2018-01-30 07:53:15 +01:00
Mordred
8afe739aaf Minor cleanup of InstanceContent class 2018-01-29 19:41:41 +01:00
Mordred
88f8eb2cb5 Use InstanceContent name instead of placeName for InstanceContent 2018-01-29 19:35:57 +01:00
Mordred
530c9f996f Merge pull request #227 from GokuWeedLord/event_rewrite
instance zoning and returning implemented
2018-01-29 11:00:58 +01:00
Mordred
e708fc5624 Merge pull request #228 from AcedArmy/master
Updated SearchInfo IPC's and Fixed OnlineStatus
2018-01-29 11:00:28 +01:00