1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-25 14:07:46 +00:00
Commit graph

3262 commits

Author SHA1 Message Date
Mordred
4482c95890
Merge pull request #945 from collett8192/Sapphire5.58
fix chat log when leaving dungeons.
2023-08-01 15:56:58 +02:00
collett
b7e35327b1 fix chat log when leaving dungeons. 2023-07-18 22:58:44 +09:00
Mordred
f383afa4ac
Merge pull request #944 from collett8192/Sapphire5.58
fix party list not updating when player move zone.
2023-07-18 15:00:26 +02:00
collett
8be05c15b9 fix party list not updating when player move zone. 2023-07-18 21:58:02 +09:00
Mordred
f4b83d16a2
Merge pull request #940 from collett8192/Sapphire5.58
fix event item action not executing without cast time
2023-06-13 23:01:43 +02:00
collett
c1aea6298e fix event item action not executing without cast time 2023-06-01 02:08:12 +09:00
Mordred
c53b2f3c34
Merge pull request #939 from collett8192/Sapphire5.58
[5.58]PartyMgr, ChatChannelMgr ported from 3.x
2023-05-31 10:10:39 +02:00
Mordred
67e17143c4 PartyMgr, ChatChannelMgr ported from 3.x 2023-05-30 22:42:20 +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
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
4411f22123 store item hq state in flags field 2023-03-11 18:44:37 +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
Mordred
8afaa0a42d Merge remote-tracking branch 'origin/develop' 2023-02-04 14:24:31 +01:00
Mordred
3c6fccbad0
Merge pull request #852 from collett8192/patch
Handle house removing.
2023-01-26 14:45:48 +01:00
collett
1e7176b3d8 minor fix 2023-01-26 22:30:42 +09:00
collett
3624b4374f Handle house removing.
Also restored the house building scene, might still crash sound device though.
2023-01-26 20:06:27 +09:00
Mordred
991e0551c3
Merge pull request #733 from Taezen/develop
Remove completed quest properly
2022-01-14 08:19:10 +01:00
Adam
aef56c9f33
Merge pull request #741 from terramakes/master
Change generator parameter to Visual Studio 17 2022
2021-12-09 12:23:58 +11:00
Claire Berman
9de4176b1e
Change generator parameter to Visual Studio 17 2022 2021-12-08 10:54:17 -07:00
Taezen
52d83465a1 remove completed quest properly 2021-09-29 15:43:15 +02:00
Adam
fee9ed6b05
Merge pull request #731 from collett8192/patch
prevent writing an invalid intermediate state to db when inventory action happens inside a single container
2021-09-17 21:56:36 +10:00
collett
413c69aa41 container db fix 2021-09-17 02:07:15 +09:00
Adam
1689b3fd1a
Merge pull request #730 from collett8192/patch
fix the loading of some quest battles
2021-09-15 19:16:20 +10:00
collett
1fa5aadf1c update proper event type check 2021-09-15 16:55:45 +09:00