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

6588 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
Mordred
7de3d73e78
Merge pull request #794 from Skyliegirl33/feature-impl 
[3.x] Minor fixes (TP, item level calc, equip flags), added MapUpdate actor controls
 2022-02-20 23:01:37 +01:00
dude22072
61963ffb46 Merge branch 'ThreePointOh' of https://github.com/dude22072/Sapphire into ThreePointOh 2022-02-20 15:55:43 -06: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