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

2949 commits

This branch
This branch
All branches
Author SHA1 Message Date
NotAdam
53ce882ce8 action_parse can take an exd path as a launch arg now 2020-01-06 20:23:03 +11:00
Adam
12ebf2e997 Merge pull request #620 from collett8192/action 
Action system updates.
 2020-01-06 20:23:14 +11:00
collett
26f23a1147 no need to return the list 2020-01-06 17:52:45 +09:00
collett
e6c3e327f7 Fix skill animation for other players. 2020-01-06 04:31:09 +09:00
コレット
4deac81abd Merge branch 'develop' into action 2020-01-06 00:37:57 +09:00
collett
c319cb012c combo fix 2020-01-06 00:25:42 +09:00
collett
4b89c45790 local var rename 2020-01-05 21:31:54 +09:00
collett
5cbff4f12b more clean up 2020-01-05 20:54:49 +09:00
collett
bf247276b5 Minor tweaks and code clean up. 2020-01-05 20:49:50 +09:00
Adam
b374676c59 Merge pull request #622 from SapphireServer/exit_poprange 
use lgbs to handle zonelines/aetherytes/discovery instead of db table
 2020-01-05 21:03:43 +11:00
NotAdam
bbf3188d92 opcode fixes 2020-01-05 20:52:51 +11:00
NotAdam
45ba202ac2 fix InstanceObjectCache crashing if expansion is not installed 2020-01-05 20:36:52 +11:00
NotAdam
8fa3a7d3f4 Merge branch 'develop' into exit_poprange 2020-01-05 20:06:31 +11:00
Adam
f53d342d17 Merge pull request #621 from collett8192/stats_calc 
Fix base stats calc.
 2020-01-05 19:50:17 +11:00
collett
3c811f6fee Fix base stats calc. 
Better max hp.
 2020-01-05 17:41:38 +09:00
collett
eafb6f45b7 oops 2020-01-05 17:26:49 +09:00
collett
e8dcef63ba Action system updates. 2020-01-05 17:09:27 +09:00
Adam
85625244c8 Merge pull request #619 from collett8192/inventory_fixes 
Inventory fixes.
 2020-01-05 09:24:51 +11:00
Adam
024b5c31b8 Merge pull request #618 from collett8192/quest_reward 
Fix quest reward choice.
 2020-01-05 09:24:40 +11:00
Adam
b29b202a6f 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
c63e9d1517 Inventory fixes. 2020-01-05 06:20:50 +09:00
collett
159aafadf6 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
20f854b36f Move quest finish packet to where it belongs to so we can abandon quests. 2020-01-05 05:19:05 +09:00
Adam
28d3029abe Merge pull request #616 from collett8192/event_battle 
Fix event battle.
 2020-01-04 01:20:56 +11:00
Adam
6949c5f4b8 Merge pull request #615 from collett8192/aetheryte 
Fix aetheryte.
 2020-01-04 01:20:50 +11:00
collett
352a0ac823 Fix event battle. 2020-01-03 22:47:01 +09:00
collett
badfb2f0a9 Fix aetheryte. 2020-01-03 22:39:45 +09:00
Adam
ca2370910c Merge pull request #614 from karashiiro/develop 
More opcodes, ID PlayerSpawn fields
 2020-01-03 13:47:08 +11:00
karashiiro
61ac094b2b merge duplicate keys 2020-01-02 18:38:53 -08:00
karashiiro
a4440351b9 Merge branch 'develop' of https://github.com/karashiiro/Sapphire into develop 2020-01-02 16:15:53 -08:00
karashiiro
bca39ac17a CFNotifyPop and CFPreferredRole 2020-01-02 16:15:05 -08:00
Adam
e438a75168 Merge pull request #613 from collett8192/social_list_fix 
Fix social list.
 2020-01-03 11:14:23 +11:00
Adam
0f9f6c61d3 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
e19513ae4d Merge pull request #1 from SapphireServer/develop 
merge merges
 2020-01-02 16:09:30 -08:00
collett
bd1b23c834 Fix social list. 2020-01-03 05:24:06 +09:00
collett
e8ebabe025 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
885746c860 Merge pull request #611 from collett8192/actionlut_fix 
Fix non-existing lut entry being executed.
 2020-01-02 20:59:09 +11:00
collett
1ff69bcce0 Fix non-existing lut entry being executed. 2020-01-02 17:42:48 +09:00
Adam
86a2f18f25 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
7deae36146 more 5.18 opcodes 2020-01-02 15:10:04 +11:00
NotAdam
0d3e73e531 fix eventplay opcodes/names 2020-01-02 14:42:58 +11:00
NotAdam
ba74f988d6 fix build error 2020-01-02 14:22:36 +11:00
Adam
fa10458bce Merge pull request #609 from collett8192/opcode_update 
Update 5.18 opcodes and packets.
 2020-01-02 14:21:48 +11:00
Adam
6af408a24d Merge branch 'develop' into opcode_update 2020-01-02 14:21:39 +11:00
Adam
dc67ea56cb Merge pull request #608 from Kirrilius/develop 
fix warnings
 2020-01-02 13:24:26 +11:00
collett
b93dbbbaca Update 5.18 opcodes and packets. 2020-01-01 23:17:13 +09:00
kbasikhin
a6ba1848a6 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
a98a7eccc8 comparing floating point with "==" or "!=" is not correct (Chara.cpp) 2019-12-30 13:59:57 +03:00
kbasikhin
4c4fff58ce using static and reinterpret casts instead of old style casts 2019-12-30 13:58:41 +03:00
karashiiro
03f89dfbee Identify elementalLevel and element in PlayerSpawn packet 2019-12-21 16:17:46 -08:00