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

185 commits

Author SHA1 Message Date
collett
29106a2de7 Merge remote-tracking branch 'remotes/origin/develop' into develop_5.2 2020-03-02 05:37:15 +09:00
NotAdam
5ccbaea266 fix quest_parser to use new service locator 2020-03-01 11:58:26 +11:00
NotAdam
41e6d73ff3 move to new service locator 2020-03-01 11:58:26 +11:00
NotAdam
64828a4c8a start of new service locator impl 2020-03-01 11:58:25 +11:00
collett
c46c5d09e3 Merge remote-tracking branch 'remotes/origin/develop' into develop_5.2 2020-02-27 00:04:53 +09:00
NotAdam
c1b11a312b fix excel structures, been a while 2020-02-24 23:04:52 +11:00
collett
5ff8965ed5 allow scripts to interrupt actions and bug fixes 2020-02-04 21:57:16 +09:00
collett
e7c44ccff7 more war stuff 2020-02-02 22:44:22 +09:00
collett
bbcf5a82eb Merge remote-tracking branch 'remotes/origin/develop' into develop_c 2020-01-26 19:35:08 +09:00
collett
d60dff5838 Fix moundId type. 2020-01-23 22:43:16 +09:00
collett
4839fcc577 Implement mount action. 2020-01-23 22:36:01 +09:00
collett
8d10a34174 Implement mount action and unlock mount list 2020-01-23 22:27:05 +09:00
collett
a8242fcf87 Implement swiftcast. 2020-01-14 23:24:06 +09:00
collett
ddb08ff59c rip vs2019 right click rename 2020-01-08 17:59:02 +09:00
コレット
4c324bf602
Merge branch 'develop' into action 2020-01-06 00:37:57 +09:00
NotAdam
2824c30342 Merge branch 'develop' into exit_poprange 2020-01-05 20:06:31 +11:00
collett
9cd17b3caa Action system updates. 2020-01-05 17:09:27 +09:00
kbasikhin
4186df6b40 using static and reinterpret casts instead of old style casts 2019-12-30 13:58:41 +03:00
liam
ab880c2144 minor instance script fixes, eobj parser should work as well as produce usable scripts now 2019-11-23 02:57:29 -05:00
Mordred
e990ad3f31 Major rewrite of zonelines, aetherytes and discoveries 2019-10-21 23:24:26 +02:00
Mordred
9d49f0a272 Changed makeActorControl calls aswell 2019-10-09 18:42:25 +02:00
Mordred
20e25d73b9 Renamed ActorControl packets and definitions according to usage 2019-10-09 18:14:53 +02:00
NotAdam
a973cfadd7 revert worldchannelpacket changes 2019-08-09 17:50:31 +10:00
NotAdam
d11fa5a6a5 kinda working effect packets 2019-08-09 17:50:31 +10:00
NotAdam
537b640bbc minor zone -> territory refactoring 2019-08-09 17:49:40 +10:00
NotAdam
317d16e3ed rename some getters and zonechannelpacket -> worldchannelpacket 2019-08-09 17:49:40 +10:00
NotAdam
9c3fba263e rename zone to territory 2019-08-09 17:49:40 +10:00
NotAdam
1f4b2dafbb rename InitUI -> PlayerSetup, AddStatusEffect -> EffectResult 2019-06-20 14:48:24 +10:00
NotAdam
ccb83bec5d move itemaction to own class, perchbird's effect command 2019-06-02 20:45:18 +10:00
NotAdam
86517c53ea somewhat working action lut stuff 2019-06-02 02:30:54 +10:00
NotAdam
f892257aa5 refactor Util -> Common::Util & Action to World::Action 2019-06-02 00:35:00 +10:00
NotAdam
b3edc9d2a2 remove the code restricting ic territories from being created 2019-05-07 22:16:18 +10:00
NotAdam
bd8192f4f0 fix a crash where !instance bind is used incorrectly, better getter name 2019-05-07 22:10:55 +10:00
NotAdam
44ae1cb641 gracefully crash the server if no navmeshes exist with a useful error 2019-04-29 19:59:54 +10:00
Mordred
b4b5c59bfa Some naming changes for actions 2019-04-28 23:34:43 +02:00
NotAdam
b68e1b7876 fix naviprovider not being set on instances 2019-04-19 18:52:55 +10:00
Mordred
61e0b0c013 Detour crowd experiments 2019-04-19 00:39:42 +02:00
NotAdam
8ffd81248f use prepared statement for item loading, network item stain 2019-04-13 22:42:02 +10:00
Mordred
13ce1b47d0 QuestBattles can now be started from scripts, see ManFst005 2019-04-11 00:16:04 +02:00
NotAdam
799588114e fix debug commands not working for questbattles, map another actrl 2019-04-08 23:36:02 +10:00
NotAdam
a0ee37d9db Merge remote-tracking branch 'upstream/develop' into develop 2019-04-08 08:02:50 +10:00
Mordred
e4f18a0850 Shortcut adde for questbattle command 2019-04-07 23:59:33 +02:00
Mordred
975fcf1be8 Move questbattle opening scene into the script 2019-04-07 23:42:24 +02:00
Mordred
4fd49a1dae Show svent on questbattle completion, remove inactive questbattle instances 2019-04-07 16:01:53 +02:00
Mordred
0079cba784 Changed the way players are being iterated for updating, some questbattle additions 2019-04-07 13:27:56 +02:00
NotAdam
03856a339c refactoring, make ranged targeted aoe actions work somewhat properly 2019-04-07 16:31:09 +10:00
NotAdam
2f73a61eb2 Start of action target selection implementation 2019-04-07 16:04:36 +10:00
Mordred
af07092978 Refactored the way timestamps are passed through update handlers 2019-04-04 23:29:52 +02:00
Mordred
598dd50ff2 More simplifications of the questbattle handling, exposing a script function to init player position 2019-04-02 00:00:58 +02:00
Mordred
e06099f762 Questbattle instances can be created and joined. 2019-03-31 23:45:03 +02:00