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

1384 commits

Author SHA1 Message Date
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
347141f1cd Use discardItem instead of dropInventoryItem 2023-01-19 20:18:14 +01:00
Lucy
36554bf1f3 Fix player not being removed upon leaving territory 
(cherry picked from commit 1713523e197a225fc5ff5c61a7143dcec091ad59)
 2023-01-19 19:52:58 +01:00
Lucy
5837b1b8b6 Add quest event callbacks to yieldeventstring handler 
(cherry picked from commit aae05b9f6ecb3af20caa547f58bff2b465957b76)
 2023-01-19 19:51:55 +01:00
Lucy
6580fe1721 Finally fix TP being stuck at 0 2023-01-19 19:51:31 +01:00
Lucy
2ac2ec1ea2 Fix quest bitflags to be retrieved in ascending order 
(cherry picked from commit 525c76dbf2bded510e6939fe7cf1dee561e2c903)
 2023-01-19 19:49:50 +01:00
Alice Ogeda
87a92eed4d fick linux build; 2023-01-19 13:38:00 -03:00
Alice Ogeda
99e2fb117e myerge agen; 2023-01-19 13:06:51 -03: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
a7763366ee Fixed PlayerStatusUpdate 2023-01-19 09:57:08 +01:00
Adam
9ae27baf03 fix compile warning - missing return 2023-01-19 14:45:48 +11:00
Mordred
920da4de3b Tiny cleanup 2023-01-18 21:44:26 +01:00
dude22072
6e823da825 Add BeforeTrialDung to isDefaultTerritory 2023-01-17 12:47:00 -06:00
Mordred
409dc173c5 Even more cleanup 2023-01-17 12:54:42 +01:00
Mordred
a02e58fd35 More overall cleanup and warning reductions 2023-01-17 11:27:39 +01:00
Mordred
436c04993f Missed a zone conversion 2023-01-17 08:29:07 +01: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
Alice Ogeda
88ccb927b6 fix warpmgr argument on no aetherytes found for teleport/position correction; 2023-01-12 16:07:11 -03: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
Joseph M. Keller
ae82314479
Add Rising Stones to EasyWarp command 2022-02-28 01:52:21 -06:00
Mordred
50fbdbfa12 renamed setSystemActionUnlock to setRewardFlag 2022-02-28 08:40:57 +01:00
Rushi
594cb7f11d Fix unmounting 
(cherry picked from commit 5449d763cd93931b57f0c0cfdb37719d1bae7ddc)
 2022-02-24 22:25:10 +01:00
Mordred
227d5f8070 Rename getActiveBNpcByInstanceIdAndTriggerOwner to getActiveBNpcByLayoutIdAndTriggerOwner 2022-02-23 10:25:35 +01:00
Mordred
bb6381d15c onBNpcKill now takes a bnpc ref 2022-02-23 08:36:23 +01:00
Mordred
5a3b22a4a7 Removed unused cell logic 2022-02-22 23:47:11 +01:00
Mordred
a37046f0ec Renamed bnpc create and retrieve functions 2022-02-22 21:46:36 +01:00
Mordred
d262e3f5a4
Merge pull request #796 from hkAlice/aggro-attempts 
[3.0] adds int, unspecified type, type range and array of values to rngmgr; warning cleanups;
 2022-02-20 23:02:58 +01:00
Mordred
540ded27da
Merge pull request #795 from dude22072/ThreePointOh 
[3.0] More EasyWarp locations
 2022-02-20 23:01:57 +01:00
dude22072
a0917b5727 More EasyWarp locations 2022-02-20 15:55:38 -06:00
Rushi
e8fdc72b6e Fix EquipDisplayFlags resetting on zonein 
(cherry picked from commit 9d29bab9a2a6417f764c2b9e2f9d0c834f7c4e92)
 2022-02-20 19:30:35 +01:00
Rushi
85578a5203 Fix itemlvl field 
(cherry picked from commit 969c44864c6df1648da995b6a36a759338ac3689)
 2022-02-20 19:30:26 +01:00
Rushi
2474a3d285 Fix TP showing as 0 
(cherry picked from commit 8aed3c6a958424f4ffdce033b46ef62473b5925b)
 2022-02-20 19:30:00 +01:00
Alice Ogeda
becbc4d54f remove debug to test rngmgr; 2022-02-19 23:54:21 -03:00
Alice Ogeda
92861799f8 add templated int and real distribution to rngmgr; add func to return amount of random values; support untyped value deduction; use typed min/max ranges for unspecified type; 2022-02-19 23:53:42 -03:00
Alice Ogeda
2f5d5e9d18 more warning cleanups; general styling fixes; 2022-02-19 22:05:30 -03:00
Alice Ogeda
c30f1866ad Merge branch 'ThreePointOh' of https://github.com/SapphireServer/Sapphire into aggro-attempts 2022-02-19 18:08:43 -03:00
Mordred
5288c6b00e
Merge pull request #792 from Skyliegirl33/contentfinder 
[3.x] CF commence and undersized implemented
 2022-02-18 23:22:10 +01:00
Mordred
0258c05050
Merge pull request #790 from Skyliegirl33/feature-impl 
[3.x] Add fate actrl, gearset handler (wip) and fix untargeting of client-side NPCs
 2022-02-18 23:20:47 +01:00
Rushi
47411c0e4b CF: Remove unused bool 2022-02-18 19:50:18 +01:00
Rushi
6e6dc43018 CF: Remove unnecessary method 2022-02-18 19:48:39 +01:00
Rushi
3c15b8566a CF: Implement commence and undersized 2022-02-18 19:41:11 +01:00
Rushi
a45d8b9271 Check max stack size 2022-02-18 02:37:04 +01:00
Rushi
c03968b194 WIP: Implement gearset handler 2022-02-18 02:24:18 +01:00
Rushi
4f90228105 Fix untargeting of client-side npcs 2022-02-18 02:21:25 +01:00
Mordred
feaacefc95 Updated EventHandlerTypes 2022-02-18 00:03:04 +01:00
Rushi
50102e0ff0 Add method for quest completion 2022-02-17 04:26:19 +01:00
Rushi
964716d2ee Implement FcTalk 2022-02-17 03:55:21 +01:00
Rushi
bd635b18c5 EObj: use permissionInvisibilty 2022-02-16 23:18:32 +01:00