mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-22 10:07:44 +00:00
Code Activity
2933 commits 10 branches 14 tags 26 MiB
Commit graph

2933 commits

This branch
This branch
All branches
Author SHA1 Message Date
collett
cfd23755fb combo fix 2020-01-06 00:25:42 +09:00
collett
4f0533bb0d local var rename 2020-01-05 21:31:54 +09:00
collett
fc07ec09b2 more clean up 2020-01-05 20:54:49 +09:00
collett
a27098390b Minor tweaks and code clean up. 2020-01-05 20:49:50 +09:00
collett
08283ebcc5 oops 2020-01-05 17:26:49 +09:00
collett
9cd17b3caa Action system updates. 2020-01-05 17:09:27 +09:00
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
Adam
9439a02c0b
Merge pull request #617 from collett8192/abandon_quest 
Move quest finish packet to where it belongs to so we can abandon que…
 2020-01-05 09:24:32 +11:00
collett
bab1d384c2 Inventory fixes. 2020-01-05 06:20:50 +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
Adam
6df0dcffe9
Merge pull request #616 from collett8192/event_battle 
Fix event battle.
 2020-01-04 01:20:56 +11:00
Adam
633004bf69
Merge pull request #615 from collett8192/aetheryte 
Fix aetheryte.
 2020-01-04 01:20:50 +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
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
Adam
fa7ddf5b6b
Merge pull request #612 from collett8192/add_item_dupe_fix 
Fix item being added more than once.
 2020-01-03 11:13:39 +11:00
karashiiro
e94bf44e6a
Merge pull request #1 from SapphireServer/develop 
merge merges
 2020-01-02 16:09:30 -08:00
collett
51046f9da0 Fix social list. 2020-01-03 05:24:06 +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
Adam
18078e928e
Merge pull request #611 from collett8192/actionlut_fix 
Fix non-existing lut entry being executed.
 2020-01-02 20:59:09 +11:00
collett
6fb6ccbda5 Fix non-existing lut entry being executed. 2020-01-02 17:42:48 +09:00
Adam
ff606f7378
Merge pull request #610 from NotAdam/develop 
fixed eventplay opcodes, fixed director opcodes, reordered ipcs.h correctly
 2020-01-02 15:24:18 +11: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
Adam
4951c323b0
Merge pull request #609 from collett8192/opcode_update 
Update 5.18 opcodes and packets.
 2020-01-02 14:21:48 +11:00
Adam
f5bf06ed00
Merge branch 'develop' into opcode_update 2020-01-02 14:21:39 +11:00
Adam
4b61b0b712
Merge pull request #608 from Kirrilius/develop 
fix warnings
 2020-01-02 13:24:26 +11:00
collett
5a4665af45 Update 5.18 opcodes and packets. 2020-01-01 23:17:13 +09:00
kbasikhin
80e72d316e fix warnings: 
using static and reinterpret casts instead of old style casts
comparing floating point with "==" or "!=" is not correct (Chara.cpp)
 2019-12-30 14:00:51 +03:00
kbasikhin
2f129bbe30 comparing floating point with "==" or "!=" is not correct (Chara.cpp) 2019-12-30 13:59:57 +03:00
kbasikhin
4186df6b40 using static and reinterpret casts instead of old style casts 2019-12-30 13:58:41 +03:00
karashiiro
b79d6d075d Identify elementalLevel and element in PlayerSpawn packet 2019-12-21 16:17:46 -08:00
Adam
51d29df7ac
Merge pull request #605 from karashiiro/develop 
CharaNameReq opcode update
 2019-11-25 14:25:35 +11:00
karashiiro
3ebaf8bd5f Merge branch 'develop' of https://github.com/karashiiro/Sapphire into develop 2019-11-24 19:06:30 -08:00
karashiiro
5872579cf6 CharaNameReq opcode update 2019-11-24 19:05:27 -08:00
Adam
7e0f836095
Merge pull request #604 from Caraxi/patch-2 
UpdatePositionHandler 5.11
 2019-11-24 13:02:07 +11:00
Cara
73ad6b3fda
UpdatePositionHandler 5.11 2019-11-24 12:29:24 +10:30
Mordred
e9ce3dff31
Merge pull request #603 from takhlaq/develop 
fix vs2019 build
 2019-11-23 10:41:45 +01:00
Tahir Akhlaq
e058c74409 fix vs2019 build 2019-11-23 09:22:42 +00:00
Adam
2edb0324cc
Merge pull request #602 from lmcintyre/develop 
minor instance script fixes, eobj parser should work as well as produ…
 2019-11-23 19:51:26 +11: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
Adam
a866005752
Merge pull request #597 from karashiiro/develop 
Market, inventory and player opcodes for 5.11, SetBait ActorControl
 2019-11-21 10:50:31 +11:00
Adam
6632d1ae92
Merge branch 'develop' into develop 2019-11-21 09:56:30 +11:00
Adam
0585665582
Merge pull request #601 from Caraxi/patch-1 
Update ClientTrigger OpCode
 2019-11-21 09:53:15 +11:00