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

746 commits

Author SHA1 Message Date
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
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
1550414983 return players to last zone if the instance doesnt exist 2018-01-29 20:41:24 +11: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
2609a475a7 Removed author comment, we have git anyways. 2018-01-28 11:40:12 +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
20996c17f5 probably fixes linux builds 2018-01-28 19:36:03 +11:00
Adam
fb06cd4930 switch debugcommandhandler for scripted implementation 2018-01-28 18:52:53 +11: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
695fea7812 Merge branch 'master' into event_rewrite 2018-01-28 00:30:16 +01: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