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

2818 commits

Author SHA1 Message Date
Adam
3090de3b20
Merge pull request #619 from collett8192/inventory_fixes
Inventory fixes.
2020-01-05 09:24:51 +11:00
Adam
6f9c299a04
Merge pull request #618 from collett8192/quest_reward
Fix quest reward choice.
2020-01-05 09:24:40 +11:00
collett
bab1d384c2 Inventory fixes. 2020-01-05 06:20:50 +09:00
collett
642369a3d1 remove that dumb sh!t 2020-01-05 06:14:05 +09:00
collett
72ea61393d this is what's really going on about that get item sound thing. 2020-01-05 06:11:20 +09:00
collett
dea1224226 Play the sound effect when getting new items. 2020-01-05 05:50:16 +09:00
collett
a588adca8c Fix quest reward choice.
Quest scripts need to call player.giveQuestRewards( getId(), result.param3 ) for it to work.
2020-01-05 05:25:35 +09:00
collett
7f4184bfbc Move quest finish packet to where it belongs to so we can abandon quests. 2020-01-05 05:19:05 +09:00
collett
df9fb7ebf4 Better fix for abandon quest. 2020-01-05 05:14:38 +09:00
collett
7545ad0934 Some status fixes. 2020-01-05 04:44:41 +09:00
collett
84a868aae8 More aoe stuff. 2020-01-05 01:04:30 +09:00
collett
03df9ab4d5 some aoe fixes 2020-01-04 21:12:54 +09:00
collett
64f8be4512 vs2019 really wants to add that space. 2020-01-04 19:56:21 +09:00
collett
4623ed535a Interrupt casting if target died and casting queue. 2020-01-04 19:47:34 +09:00
collett
0cd7bd7f49 Merge remote-tracking branch 'remotes/origin/develop' into develop_c 2020-01-03 23:26:25 +09:00
Adam
6df0dcffe9
Merge pull request #616 from collett8192/event_battle
Fix event battle.
2020-01-04 01:20:56 +11:00
collett
45f6f9fa7c Fix event battle. 2020-01-03 22:47:01 +09:00
collett
2308a41a63 Fix aetheryte. 2020-01-03 22:39:45 +09:00
collett
8790e71ff1 Clean up. 2020-01-03 22:36:49 +09:00
collett
8313abf30a Fix aetheryte. 2020-01-03 22:31:55 +09:00
collett
9b4142f94f Update gm command opcode. 2020-01-03 17:58:13 +09:00
collett
7385d2291c Fix copy paste derp. 2020-01-03 17:37:21 +09:00
collett
d1b8fd019e Merge remote-tracking branch 'remotes/origin/develop' into develop_c 2020-01-03 17:33:53 +09:00
Adam
cfa515f1c9
Merge pull request #614 from karashiiro/develop
More opcodes, ID PlayerSpawn fields
2020-01-03 13:47:08 +11:00
karashiiro
924c1338d2 merge duplicate keys 2020-01-02 18:38:53 -08:00
karashiiro
913591ec23 Merge branch 'develop' of https://github.com/karashiiro/Sapphire into develop 2020-01-02 16:15:53 -08:00
karashiiro
4a31abc020 CFNotifyPop and CFPreferredRole 2020-01-02 16:15:05 -08:00
Adam
78fb4d5576
Merge pull request #613 from collett8192/social_list_fix
Fix social list.
2020-01-03 11:14:23 +11:00
karashiiro
e94bf44e6a
Merge pull request #1 from SapphireServer/develop
merge merges
2020-01-02 16:09:30 -08:00
collett
22edf9b155 Abandon quest. 2020-01-03 05:53:36 +09:00
collett
51046f9da0 Fix social list. 2020-01-03 05:24:06 +09:00
collett
44fb2c9db3 Next quest. 2020-01-03 05:23:12 +09:00
collett
f58bb4f72b Fix social list. 2020-01-03 05:07:55 +09:00
collett
edaa400202 Oops. 2020-01-03 04:08:22 +09:00
collett
2bf1e3767a 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-03 04:06:25 +09:00
collett
39a711dab5 Play the sound effect when you get an item. 2020-01-03 04:04:30 +09:00
collett
7da25b33ef Merge branch 'add_item_dupe_fix' into develop_c 2020-01-03 01:32:04 +09:00
collett
cd0f7fbd2b Fix item being added more than once when there is already a stack of the same item. 2020-01-03 01:24:39 +09:00
collett
148243c402 Try to implement a quest. 2020-01-03 01:11:19 +09:00
collett
1c89e16c27 Fix quest reward choice.
Quest scripts need to call player.giveQuestRewards( getId(), result.param3 ) for it to work.
2020-01-03 01:10:42 +09:00
collett
81d5929e08 Fix item dupe. 2020-01-03 01:07:42 +09:00
collett
dee59aead1 Try to implement MP restoring actions.
MPP values in lut entries are input manually.
2020-01-02 20:58:50 +09:00
collett
482745624c Clear last combo action id if the combo breaks. 2020-01-02 19:51:19 +09:00
collett
6fb6ccbda5 Fix non-existing lut entry being executed. 2020-01-02 17:42:48 +09:00
collett
28a88e5a96 Merge remote-tracking branch 'remotes/origin/develop' into develop_c 2020-01-02 17:37:40 +09:00
NotAdam
9c6e431cf6 more 5.18 opcodes 2020-01-02 15:10:04 +11:00
NotAdam
acacfc5553 fix eventplay opcodes/names 2020-01-02 14:42:58 +11:00
NotAdam
371382dc0a fix build error 2020-01-02 14:22:36 +11:00
Adam
f5bf06ed00
Merge branch 'develop' into opcode_update 2020-01-02 14:21:39 +11:00
collett
56296d295a Attempt to fix combo actions. 2020-01-02 08:07:33 +09:00