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

190 commits

Author SHA1 Message Date
Mordred
188d80d2ec Alot more cleanups in various areas. 2023-02-20 11:24:02 +01:00
Mordred
9b46b89c65 Changing various packet sending functions to clean up the project. 2023-02-17 15:34:51 +01:00
Rushi
a17c891c2c
[3.x] Basic map icon support (MapMgr backport) (#896) 
* Fix several structs

* Preliminary map icon support (only quests work)
Backport of #721 to 3.x

* MapMgr cleanup

* Add missing null check for ENpcBase

* Use CLASSJOB_SLOTS in PlayerSetup instead

* Use util function for getting bit fields
 2023-02-16 22:16:01 +01:00
Mordred
85501effed Implemented a basic actionintegrity implementation, subject to be changed. 
Fixed replay packet sending.
 2023-02-16 08:25:03 +01:00
Mordred
9f100bc671 Fixed a couple minor struct issues and overall changed login packetflow to be more retail-like. 
Added a few unknown actorcontrol packets for testing.
 2023-02-14 13:50:08 +01:00
Lucy
7524e39304 Cleaner way to add gearsets 2023-02-12 23:11:26 +01:00
Lucy
5f04ef60ef Set FirstClass properly 2023-02-11 17:31:48 +01:00
Lucy
595795d3b0 Implement glamouring 2023-02-11 17:31:48 +01:00
Mordred
a55e912d9f Merge attempt #2 2023-02-10 21:38:08 +01:00
Mordred
4a8092b71e Revert "Merge and minor cleanup" 
This reverts commit 4c35944433.
 2023-02-10 21:28:34 +01:00
Mordred
4c35944433 Merge and minor cleanup 2023-02-10 21:22:54 +01:00
Mordred
19d84b5eb3 Merge branch 'master' of https://github.com/SapphireMordred/Sapphire 2023-02-10 21:16:31 +01:00
Alice Ogeda
83a08ea149 Merge branch 'master' of https://github.com/SapphireServer/Sapphire into teletubbies-vacuum-cleaner 2023-02-10 17:14:24 -03:00
Alice Ogeda
2ae6600a03 fix bonus stats being unset on login; 2023-02-10 17:14:09 -03:00
Alice Ogeda
38c176c4b6 raise anim on death return warp; 2023-02-10 15:21:48 -03:00
Alice Ogeda
88f8c7c19a move teleport to warpmgr; more player to playermgr; cleanup; 2023-02-10 13:05:53 -03:00
Alice Ogeda
2b57b73471 first batch of moving packet/logic out of player to playermgr; 2023-02-10 12:11:11 -03:00
Mordred
2d3486ea1f Moved onFcLogout to a better place 2023-02-10 08:56:58 +01:00
Lucy
dac6c63414 Fix dyeing and implement removeItem method 2023-02-10 04:54:50 +01:00
Mordred
96b61dc3ed
Merge pull request #854 from hkAlice/3.3 
[3.x] achievement code cleanup;
 2023-01-29 12:36:03 +01:00
Alice Ogeda
3c4b55859f achievement code cleanup; 2023-01-27 18:54:54 -03:00
Mordred
01b262edc1 Entrances are being placed based on placard position 2023-01-27 22:33:30 +01:00
Mordred
6cde08d073 Cleanup inside the player class. 2023-01-27 11:13:57 +01:00
Mordred
cc0a7aa70a WiP Fixed exiting house 2023-01-26 22:39:50 +01:00
Mordred
0cfde3d9e8 WiP Land purchase does now directly update and building somewhat works. Still needs work. 2023-01-25 12:07:23 +01:00
Lucy
7aa18548f0 Fix battle actor control 2023-01-24 18:51:53 +01:00
Mordred
b2f87c2f68
Merge pull request #848 from Skyliegirl33/ThreePointThree 
[3.3] Some fixes and add companions and persistent emote cancel
 2023-01-24 08:07:34 +01:00
Mordred
30ed230187
Merge pull request #850 from hkAlice/3.3 
[3.x] quest achievement implementation; prototype history; fix achv exd for 3.3; fix issue with achv list range;
 2023-01-24 08:05:35 +01:00
Alice Ogeda
e36cdadb58 prototype achievement history; 2023-01-23 22:58:07 -03:00
Mordred
850509f8bd WiP Buying plots reenabled. 2023-01-23 22:58:25 +01:00
Lucy
8f0c517514 [wip] Implement minions 2023-01-23 21:51:02 +01:00
Lucy
a35455a4f4 Remove status updates in unnecessary places 
(cherry picked from commit 12f68b62690861675daa2436630f33518c39b7f7)
 2023-01-23 06:02:55 +01:00
Mordred
2f39f3d4a2 Adjusted structs for 3.3, might still be more to fix. 2023-01-20 21:50:08 +01:00
Mordred
258dc8d69b Fixed effectpacket flags. 2023-01-20 11:40:35 +01:00
dude22072
601cf81353 Hunting log crash fix 2023-01-19 14:34:53 -06:00
Mordred
96249275f7
Merge pull request #837 from Skyliegirl33/feature-impl 
[3.x] Fix a few issues, add SubSea005 QB
 2023-01-19 21:16:11 +01:00
Lucy
6580fe1721 Finally fix TP being stuck at 0 2023-01-19 19:51:31 +01:00
Alice Ogeda
423af6f9bc myerge; 2023-01-19 13:05:27 -03:00
Alice Ogeda
34213990bc AchievementMgr framework; styling fixes; 2023-01-19 13:03:54 -03:00
Mordred
8af39dfeb8 Clang tidy cleanups 2023-01-17 08:28:06 +01:00
Mordred
bd1753423e Added a onPlayerDeath function, to be reworked when battlescripts arrive 2023-01-15 22:03:44 +01:00
Matthew
f71230809b
Improved Persistence (#822) 
* persistant money

* removed hardcoding and fixed debug console spam

* refactor: fix coding system inconsistencies

* refactor: fix coding style inconsistencies in loading

* refactor: Missed some inconsistents

* refactor: Missed some more inconsistents

* quest: Introduced marauder quest (can get class, but no cutscenes yet)

* refactor: Code updated to fmt::format

* Delete ClsMar999.cpp

* Delete ClsMar998.cpp

* script-loader fix

* script-loader formatting

* build-error: removed broken dep
 2023-01-07 14:18:29 +11:00
Mordred
50fbdbfa12 renamed setSystemActionUnlock to setRewardFlag 2022-02-28 08:40:57 +01:00
Rushi
2474a3d285 Fix TP showing as 0 
(cherry picked from commit 8aed3c6a958424f4ffdce033b46ef62473b5925b)
 2022-02-20 19:30:00 +01:00
Mordred
2b3bb6297e Basic warptaxi work 2022-02-10 18:50:44 +01:00
Mordred
efe827416b More cleanups around namespaces 2022-02-05 23:31:35 +01:00
Mordred
cf69e1876a Finish zoning converted aswell 2022-01-30 16:26:44 +01:00
Mordred
bfdf732579 Removed old function for performZoning 2022-01-30 15:37:24 +01:00
Mordred
0838881a5b Overhaul of the queued zoning system 2022-01-30 14:44:17 +01:00
Alice Ogeda
56545371a3 warning cleanups; less raw pointers; 2022-01-27 18:35:19 -03:00