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

3090 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
71bd6ef133 Merge remote-tracking branch 'remotes/origin/develop' into develop_c 2020-01-02 21:09:30 +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
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
collett
28a88e5a96 Merge remote-tracking branch 'remotes/origin/develop' into develop_c 2020-01-02 17:37:40 +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
NotAdam
371382dc0a fix build error 2020-01-02 14:22:36 +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
56296d295a Attempt to fix combo actions. 2020-01-02 08:07:33 +09:00
collett
f6bff46c9a Aggro the player when hostile action is used. 2020-01-02 02:46:00 +09:00
collett
f07ac7f6e5 More 5.18 opcode. 2020-01-02 02:45:19 +09:00
collett
12fd17e09c Really fix sprint (and other scripted actions as well). 2020-01-02 01:52:20 +09:00
collett
5a4665af45 Update 5.18 opcodes and packets. 2020-01-01 23:17:13 +09:00
collett
9b25a84c26 Fix sprint for now. 2020-01-01 23:12:31 +09:00
collett
cab6612285 Fix navmesh memory leak. 2020-01-01 22:08:17 +09:00
collett
9723977c47 Fix event battle. 2020-01-01 22:07:43 +09:00
collett
b4dc049ae1 Update 5.18 opcodes and packets. 2020-01-01 22:07:23 +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