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
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
Tahir Akhlaq
d575c63152 added planmap loading to pcb_reader 2018-01-24 15:34:01 +00:00
Mordred
1ce2d4af03 Merge pull request #222 from takhlaq/pcb_reader
updated pcb_reader with mordred's eobj/enpc entries
2018-01-24 11:26:01 +01:00
Tahir Akhlaq
b63b4eb612 updated pcb_reader with mordred's eobj/enpc entries 2018-01-24 00:15:46 +00:00
Mordred
b7d0148539 Merge pull request #221 from takhlaq/pcb_reader
reenable pcb_reader build
2018-01-23 20:30:30 +01:00
Tahir Akhlaq
e01710c2c3 fix pcb_reader cmakelists i hope 2018-01-23 17:53:22 +00:00
Tahir Akhlaq
6d591a004f reenabled pcb_reader build, removed dumb requirement of territorytype extraction on xivdat build for pcb_reader 2018-01-23 13:13:35 +00:00
Mordred
31f460d4c4 Merge pull request #220 from goaaats/eventnpc
zone: Add EventNpc + logic
2018-01-22 08:42:14 +01:00
goaaats
235f3cc8c8 zone: Add EventNpc + logic 2018-01-20 22:03:41 +01:00
Mordred
b5a92485e7 Merge pull request #219 from AcedArmy/master
Fixed GM Call
2018-01-19 22:08:36 +01:00
Biscuit Boy
f80a2fd0a5 Added GM1 Back since its needed 2018-01-20 02:04:38 +11:00
Biscuit Boy
8f2f827427 Fixed GM Call
GM Call was placed in GM1 instead of GM2 for some reason /shrug
2018-01-20 01:56:00 +11:00
Mordred
9607bebb05 Merge pull request #218 from GokuWeedLord/feature/gm-debug-scripting
update submodule and remove script name from scripts
2018-01-19 11:12:06 +01:00
Adam
ef007bb442 update libs submodule 2018-01-19 20:30:01 +11:00
Adam
4b9da92b34 remove scriptname from scripts 2018-01-19 20:17:49 +11:00