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

128 commits

Author SHA1 Message Date
collett
07ddfe88f4 sam actions 2020-06-15 00:32:35 +09:00
collett
0e34da56e4 Merge remote-tracking branch 'remotes/origin/develop' into develop_5.25 2020-05-11 17:51:06 +09:00
collett
a5019abd5c Selling items and buying back from shop, show corresponding messages in chat. 2020-05-11 06:27:34 +09:00
collett
d10347bfff hack to get aetheryte working again until the service is fixed. 2020-04-12 23:54:34 +09:00
collett
31ee05734a provoke 2020-04-09 16:59:12 +09:00
collett
90f4a8f10f level == 52 is good 2020-04-09 08:15:40 +09:00
collett
e67afee887 gnb implementation, some old bug fixes as well. 2020-04-09 08:13:20 +09:00
collett
45a520aa12 Merge remote-tracking branch 'remotes/origin/develop' into develop_5.21 2020-03-17 16:42:05 +09:00
Adam
974f76b636
Merge pull request #651 from Arazati/develop-serious
implemented dyeable items
2020-03-17 12:54:08 +11:00
collett
9084e17e07 implement blackest night and dark arts 2020-03-15 23:24:44 +09:00
collett
b6068046ac implement drk blood and darkside, some war fixes as well 2020-03-15 18:59:07 +09:00
Arazati
b3aeb70338 implement dyeing items + show dyes in examine 2020-03-14 00:57:09 -07:00
collett
8a7c11dab8 remove status effect framework workaround. 2020-03-02 05:46:24 +09:00
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
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
81bbcbef23 Fix #632. 2020-02-08 00:43:49 +09:00
collett
5d5de5e451 fix aethernet escape 2020-02-08 00:41:58 +09:00
collett
5ff8965ed5 allow scripts to interrupt actions and bug fixes 2020-02-04 21:57:16 +09:00
collett
deebcd76c3 inner release, inner chaos, chaotic cyclone 2020-02-04 20:58:40 +09:00
collett
08a0556b36 require combo 2020-02-04 17:09:23 +09:00
collett
e7c44ccff7 more war stuff 2020-02-02 22:44:22 +09:00
collett
aaccb4bd6a clean up 2020-02-02 19:49:16 +09:00
collett
450ff0ddff show job ui and some war stuff 2020-02-02 19:42:24 +09:00
collett
a31098b4bf Implement heavy shot, straight shot. 2020-01-23 18:23:15 +09:00
collett
39447bd39b really refresh status instead of remove and add new one. 2020-01-19 20:00:16 +09: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
32b677ad4d Merge remote-tracking branch 'remotes/origin/develop' into action_data_update_pr 2020-01-14 17:10:54 +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
3b140f36d3 Merge remote-tracking branch 'remotes/origin/develop' into action_data_update 2020-01-11 17:53:58 +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
NotAdam
755c6b55c0 fix some warnings & world shouldn't crash when warming up object cache 2020-01-11 18:20:06 +11:00
collett
896ce73175 Generic action handler update with status support. 2020-01-10 21:24:35 +09:00
collett
da17eecac5 status effect: damage multiplier 2020-01-09 19:37:50 +09: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
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
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
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
collett
37177006fa Allow action scripts to add effect. 2020-01-05 23:57:42 +09:00
collett
20f282755f Merge remote-tracking branch 'remotes/origin/develop' into develop_c 2020-01-05 21:45:47 +09:00
NotAdam
2824c30342 Merge branch 'develop' into exit_poprange 2020-01-05 20:06:31 +11:00
collett
2308a41a63 Fix aetheryte. 2020-01-03 22:39:45 +09:00