mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-04 17:57:47 +00:00
Code Activity
3274 commits 10 branches 14 tags 26 MiB
Commit graph

3274 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mordred
7580e12aad Keep cells active for 20 seconds even after all players left. 
Also reset target and autoattack state on player on change zone.
 2023-03-18 06:39:04 +09:00
Mordred
4ceb771a16
Merge pull request #925 from collett8192/Sapphire5.58_action 
attackType, minor fixes and merge 5.58 main
 2023-03-14 23:10:00 +01:00
collett
1c51b329ef Merge remote-tracking branch 'remotes/origin/Sapphire5.58' into Sapphire5.58_action 2023-03-15 06:40:44 +09:00
collett
2c3b2dfd9b add attackType in damage effect 2023-03-15 06:40:27 +09:00
Mordred
e7578c139c
Merge pull request #924 from collett8192/Sapphire5.58 
fix model not updating when unequip item, added guards to detect inventory desync and prevent item overwriting.
 2023-03-14 22:39:23 +01:00
collett
f0c8f5ef87 fix model not updating when unequip item, added guards to detect inventory desync and prevent item overwriting. 2023-03-15 02:35:41 +09:00
collett
df8686f308 only block when a shield is on 2023-03-15 02:26:44 +09:00
collett
2986d4dff1 Merge remote-tracking branch 'remotes/origin/Sapphire5.58' into Sapphire5.58_action 2023-03-14 17:51:21 +09:00
collett
6576d3314d fix CastType 3 2023-03-13 22:32:33 +09:00
Mordred
c37e8e1272
Merge pull request #922 from collett8192/Sapphire5.58_action 
Allow bnpc to perform actions and basic BattleNpcScript support.
 2023-03-12 20:47:52 +01:00
Mordred
b61013ad3d
Merge pull request #921 from collett8192/Sapphire5.58 
store item hq state in flags field
 2023-03-12 20:47:37 +01:00
collett
5503e73352 basic BattleNpcScript support 2023-03-13 02:40:13 +09:00
collett
34770bd70f debug command to force bnpc action 2023-03-12 08:55:40 +09:00
collett
542f37fb3d allow bnpc to perform actions 2023-03-12 00:39:46 +09:00
collett
4411f22123 store item hq state in flags field 2023-03-11 18:44:37 +09:00
collett
8e77266b30 getType in EffectResult 2023-03-11 18:10:32 +09:00
Mordred
5b6131fdce
Merge pull request #918 from collett8192/Sapphire5.58_action 
add invuln to EffectBuilder
 2023-03-08 21:48:51 +01:00
collett
17b06e31d8 add invuln to EffectBuilder 2023-03-08 19:57:03 +09:00
Mordred
1341c53ff2
Merge pull request #917 from collett8192/Sapphire5.58_action 
minor fixes
 2023-03-08 09:21:15 +01:00
collett
0cf8009c3a first is not last 2023-03-08 04:12:52 +09:00
collett
125c07173b fix ActionEffectType which is wrong since 5.2 and use proper effect packet for self buffs 2023-03-08 04:10:12 +09:00
collett
d640506962 minor fixes 2023-03-08 02:47:31 +09:00
Mordred
aca46ac8ce
Merge pull request #911 from collett8192/Sapphire5.58_with_action_pr 
Sapphire 5.58 now with actions.
 2023-03-06 22:58:39 +01:00
collett
f00f930366 Sapphire 5.58 now with actions. 2023-03-07 05:15:48 +09:00
コレット
f608e1e8cf
Insert entities back into zone caches to make MapMgr happy. (#900) 2023-02-17 07:58:06 +01:00
Mordred
7deb52dac0
Merge pull request #877 from collett8192/service_workaround 
Service locator workaround for Visual Studio.
 2023-02-09 07:56:48 +01:00
Mordred
3539c45bd1
Merge pull request #876 from collett8192/Sapphire5.58 
More 5.58 updates, see individual commit for detail.
 2023-02-08 11:02:36 +01:00
collett
eb30d66788 Service locator workaround for Visual Studio. 2023-02-07 06:39:42 +09:00
collett
c4695ba3fd preserve chara effects across zones and show them to other in range players. 2023-02-07 06:10:46 +09:00
collett
df35893d8f custom unlock options in PlayerSetup. 2023-02-07 06:10:43 +09:00
Skyliegirl33
ea27ff3a55 Gearset handler, mount item action, some GLA starting quests. 
This is #732 with 25eaa62fa0 merged, cleaned up and slightly modified to avoid client desync.
 2023-02-07 06:10:10 +09:00
Mordred
f2d81604a9
Merge pull request #874 from collett8192/Sapphire5.58 
First batch of 5.58 updates.
 2023-02-05 22:56:11 +01:00
collett
14860047b6 First batch of 5.58 updates: 
- Common defs, ActorControls and packet updates (more to come later).
  - Haste added to chara base stats for later use.
  - Acquiring HQ items support (HQ status not yet saved to db, need table modification).
  - Event item support.
  - Load more default zones.
  - Quest related debug commands.
 2023-02-06 02:32:21 +09:00
Mordred
3c347d7590
Merge pull request #872 from collett8192/Sapphire5.58 
Port from 3.x: re-add multithreaded exporting and make it eat less ram
 2023-02-05 18:24:39 +01:00
Tahir
c82be40934 re-add multithreaded exporting and make it eat less ram 2023-02-05 17:49:21 +09:00
Adam
0782616851
Merge pull request #867 from collett8192/Sapphire5.58 
Fix vs2022 build
 2023-02-05 11:49:09 +11:00
Tahir
ee11c313ab Fix vs2022 build 2023-02-05 08:41:32 +09:00
Mordred
882eadbf47
Merge pull request #865 from collett8192/Sapphire5.58 
Miscellaneous fixes and LGB/Cell updates ported from 3.x
 2023-02-04 23:38:38 +01:00
collett
5d6aa369dc Fix item count in container. 2023-02-05 07:24:25 +09:00
collett
0d6a0719de fix quest battles which are using InstanceContent instead of QuestBattle. 2023-02-05 07:22:14 +09:00
collett
616b12c695 Fix OutsideRange event. 2023-02-05 07:20:29 +09:00
Mordred
abb295d4fe parse Event and PopRange into entries too 2023-02-05 07:18:31 +09:00
Mordred
3b139571eb Fixed types in lgb.h and lgbtypes.h 2023-02-05 07:18:31 +09:00
collett
459fa4865b fix merge error 2023-02-05 07:18:31 +09:00
Mordred
ec7195639e Removed unused cell logic 2023-02-05 07:18:31 +09:00
Mordred
a9a628fe47 Updated EventHandlerTypes 2023-02-05 07:18:31 +09:00
Mordred
ba1b8aadfb Added layerset parsing 2023-02-05 07:18:30 +09:00
Mordred
a56eec5d32 Fallback to entranceRect if no entrance circle is found in instance 2023-02-05 07:18:30 +09:00
Mordred
a84d0f4154 Map previously unmapped eobj and enpc 
# Conflicts:
#	src/world/Manager/EventMgr.cpp
 2023-02-05 07:18:30 +09:00
Mordred
6669300124 Changed information in readme in merged develop into master 2023-02-04 14:25:46 +01:00