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

3278 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Maple
95897dffc2 Add more client side opcodes, new characters can progress past opening now. 2023-01-27 20:55:25 -03:00
Maple
2c5c403172 Add partial client opcodes for 6.31, client can login 2023-01-27 18:47:24 -03:00
Maple
7dfbe76436 Update server opcodes to 6.31 (Thanks Flawed!) 2023-01-27 00:33:31 -03:00
Maple
206b98e1df Actually update exd to 6.31 2023-01-26 23:59:41 -03: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
Maple
f13bae27f7 Minor player fixes 2023-01-26 07:11:56 -03:00
Maple
79f58a36aa Add missing OnlineStatus.exd to CommonGen.h 2023-01-26 07:11:41 -03:00
Maple
81bbe690a8 Fix Oodle on Linux (todo:: make this not suck) 2023-01-26 07:10:45 -03:00
Maple
5b63cfb023 Re-add CountdownCancel opcode 2023-01-26 04:45:38 -03:00
Maple
8220d90ed6 Update CommonGen.h for Patch 6.31 2023-01-26 04:42:45 -03:00
Maple
a2bdb4e347 Update Network definitions to 6.30hf1 (Thanks Moydow, Reyli, Guaiguaijun) 2023-01-26 04:25:51 -03:00
Moydow
432cdc0de8 added a short form oodle2net.h 
Custom short version of oodle2net.h that only sets up the functions we need here. Still need oo2net_9_win64.dll and oo2net_9_win64.lib which won't be added here
 2023-01-26 04:22:44 -03:00