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

3041 commits

Author SHA1 Message Date
collett
3b140f36d3 Merge remote-tracking branch 'remotes/origin/develop' into action_data_update 2020-01-11 17:53:58 +09:00
collett
a9108f8dfc Merge branch 'action_data_update_pr' into action_data_update 2020-01-11 17:53:50 +09:00
Adam
5d5763c74e
Merge pull request #627 from NotAdam/develop
fix some warnings & world shouldn't crash when warming up object cache
2020-01-11 18:42:19 +11:00
collett
b15864b541 move attack type enum to common.h 2020-01-11 16:33:19 +09:00
NotAdam
755c6b55c0 fix some warnings & world shouldn't crash when warming up object cache 2020-01-11 18:20:06 +11:00
collett
96a25c9a9e fix enum type 2020-01-10 23:51:09 +09:00
collett
0724364d69 update attackType.
remove healType as such thing does not exist.
2020-01-10 23:42:20 +09:00
collett
896ce73175 Generic action handler update with status support. 2020-01-10 21:24:35 +09:00
collett
b391bc4aad remove gain job resource 2020-01-10 20:33:50 +09:00
collett
a6daa4ea8e more clean up 2020-01-10 19:58:53 +09:00
collett
f7ca365c8d status effect: heal cast multiplier, crit dh bonus
fix multipliers not applying to dots/hots
clean up hard-coded values.
2020-01-10 19:39:44 +09:00
collett
b744941620 status effect: heal receive multiplier 2020-01-10 02:17:41 +09:00
collett
e30ec77091 Merge branch 'develop_c' into action_data_update 2020-01-10 01:30:43 +09:00
collett
4496e5fe1f Merge remote-tracking branch 'remotes/origin/develop' into develop_c 2020-01-10 01:30:12 +09:00
collett
e79d262442 update parse data 2020-01-10 01:27:44 +09:00
collett
92173f778b minor fix 2020-01-10 01:19:33 +09:00
collett
77a6904220 status effect: dots & hots 2020-01-10 01:11:13 +09:00
collett
384404bb33 clean up 2020-01-09 21:10:49 +09:00
collett
a5884fd604 status effect: damage receive multiplier 2020-01-09 21:04:43 +09:00
collett
da17eecac5 status effect: damage multiplier 2020-01-09 19:37:50 +09:00
collett
8247a04d3a fix derp 2020-01-09 17:31:23 +09:00
Adam
38392be3bf
Merge pull request #625 from collett8192/crit_and_dh
Critical and direct hit.
2020-01-09 12:03:49 +11:00
Adam
d327e40b53
Merge pull request #624 from collett8192/money_sound_effect
Play the coin sound effect when buying items from shop.
2020-01-09 12:00:49 +11:00
collett
761b6cc94d Action data update.
All values are parsed from ffxiv act plugin at https://github.com/ravahn/FFXIV_ACT_Plugin
2020-01-09 01:29:09 +09:00
collett
6eaa4c407f Merge branch 'money_sound_effect' into develop_c 2020-01-08 20:32:06 +09:00
collett
7f5a6c8203 Merge branch 'crit_and_dh' into develop_c 2020-01-08 20:29:45 +09:00
collett
f7f44e9c15 rename 2020-01-08 18:28:19 +09:00
collett
00d8c0eef7 Fix shop packet. 2020-01-08 18:26:11 +09:00
collett
c779a70827 Fix shop packet 2020-01-08 18:25:55 +09:00
collett
ddb08ff59c rip vs2019 right click rename 2020-01-08 17:59:02 +09:00
collett
4bdfb1ef1f oops 2020-01-08 17:32:15 +09:00
collett
76a9e1eca3 effect entry field rename 2020-01-08 17:21:01 +09:00
collett
c460b007a1 less op test value 2020-01-07 19:46:07 +09:00
collett
586a1ab0bb crit & dh 2020-01-07 19:16:13 +09:00
collett
1ee74064b0 crit & dh 2020-01-07 19:08:13 +09:00
collett
5083b51bf2 Play the sound effect when buying items from shop.
When selling the sound effect is also played (and shop switch to buy back tab as well) but the selling logic code is not there so...
2020-01-06 19:57:18 +09:00
collett
ee4a785767 update some comments 2020-01-06 19:50:56 +09:00
collett
8d980737f8 Merge remote-tracking branch 'remotes/origin/develop' into develop_c 2020-01-06 19:47:43 +09:00
Adam
76f666a1a3
Merge pull request #623 from collett8192/script_effect
Allow action scripts to add effect.
2020-01-06 21:44:36 +11:00
collett
c696cb2c80 Allow action scripts to add effect. 2020-01-06 19:25:01 +09:00
collett
feec126341 Merge remote-tracking branch 'remotes/origin/develop' into develop_c 2020-01-06 19:20:10 +09:00
NotAdam
204ff7ec84 fix linux build 2020-01-06 20:23:03 +11:00
NotAdam
3de42fc670 action_parse can take an exd path as a launch arg now 2020-01-06 20:23:03 +11:00
Adam
c8ecd0ef68
Merge pull request #620 from collett8192/action
Action system updates.
2020-01-06 20:23:14 +11:00
collett
a69becdde9 fix 2020-01-06 17:57:53 +09:00
collett
3e9ad1fc3e Merge branch 'action' into develop_c 2020-01-06 17:53:02 +09:00
collett
05480df1d9 no need to return the list 2020-01-06 17:52:45 +09:00
collett
4e11690a45 Fix skill animation for other players. 2020-01-06 04:31:09 +09:00
collett
01f681d1c3 Fix skill animation for other players. 2020-01-06 04:29:45 +09:00
コレット
4c324bf602
Merge branch 'develop' into action 2020-01-06 00:37:57 +09:00