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

822 commits

Author SHA1 Message Date
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
Adam
23d958e768 Merge branch 'develop' into instancescripting 2018-02-09 23:50:26 +11:00
Adam
ca42ed228d builds should work now... probably 2018-02-09 20:25:18 +11:00
Adam
9d8f3648a0 fix script builds and logging issues on WSL 2018-02-09 20:11:30 +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
Adam
d3bdd8856a instance scripting stuff 2018-02-09 02:34:43 +11:00
Mordred
6cc95cc73e
Merge pull request #247 from GokuWeedLord/develop
hierachyId dump + scripts structure cleanup
2018-02-08 15:30:28 +01:00
Mordred
abf1194a7a
comment added 2018-02-08 15:29:46 +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
1e7c2adefb fix instance expire time 2018-02-09 00:04:46 +11:00
Adam
bf404f7371 restructure script folder hierachy to remove unnecessary build targets 2018-02-08 23:28:52 +11: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
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
b11cdecbf0 Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2018-02-04 17:46:59 +01:00
Mordred
c36dec91d5 Reconnecting during an instance now possible 2018-02-04 17:46:46 +01:00
Adam
46ce423466 cf spawns instances and zones you into them 2018-02-05 01:55:10 +11:00
Mordred
f017389ad1 Marked GCaffiliation as outdated for the time being 2018-02-04 14:16:09 +01:00
Mordred
9dfca22e10 Adjusted wrong casttime for eventactions, needs fixing in ex.json 2018-02-04 02:26:02 +01:00
Mordred
6f461ab1bc Fixed state flags 2018-02-04 00:43:36 +01:00
Adam
d196795545 fix exd_struct_gen and teleporting 2018-02-04 01:39:05 +11:00
Adam
8ba99e2211 opcode update, cleanup and maybe disconnect issue fixed?
it works on my machine™️
2018-02-03 19:42:42 +11:00
Adam
75c2ffb784 move scripts dir to server_zone 2018-02-03 17:03:50 +11:00
Mordred
a05ef7bb1d updaing field sizes, make sure to run update.sql 2018-02-03 02:04:00 +01:00
Mordred
ebf78a71ac Fully fixed initui and quests 2018-02-03 01:51:46 +01:00
Mordred
77fc9182ec Fixed quest tracker and gc affiliation opcodes 2018-02-02 18:34:20 +01:00
Mordred
c864ecf2d2 Changed more timer usages to 64bit, changed getQuestInfo exd to grab correct field for name 2018-02-02 17:37:51 +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
Mordred
7a23d24336
Merge pull request #234 from goaaats/exd_rework
zone, api: Removed old EXD reader
2018-02-01 17:49:35 +01:00
Mordred
2adfdbc47d
Update ActionTeleport.cpp 2018-02-01 17:47:55 +01:00
goaaats
ed9a140ccc Fix cast time 2018-02-01 16:28:14 +01:00
goaaats
4f22c20fa8 Style 2018-02-01 16:28:03 +01:00
Adam
0f50957105 fix session disconnecting issue 2018-02-02 01:22:58 +11:00
goaaats
c460283ca6 Fix for weather crash 2018-02-01 14:50:51 +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
Adam
379c9eaf24 goat can finish this 2018-01-31 02:06:11 +11: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