1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-27 06:47:45 +00:00
Commit graph

3292 commits

Author SHA1 Message Date
Mordred
3c7af0e726
Merge pull request #929 from ff14wed/Sapphire_Retail
Update ServerZoneIpcTypes for 6.38
2023-04-04 09:39:37 +02:00
Flawed
db005e874d Update ServerZoneIpcTypes for 6.38 2023-04-03 23:18:57 -07:00
Mordred
9f458ae27c
Merge pull request #914 from MapleHinata/Sapphire_Retail
Fix building on gcc and regenerate exd for 6.35
2023-03-07 14:46:29 +01:00
Maple
ffcf4b087c Update excel data to 6.35 2023-03-07 09:40:56 -03:00
Maple
7d8b5472be Add enhanced logging to exd_common_gen 2023-03-07 09:40:30 -03:00
Maple
71eb8dcf42 Fix building on gcc 2023-03-07 09:38:09 -03:00
Mordred
2862208cfe
Merge pull request #912 from ff14wed/Sapphire6.35
Update ServerZoneIpcTypes for 6.35
2023-03-07 11:21:01 +01:00
Mordred
28f3ab76de
Merge pull request #913 from Makar8000/nav-export-fix
Nav export fix for 6.x
2023-03-07 11:20:46 +01:00
Makar
3b80d7849c
Nav export fix for 6.x 2023-03-07 03:52:44 -06:00
Flawed
fc722572c5 Update ServerZoneIpcTypes for 6.35 2023-03-06 23:38:54 -08:00
Mordred
294f1aa498
Merge pull request #907 from Moydow/6.x_housing
6.x housing updates
2023-03-05 21:32:23 +01:00
Moydow
445597a639 add LandAvailability packet
New packet introduced in 6.1 that tells the client on clicking on a housing placard, whether the property is available by lottery or first-come-first-served, private or FC, etc.
2023-03-04 00:11:02 +00:00
Moydow
789a9e7058 always face north on entering a house 2023-03-04 00:10:05 +00:00
Moydow
9cc0b01b3b fix LandFlagsSlot
What was previously listed as "apartment" should be the private chambers in a FC house, and the unknown value should be apartments
2023-03-04 00:09:44 +00:00
Moydow
fe10e55118 make isFcHouse actually based on FC houses 2023-03-04 00:07:44 +00:00
Moydow
fbe38df8fa Better detection of housing subdivisions 2023-03-04 00:07:01 +00:00
Moydow
569fe373d1 update for Empyreum 2023-03-04 00:06:38 +00:00
Mordred
0cfb238472
Merge pull request #906 from Reyli/6.31Hotfix_Forks_Merge_to_OfficialSapphire
6.31 hotfix forks merge to official sapphire
2023-03-02 21:37:42 +01:00
Rey
6f186d8126 Readded the isHq code in PlayerQuest as suggested by collett 2023-03-02 12:04:19 -06:00
Rey
ae06d6e7c9 Fixed misc build errors.
Was missing Win64 on the CMakeSettings.json
Was missing the "Oodle" folder for the oodle DLL since it was just
looking in deps.
2023-03-02 11:14:47 -06:00
Rey
6ff45f7c5d Merge branch '6.31_Hotfix_Windows' (from unofficial forks) into Sapphire6.31
You can login to current retail (6.31 Hotfix) but also requires some new
fanagling with oodle.
2023-03-02 10:50:31 -06:00
Rey
b431e3bf13 Patch 6.31 Hotfix works and you can login. 2023-03-02 00:19:08 -06:00
Rey
762a35f8b9 Revert "Fix Oodle on Linux (todo:: make this not suck)"
This reverts commit 81bbe690a8.
2023-02-28 00:09:56 -06: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