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

48 commits

Author SHA1 Message Date
Mordred
b9a78b72fd Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2018-02-15 23:50:40 +01:00
Mordred
b8cbdf3fa5 removed all unused state flags, mapped more client actions 2018-02-15 23:50:28 +01:00
Adam
48a1fd502a add todo note 2018-02-15 19:44:54 +11:00
Adam
cb44147564 fix compile warning 2018-02-15 19:27:44 +11:00
Mordred Admin
c54ebbe53c Cleaned up generated exd stuff 2018-02-14 12:31:47 +01:00
Mordred
607143ea7c updated submodule 2018-02-13 19:37:04 +01:00
Mordred
649bd7d8e6 Further clean up in range stuff 2018-02-11 23:52:44 +01:00
Mordred
cee84cd9ff In range containers no longer declared publicly 2018-02-11 22:57:00 +01:00
Adam
727207ec08 Merge remote-tracking branch 'upstream/develop' into instancescripting 2018-02-10 14:05:12 +11:00
Adam
2f6bc9e1eb instane obj spawning 2018-02-10 14:03:59 +11:00
Mordred
1f415a0d05 Majorly refactored usage of shared_ptr also added GameObject into Actor inheritance chain 2018-02-10 01:21:31 +01:00
Adam
01e22b679d instance objects, gameobj implementation 2018-02-10 02:47:32 +11:00
Mordred Admin
3ef490693b Missing virtual destructor implementation 2018-02-09 08:32:28 +01:00
Mordred
e1dafd3d5e New base class for anything actor related, not being used yet 2018-02-09 00:55:44 +01:00
goaaats
cb787b44f5 Handle via inRangeSet 2018-02-08 15:25:59 +01:00
goaaats
9790594016 Implement correct handling for private areas 2018-02-08 15:05:29 +01:00
Adam
7528db3b83 remove exddata from sapphire_zone 2018-02-07 14:27:52 +11:00
Mordred
4e1c82c2be More preparational director logic, state inside can be modified with !instance <instanceId> <varIdx> <value> 2018-02-07 00:00:48 +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
Mordred
f017389ad1 Marked GCaffiliation as outdated for the time being 2018-02-04 14:16:09 +01:00
Adam
d196795545 fix exd_struct_gen and teleporting 2018-02-04 01:39:05 +11:00
Mordred
a05ef7bb1d updaing field sizes, make sure to run update.sql 2018-02-03 02:04:00 +01:00
Mordred
77fc9182ec Fixed quest tracker and gc affiliation opcodes 2018-02-02 18:34:20 +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
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
6793cccaa0
Style 2018-01-31 11:58:29 +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
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