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

416 commits

Author SHA1 Message Date
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
1d6028bc24
Merge pull request #805 from dude22072/MSQwork 
[3.0] More MSQ, beginning of Mor Dhona
 2022-02-27 23:33:27 +01:00
dude22072
18a816cd55 More MSQ, beginning of Mor Dhona 2022-02-26 23:30:39 -06: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
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
Mordred
bce246daef Merge branch 'ThreePointOh' of https://github.com/SapphireMordred/Sapphire into ThreePointOh 2022-02-23 10:25:39 +01:00
Mordred
227d5f8070 Rename getActiveBNpcByInstanceIdAndTriggerOwner to getActiveBNpcByLayoutIdAndTriggerOwner 2022-02-23 10:25:35 +01:00
dude22072
9ae3f7afda Delete duplicates 2022-02-23 03:12:36 -06:00
dude22072
f0957f9521 Final fix? 2022-02-23 02:54:34 -06:00
dude22072
2bb30ecb3e Update GaiUsb914.cpp 2022-02-23 02:46:02 -06:00
dude22072
eb6f7777e8 Did I fix it 2022-02-23 02:36:22 -06:00
dude22072
56a2443c56 fix folder screw up 2022-02-23 02:18:20 -06:00
dude22072
f37fb538d6 Fix some compile errors 2022-02-23 02:14:33 -06:00
dude22072
b57ea937ee Update GaiUsb604.cpp 2022-02-23 02:10:54 -06:00
Mordred
7400555fa5
Merge pull request #799 from dude22072/GridaniaMSQWork 
[3.0] MSQ quests through Corethas
 2022-02-23 09:07:27 +01:00
dude22072
e97bdaa950 MSQ quests through Corethas 2022-02-23 02:01:36 -06:00
Mordred
bb6381d15c onBNpcKill now takes a bnpc ref 2022-02-23 08:36:23 +01:00
Mordred
a37046f0ec Renamed bnpc create and retrieve functions 2022-02-22 21:46:36 +01:00
Mordred
a56585629e
Merge pull request #798 from dude22072/FestivalWork 
[3.0] Lightning event quests
 2022-02-21 08:36:39 +01:00
Mordred
94944e027b
Merge pull request #797 from dude22072/GridaniaMSQWork 
[3.0] Few more MSQ
 2022-02-21 08:36:27 +01:00
dude22072
f18b94340e Still more MSQ 2022-02-21 00:24:37 -06:00
dude22072
05bfa2eb0d Update FesLgt002.cpp 2022-02-20 19:03:50 -06:00
dude22072
a50c1858d5 Lightning Event quests 2022-02-20 19:02:52 -06:00
dude22072
33bb3a8f28 Few more MSQ 2022-02-20 17:59:39 -06:00
dude22072
de6a3b3128 BTN questline 2022-02-19 21:50:01 -06:00
Mordred
0b1ce7662d
Merge pull request #791 from dude22072/GridaniaMSQWork 
[3.0] MSQ into Coerthas
 2022-02-18 23:20:55 +01:00
dude22072
42a20c4dfc MSQ: Start of Coerthas 2022-02-17 20:03:19 -06:00
dude22072
b9e5fc11e8 MSQ until Cid remembers himself 2022-02-17 19:15:47 -06:00
Mordred
6f26d6f9b0
Merge pull request #789 from dude22072/GridaniaMSQWork 
[3.0] MSQ up through titan
 2022-02-17 23:44:57 +01:00
dude22072
d1421e2fbf MSQ: ABADABADABAH ABADABADABAH ABADABADABAH TITAN 2022-02-17 16:31:45 -06:00
Mordred
c6eaac892c
Merge pull request #788 from Skyliegirl33/feature-impl 
[3.x] Add nest event to FcTalk
 2022-02-17 10:21:33 +01:00
Rushi
31bd3ffb48 Add nest event to FcTalk 2022-02-17 09:54:17 +01:00
collett
2f40b0d2cc limsa msq SubSea052, SubSea053. 2022-02-17 17:45:45 +09:00
Mordred
70e2019111 Merge branch 'ThreePointOh' of https://github.com/SapphireMordred/Sapphire into ThreePointOh 2022-02-17 09:12:15 +01:00
Mordred
d27c78c1b6 Removed Halfshell script 2022-02-17 09:12:08 +01:00
Mordred
4dac573fd1
Merge pull request #786 from Skyliegirl33/feature-impl 
[3.x] Implement FcTalk and SmallTalk, add method to check quest completion
 2022-02-17 09:11:24 +01:00
Mordred
784dd7b000 Merge branch 'ThreePointOh' of https://github.com/SapphireMordred/Sapphire into ThreePointOh 2022-02-17 08:32:01 +01:00
Mordred
abd456d2b3 Trying to fix compilation issues related to HaroontheHalfShell 2022-02-17 08:31:57 +01:00
Rushi
b151906f17 Remove unnecessary eventStart and Sastasha seq fix 2022-02-17 08:19:52 +01:00
Mordred
48ceeef9b3
Merge pull request #785 from dude22072/FestivalWork 
[3.0] Fix some small errors in Valentines 2015
 2022-02-17 08:07:10 +01:00
dude22072
b707a4afee Update FesVlt101.cpp 2022-02-16 21:50:12 -06:00
Rushi
e7fb339eef Implement SmallTalk (menus not working) 2022-02-17 04:20:25 +01:00