1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-26 03:27:44 +00:00
Commit graph

3255 commits

Author SHA1 Message Date
collett
78e0e4d985 enum/struct/packet updates, fix dot/hot tick, remove incorrect initial delay for player autoattacks. 2020-01-19 21:20:01 +09:00
collett
3b3398e3e0 fix code following some commented things from old pr that are obvious better 2020-01-19 20:53:56 +09:00
collett
39447bd39b really refresh status instead of remove and add new one. 2020-01-19 20:00:16 +09:00
NotAdam
22b499c3f7 fix lobby error message reading from packet incorrectly 2020-01-18 12:32:17 +11:00
collett
1e431ee924 Merge branch 'action_data_update_pr' into develop_c 2020-01-17 18:37:39 +09:00
collett
e84f77ca20 Implement thin air. 2020-01-17 18:37:09 +09:00
collett
33ed6c21cb Merge branch 'action_data_update_pr' into develop_c 2020-01-16 19:45:39 +09:00
collett
bb350ba250 Fix status effect list packet. 2020-01-16 19:44:28 +09:00
collett
e9f9a140d8 Merge remote-tracking branch 'remotes/origin/develop' into develop_c 2020-01-15 18:43:05 +09:00
NotAdam
e849f8221c add mariadb 10.4 and 10.5 (alpha) to mysql lib discovery 2020-01-15 20:30:29 +11:00
collett
b576788cfd Merge branch 'action_data_update_pr' into develop_c 2020-01-15 18:29:54 +09:00
collett
71d486e806 Implement benediction. 2020-01-15 18:29:27 +09:00
collett
7a7a2f1724 Implement cure 1 proc. 2020-01-15 18:07:06 +09:00
collett
2a50a0d076 Merge branch 'action_data_update_pr' into develop_c 2020-01-15 00:42:58 +09:00
collett
abf71f5dc0 clean up 2020-01-15 00:42:31 +09:00
collett
5867224baf merge failed 2020-01-14 23:48:40 +09:00
collett
0513025b6a Merge branch 'action_data_update_pr' into develop_c 2020-01-14 23:45:42 +09:00
collett
e677ee5ef8 Dots and hots should tick together one total number per tick. 2020-01-14 23:41:31 +09:00
collett
a8242fcf87 Implement swiftcast. 2020-01-14 23:24:06 +09:00
collett
bb4aab0acc let caller decide effect delay time 2020-01-14 22:34:19 +09:00
collett
8c9228ff34 Merge branch 'misc_fix' into action_data_update_pr 2020-01-14 22:15:25 +09:00
collett
09a596183b Merge branch 'misc_fix' into develop_c 2020-01-14 22:11:18 +09:00
collett
b3367cba63 Merge branch 'action_data_update_pr' into develop_c 2020-01-14 22:11:12 +09:00
collett
983c772260 fix inaccurate animation lock time for casts 2020-01-14 22:01:11 +09:00
collett
62f25b4b77 Implement presence of mind. 2020-01-14 21:59:05 +09:00
collett
d04b7a3519 Merge branch 'action_data_update_pr' into develop_c 2020-01-14 20:27:53 +09:00
collett
651e8e2d3e remove initial auto attack wait time for players 2020-01-14 20:27:10 +09:00
collett
b6286da75e Merge branch 'action_data_update_pr' into develop_c 2020-01-14 17:39:45 +09:00
collett
5b05900455 refreshed status keeps its old last tick time 2020-01-14 17:38:09 +09:00
collett
271edea8ec fix dots & hots first tick not working 2020-01-14 17:37:25 +09:00
collett
4592f955a3 Implement lucid dreaming. 2020-01-14 17:15:05 +09:00
collett
32b677ad4d Merge remote-tracking branch 'remotes/origin/develop' into action_data_update_pr 2020-01-14 17:10:54 +09:00
collett
8698ea415a clean up 2020-01-14 17:02:11 +09:00
collett
4485f22040 Merge branch 'misc_fix' into develop_c 2020-01-13 19:36:20 +09:00
collett
fc66254da3 more animation lock stuff 2020-01-13 17:58:07 +09:00
collett
d62b32b4c1 Merge branch 'action_data_update_pr' into develop_c 2020-01-13 03:49:38 +09:00
collett
685fd9c3bf move applyShieldProtection to chara 2020-01-13 03:49:25 +09:00
collett
f5b6dc7282 Merge branch 'action_data_update_pr' into develop_c 2020-01-13 03:06:07 +09:00
collett
0573138e1b Implement shield buff, and script for adloquium as a demo. 2020-01-13 03:05:54 +09:00
collett
df472ae3e3 Merge branch 'action_data_update_pr' into develop_c 2020-01-12 21:17:48 +09:00
collett
659786590c cannot absorb more than target remaining hp 2020-01-12 21:17:36 +09:00
collett
86e37ef7f7 Merge branch 'action_data_update_pr' into develop_c 2020-01-12 20:59:00 +09:00
collett
511fc2b35a Implement hp absorb. 2020-01-12 20:58:32 +09:00
collett
57635ac69b Merge branch 'action_data_update_pr' into develop_c 2020-01-12 18:19:39 +09:00
collett
b9eaef6a85 must be correct combo to apply status if a combo action is used. 2020-01-12 18:19:23 +09:00
collett
2ba1c4d940 Merge branch 'action_data_update_pr' into develop_c 2020-01-12 18:00:57 +09:00
collett
64a1c4033b Create lut entry for auto attacks so we won't have three different places that do damage.
of course more dumb mistake fixes.
2020-01-12 17:46:18 +09:00
collett
30461e8583 Merge branch 'action_data_update_pr' into develop_c 2020-01-12 03:48:53 +09:00
collett
e08643f380 Implement damage reflect trigger.
Replace consts with enums in Common.h
Use effect builder for autoattacks.
Dumb mistake fixed.
2020-01-12 03:29:52 +09:00
collett
24358891ad Merge branch 'action_data_update' into develop_c 2020-01-11 21:37:25 +09:00