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

17 commits

Author SHA1 Message Date
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
Adam
1550414983 return players to last zone if the instance doesnt exist 2018-01-29 20:41:24 +11:00
Adam
56c6b38966 createInstanceContent and some minor refactoring 2018-01-29 19:40:27 +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
Mordred
ad88a058c2 Cleaning up zoneing code 2018-01-28 22:36:43 +01: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
2609a475a7 Removed author comment, we have git anyways. 2018-01-28 11:40:12 +01:00
Mordred
695fea7812 Merge branch 'master' into event_rewrite 2018-01-28 00:30:16 +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
2d8ea346a3 Beginning of splitting eventhandlers, pulling logic out of scriptmanager 2018-01-14 23:54:26 +01:00
Mordred Admin
f3d5bf5fa6 Simplified handling of state flags 2018-01-11 14:59:39 +01:00
Mordred
bafc511db2 Another approach at event improvements 2018-01-09 23:50:54 +01:00
Mordred
8d967870bd another event rewrite approach 2018-01-09 23:44:02 +01:00
Adam
3a05770330 Merge remote-tracking branch 'upstream/native_scripting' into fix/set-classjob 2017-12-27 12:52:23 +11:00
Mordred Admin
0f3f51c304 #182 - Renamed targets to be less ambigious 2017-12-19 09:27:22 +01:00