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

137 commits

Author SHA1 Message Date
Mordred
c5692bbe05 Style fix 2018-02-06 00:03:08 +01:00
Mordred
78606873ae Basic director handling for instances, just the bare minimum so far 2018-02-06 00:01:23 +01:00
Mordred
9b1940d0a5 Call onEnter event after zone init packet have been sent 2018-02-04 23:58:45 +01:00
Mordred
7a75b40ce6 Added events to zone for inheritance handling 2018-02-04 23:35:16 +01:00
Mordred
21a39a09eb Disabled betweenarea state flags until we fix it 2018-02-04 18:53:19 +01:00
Mordred
c36dec91d5 Reconnecting during an instance now possible 2018-02-04 17:46:46 +01:00
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
goaaats
4f22c20fa8 Style 2018-02-01 16:28:03 +01:00
goaaats
c460283ca6 Fix for weather crash 2018-02-01 14:50:51 +01:00
goaaats
8a5d497c21 zone, api: Removed old EXD reader 2018-01-31 11:43:22 +01: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
Adam
0d0db3b41c correctly remove InstanceContent zones 2018-01-29 20:40:32 +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
Mordred
ad88a058c2 Cleaning up zoneing code 2018-01-28 22:36:43 +01:00
Adam
d1d93c9241 instance removal command 2018-01-29 00:52:11 +11:00
Adam
d54f366712 gm teri accepts instance id 2018-01-29 00:40:34 +11:00
Adam
47bcd612df Merge remote-tracking branch 'upstream/event_rewrite' into event_rewrite 2018-01-28 23:54:10 +11:00
Adam
ea47861f33 base implementation of instance creation 2018-01-28 23:53:58 +11:00
Mordred
fa662d30b8 forgot proper namespace for Director 2018-01-28 13:52:53 +01:00
Mordred
137cc944b3 Begin of InstanceContent implementation 2018-01-28 13:49:51 +01:00
Mordred
725ca11c60 Revert "Merge pull request #225 from GokuWeedLord/event_rewrite"
This reverts commit 4e2319130f, reversing
changes made to 695fea7812.
2018-01-28 11:16:34 +01:00
Adam
87a91a19ea make the output of territorymgr nicer on startup 👌 2018-01-28 18:49:29 +11:00
Adam
2ea7f776ba shouts now have correct behaviour 2018-01-28 18:48:56 +11:00
Mordred
73df60440f Type on comment 2018-01-28 00:03:42 +01:00
Mordred
ebad3f3c2f Removed debug code 2018-01-27 23:54:26 +01:00
Mordred
35a2c6db09 Replacement of old ZoneMgr 2018-01-27 23:52:49 +01:00
goaaats
ee96791eac zone: Add EventNpc + logic 2018-01-20 22:03:41 +01:00
Mordred Admin
0f3f51c304 #182 - Renamed targets to be less ambigious 2017-12-19 09:27:22 +01:00