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

6464 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
dude22072
0a89948ce5 Merge branch 'ThreePointOh' of https://github.com/dude22072/Sapphire into ThreePointOh 2022-03-05 22:11:00 -06:00
dude22072
3e5b18b29a More unlock IDs 2022-03-05 22:10:56 -06:00
Mordred
5006960d54
Merge pull request #813 from dude22072/SidequestWork 
[3.0] Some random sidequests
 2022-03-02 08:27:37 +01:00
Mordred
cbdbb65562
Merge pull request #812 from dude22072/FestivalWork 
[3.0] Little Ladies Day 2015
 2022-03-02 08:27:16 +01:00
Mordred
94d98dc4d8
Merge pull request #811 from dude22072/ThreePointOh 
[3.0] Treasure Hunt unlock quest
 2022-03-02 08:27:00 +01:00
dude22072
547c484101 Some random sidequests 2022-03-01 21:22:00 -06:00
dude22072
74a68594bd Little Ladies Day 2015 2022-03-01 14:56:05 -06:00
dude22072
c5e90be776 Treasure Hunt unlock quest 2022-03-01 14:54:46 -06:00
Mordred
20a3f61e1e
Merge pull request #810 from dude22072/MSQwork 
[3.0] MSQ up to Camp Bluefrog
 2022-03-01 09:27:25 +01:00
Mordred
2df911238f
Merge pull request #809 from dude22072/ThreePointOh 
[3.0] Add variables for quest achievement IDs
 2022-03-01 09:27:15 +01:00
dude22072
8da13e9971 MSQ up to Camp Bluefrog 2022-02-28 20:11:49 -06:00
dude22072
7d2a8c3e74 FFXI Shantotto Event 2022-02-28 16:48:45 -06:00
dude22072
6899d390b2 Leave IDs for quest achievements 2022-02-28 16:48:13 -06:00
Mordred
ce415c718f
Merge pull request #808 from dude22072/ThreePointOh 
[3.0] Add Rising Stones to EasyWarp command
 2022-02-28 08:54:52 +01: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
Mordred
83517ec2e7
Merge pull request #807 from dude22072/MSQwork 
[3.0] MSQ more Mor Dhona
 2022-02-28 08:35:52 +01:00
dude22072
c3eb604cb6 More MSQ, Add emote unlocks to Common.h 2022-02-28 01:29:07 -06:00
dude22072
08a2ac218f MSQ more Mor Dhona 2022-02-28 00:34:05 -06:00
Mordred
39fa561df5
Merge pull request #806 from dude22072/ThreePointOh 
[3.0] Update github workflow build.yml
 2022-02-27 23:43:36 +01:00
Mordred
1d6028bc24
Merge pull request #805 from dude22072/MSQwork 
[3.0] More MSQ, beginning of Mor Dhona
 2022-02-27 23:33:27 +01:00
Joseph M. Keller
8a2affd431
Update build.yml 2022-02-27 16:21:39 -06:00
Mordred
05c29261fa Added travis settings 2022-02-27 10:31:15 +01:00
dude22072
18a816cd55 More MSQ, beginning of Mor Dhona 2022-02-26 23:30:39 -06:00
Mordred
f77c1cd90b parse Event and PopRange into entries too 2022-02-26 10:50:10 +01:00
Mordred
2d234bfc5c Merge branch 'ThreePointOh' of https://github.com/SapphireMordred/Sapphire into ThreePointOh 2022-02-26 10:36:11 +01:00
Mordred
a1c6fd6651 Fixed types in lgb.h and lgbtypes.h 2022-02-26 10:36:03 +01:00
Mordred
b0e0f6db0b
Merge pull request #804 from Skyliegirl33/feature-impl 
[3.x] Use integral RNG in Sastasha and fix unmounting
 2022-02-24 22:47:22 +01:00
Rushi
594cb7f11d Fix unmounting 
(cherry picked from commit 5449d763cd93931b57f0c0cfdb37719d1bae7ddc)
 2022-02-24 22:25:10 +01:00
Rushi
3aa65a1ac9 Sastasha: use int RNG 
(cherry picked from commit e44f2be26ab96ab866d35d4ed849564e23dfef6f)
 2022-02-24 22:24:53 +01:00
Mordred
673157cef8
Merge pull request #803 from dude22072/MSQwork 
[3.0] MSQ through Garuda
 2022-02-24 10:31:41 +01:00
dude22072
e88a0e83fa MSQ through Garuda 2022-02-23 17:44:52 -06:00
Mordred
10bba80537
Merge pull request #802 from collett8192/develop_3.x 
[3.0] fix missing bnpc check in SubSea052
 2022-02-23 17:07:15 +01:00
collett
c4b014a88f fix missing bnpc check in SubSea052 2022-02-24 00:45:13 +09:00
dude22072
02a5637aeb Create GaiUsc102.cpp 2022-02-23 03:32:52 -06:00
Mordred
9afe70111b Fixed after script merge 2022-02-23 10:27:37 +01:00
Mordred
55e28c2126
Merge pull request #801 from dude22072/GridaniaMSQWork 
[3.0] Fix BNpc changes
 2022-02-23 10:26:44 +01:00