1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-25 14:07:46 +00:00
Commit graph

1373 commits

Author SHA1 Message Date
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
Biscuit Boy
b01ed63f48 Updated ReqSearchInfoHandler Location 2018-01-29 20:49:18 +11:00
Adam
58b2699fb9 return players to last zone if the instance doesnt exist 2018-01-29 20:41:24 +11:00
Adam
95bf84ca6d correctly remove InstanceContent zones 2018-01-29 20:40:32 +11:00
Biscuit Boy
82c892b022 Updated SearchInfo Ipcs and Fixed OnlineStatus 2018-01-29 20:36:38 +11:00
Adam
e9d0e5cbb8 createInstanceContent and some minor refactoring 2018-01-29 19:40:27 +11:00
Adam
236c09fbd3 add some more mapped TerritoryIntendedUse values 2018-01-29 18:10:43 +11:00
Adam
36d64630d3 remove isPrivate param from constructors 2018-01-29 18:10:11 +11:00
Adam
7de0885b54 instance zoning and returning implemented
instancecontent uses instancecontent class instead of zone too
2018-01-29 13:05:33 +11:00
Adam
97e2c08a9f fix weather in zones 2018-01-29 13:03:52 +11:00
Mordred
bccf6e200a Cleaning up zoneing code 2018-01-28 22:36:43 +01:00
Mordred
4cf6602133 Merge pull request #226 from GokuWeedLord/event_rewrite
instance creation/removal & debug command
2018-01-28 15:26:31 +01:00
Adam
9d2d819e18 instance removal command 2018-01-29 00:52:11 +11:00
Adam
339a089d47 gm teri accepts instance id 2018-01-29 00:40:34 +11:00
Adam
5afe002c33 Merge remote-tracking branch 'upstream/event_rewrite' into event_rewrite 2018-01-28 23:54:10 +11:00
Adam
b05a05341c base implementation of instance creation 2018-01-28 23:53:58 +11:00
Mordred
63371153ae forgot proper namespace for Director 2018-01-28 13:52:53 +01:00
Mordred
d9da17cd35 Begin of InstanceContent implementation 2018-01-28 13:49:51 +01:00
Mordred
04f5823c4b Removed author comment, we have git anyways. 2018-01-28 11:40:12 +01:00
Mordred
babb58fa21 Revert "Merge pull request #225 from GokuWeedLord/event_rewrite"
This reverts commit 6a128b1912, reversing
changes made to a104b5a928.
2018-01-28 11:16:34 +01:00
Mordred
958aa0922e Updated submodule 2018-01-28 10:10:48 +01:00
Mordred
6a128b1912 Merge pull request #225 from GokuWeedLord/event_rewrite
debug commands are now scripted, debugcommandhandler is now gone
2018-01-28 10:07:58 +01:00
Adam
70cf3919d6 probably fixes linux builds 2018-01-28 19:36:03 +11:00
Adam
94845da821 remove debug output 2018-01-28 19:02:50 +11:00
Adam
dde0a30fa3 switch debugcommandhandler for scripted implementation 2018-01-28 18:52:53 +11:00
Adam
99300d746a make the output of territorymgr nicer on startup 👌 2018-01-28 18:49:29 +11:00
Adam
afd439c64f shouts now have correct behaviour 2018-01-28 18:48:56 +11:00
Adam
3c890148f2 scripts include ScriptObject.h sanely now 2018-01-28 14:02:51 +11:00
Mordred
a104b5a928 Merge branch 'master' into event_rewrite 2018-01-28 00:30:16 +01:00
Mordred
0e34a6b107 Linux build fix 2018-01-28 00:09:53 +01:00
Mordred
62cfa0a291 Type on comment 2018-01-28 00:03:42 +01:00
Mordred
140f66a1d0 updated submodule 2018-01-27 23:55:34 +01:00
Mordred
6404951549 Removed debug code 2018-01-27 23:54:26 +01:00
Mordred
aabcdf6e74 Replacement of old ZoneMgr 2018-01-27 23:52:49 +01:00
Mordred
417d0f42a1 Merge pull request #224 from perize/master
Add MSQ guide def
2018-01-27 09:35:15 +01:00
Perize
2614f24a8e MSQ guide packet def 2018-01-27 14:52:14 +09:00
Mordred
f92bdd676a Merge pull request #223 from takhlaq/pcb_reader
added planmap loading to pcb_reader
2018-01-25 18:25:26 +01:00