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

6551 commits

This branch
This branch
All branches
Author SHA1 Message Date
Adam
9ae27baf03 fix compile warning - missing return 2023-01-19 14:45:48 +11:00
Adam
394f9ed9d6
Merge pull request #829 from T00fy/uldah_quest_fix2 
Fixing the starting Ul'dah quest (ManWil004) by using the new bindSceneReturn API
 2023-01-19 13:33:19 +11:00
Adam
297a536951
Merge pull request #834 from dude22072/ClassQuestWork 
[3.0] Fix some WHM Questline stuff
 2023-01-19 13:33:05 +11:00
Adam
c2a65c0a52
Merge pull request #835 from dude22072/SidequestWork 
[3.0] Gridania Sidequests
 2023-01-19 13:32:58 +11:00
Mordred
bb22495ae1 Initial fixes for playerstatus packet for 3.3 2023-01-18 23:18:06 +01:00
Mordred
920da4de3b Tiny cleanup 2023-01-18 21:44:26 +01:00
dude22072
4c8724cff9 Harvest Dance quest 2023-01-17 20:08:32 -06:00
dude22072
0926f25fc5 linux please 2023-01-17 17:48:01 -06:00
dude22072
83428a56d0 linux are you happy yet 2023-01-17 17:34:04 -06:00
dude22072
ca8c40672c Fix White Wolf Gate unlock 2023-01-17 17:21:52 -06:00
dude22072
1db2c0a14e Fix semicolon that made linux build unhappy 2023-01-17 17:03:55 -06:00
dude22072
4f954ba328 Fix LogMessage stuff 2023-01-17 17:03:24 -06:00
dude22072
b3bd756946 Gridania Sidequests 2023-01-17 16:56:30 -06:00
Mordred
cb6672b770
Merge pull request #833 from dude22072/ClassQuestWork 
[3.0] WHM ARR Questline
 2023-01-17 22:20:08 +01:00
Mordred
13cb3bb1d8
Merge pull request #832 from dude22072/ThreePointOh 
[3.0] Add BeforeTrialDung to isDefaultTerritory
 2023-01-17 22:19:52 +01:00
dude22072
0cabc03c21 WHM ARR Questline 2023-01-17 15:16:55 -06:00
dude22072
6e823da825 Add BeforeTrialDung to isDefaultTerritory 2023-01-17 12:47:00 -06:00
Toofy
6728724232 Fixing formatting and spacing 2023-01-17 18:29:25 +00: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
207f44294b
Merge pull request #831 from dude22072/ClassQuestWork 
[3.0] WHM ARR Relic Quest (w/ Psuedocode)
 2023-01-17 08:30:24 +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
dude22072
50b288f8c9 Update JobWhm001.cpp 2023-01-17 00:24:25 -06:00
dude22072
c536b0e7cf WHM ARR Relic Quest 2023-01-17 00:22:24 -06:00
Adam
e285ac991e
Merge pull request #830 from dude22072/SidequestWork 
[3.0] Odin Lore Sidequests
 2023-01-17 14:13:27 +11:00
Toofy
724dbf367b Fixing the starting Ul'dah quest by using the new bindSceneReturn api 2023-01-16 23:58:54 +00:00
dude22072
acdb35c86d More Sidequests 2023-01-16 17:36:50 -06:00
Adam
e75850a164
Merge pull request #827 from dude22072/SidequestWork 
[3.0] Some random sidequests to de-rust
 2023-01-16 15:43:23 +11:00
Adam
2b1fdd9db0
Merge pull request #828 from takhlaq/nav_export 
[3.x] fix nav_export for 3.05
 2023-01-16 15:42:42 +11:00
Tahir
cb5f8067d6 fix nav_export for 3.05 
- re-add multithreaded exporting and make it eat less ram
 2023-01-16 02:26:31 +00:00
dude22072
b79bd4964c Some random sidequests to de-rust 2023-01-15 18:06:15 -06:00
Mordred
bd1753423e Added a onPlayerDeath function, to be reworked when battlescripts arrive 2023-01-15 22:03:44 +01:00
Mordred
4d64ece25a
Merge pull request #826 from hkAlice/fick-mariadb-cmake 
[3.x] fix warpmgr argument on no aetherytes/teleport found;
 2023-01-13 20:31:08 +01:00
Alice Ogeda
88ccb927b6 fix warpmgr argument on no aetherytes found for teleport/position correction; 2023-01-12 16:07:11 -03:00
Adam
0be285c8d5
Merge pull request #825 from matthe815/persistence-record-fix 
fix: Fixed oversight where currency record not inserting
 2023-01-07 16:17:53 +11:00
Matthe815
40a0455c9e
fix: Fixed oversight where currency record not inserting 2023-01-06 23:40:31 -05: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
Adam
68a249792c
Merge pull request #823 from dude22072/ThreePointOh 
[3.0] clang-format
 2023-01-07 12:51:35 +11:00
dude22072
ce3fd65f39 Merge branch 'ThreePointOh' of https://github.com/dude22072/Sapphire into ThreePointOh 2023-01-06 17:23:38 -06:00
dude22072
eb2c9e611b Create .clang-format 2023-01-06 17:23:31 -06:00
Adam
3b272d3053
Merge pull request #821 from takhlaq/ThreePointOh 
change default byte order marking to utf-8
 2022-12-18 14:10:17 +11:00
Tahir
d7f1b1d85a change default byte order marking to utf-8 2022-12-17 14:27:46 +00:00
Adam
763f33af60
Merge pull request #820 from hkAlice/fick-mariadb-cmake 
[3.0] fick mariadb lib+headers up to 10.9;
 2022-10-28 09:09:12 +11:00
Adam
7e0c1a876b
Merge pull request #819 from dude22072/FestivalWork 
[3.0] Hatching-tide 2015
 2022-10-28 09:08:53 +11:00
Alice Ogeda
de1bb88e9a fick mariadb lib+headers up to 10.9; 2022-10-27 18:09:23 -03:00
dude22072
16a8d616f9 Hatching-tide 2015 2022-10-27 15:51:58 -05:00
Mordred
1781ffb030
Merge pull request #815 from dude22072/MSQwork 
[3.0] A Sapphire Reborn
 2022-03-14 23:39:23 +01:00
dude22072
ee4342bf92 Finish 2.0 MSQ 2022-03-14 14:01:09 -05:00
Mordred
042a2bbc5a
Merge pull request #814 from dude22072/ThreePointOh 
[3.0] Add more unlock IDs to common.h
 2022-03-06 13:58:50 +01:00