1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-04 01:37:47 +00:00
Commit graph

452 commits

Author SHA1 Message Date
Pinapelz
171fa1db7e Implemented SubSea005 2023-02-10 13:06:56 -08:00
Pinapelz
b3187c4037 Added EventNotice to SubSea003 2023-02-10 12:56:26 -08:00
Pinapelz
e3070c7849
Merge branch 'SapphireServer:master' into sidequests 2023-02-10 12:41:02 -08:00
Pinapelz
59862d7460 Implemented SubSea003 2023-02-10 12:40:44 -08:00
Alice Ogeda
83a08ea149 Merge branch 'master' of https://github.com/SapphireServer/Sapphire into teletubbies-vacuum-cleaner 2023-02-10 17:14:24 -03:00
Pinapelz
a54d6edacc Implemented SubSea004 2023-02-10 11:30:04 -08:00
Pinapelz
b508b996c6 Implemented SubSea002 2023-02-10 11:29:54 -08:00
Alice Ogeda
88f8c7c19a move teleport to warpmgr; more player to playermgr; cleanup; 2023-02-10 13:05:53 -03:00
Toofy
0157b1b7f8 fixed up comments 2023-02-10 15:15:59 +00:00
Alice Ogeda
2b57b73471 first batch of moving packet/logic out of player to playermgr; 2023-02-10 12:11:11 -03:00
collett
add5c215d4 gold saucer intro quest 2023-02-10 09:33:00 +09:00
Toofy
ea2705165a Reimplemented EventItem. Fixed bug with onDeath not triggering when bnpc kills player. Fixed EventItem struct. Implemented ClsThm050 quest. Fixed some wrong param names 2023-02-09 22:57:21 +00:00
Mordred
38b92fafa9 Create and load member lists of fcs. 2023-02-08 15:22:33 +01:00
Pinapelz
79bfbfb0c6 Implemented FesNyr201 (Heavensturn 2016) 2023-02-07 23:44:07 -08:00
Mordred
6a36433235 Another batch of FC boilerplate 2023-02-06 15:49:47 +01:00
Mordred
0df9fca281 Beginnings of FC. FC can be created in petition mode. 2023-02-05 22:46:46 +01:00
Toofy
ca036db5c9 Implementing quest ClsThm020 2023-02-05 15:29:04 +00:00
Adam
2d86fe3bbe
Merge pull request #871 from T00fy/subwil020
Fixing subwil020 quest
2023-02-05 14:00:16 +11:00
Toofy
11fb11bb32 Fixing subwil020 quest 2023-02-05 02:28:41 +00:00
Adam
1291d27a98
Merge pull request #869 from T00fy/subwil013
Implementing subwil013 quest
2023-02-05 12:45:20 +11:00
Adam
9ab126fc07
Merge pull request #866 from T00fy/subwil014
Implementing subwil014 quest
2023-02-05 11:50:21 +11:00
Toofy
ad15ff5a0a Implementing subwil013 quest 2023-02-05 00:43:15 +00:00
Toofy
6e210914aa Implementing subwil014 quest 2023-02-04 23:14:16 +00:00
Mordred
28e0d33921 Some more Fc testing code. 2023-02-04 23:41:04 +01:00
Mordred
54f3ffa063
Merge pull request #864 from takhlaq/ThreePointThree
[draft] fix typo in scripts cmake
2023-02-04 23:38:51 +01:00
Tahir
451f059bb7 have watchdog remove the lock file when finished loading the module
should be fixed fr fr this time ong
2023-02-04 22:01:13 +00:00
Tahir
d2d451e670 fix typo in scripts cmake 2023-02-04 20:51:21 +00:00
Mordred
cb1408264c
Merge pull request #862 from T00fy/subwil015
Subwil015
2023-02-04 21:45:52 +01:00
Tahir
835ba3889e attempt to fix ci for scripts cmake 2023-02-04 20:33:11 +00:00
Tahir
f9b5e0e874 more watchdog shenanigans 2023-02-04 20:10:14 +00:00
Toofy
05b88a3038 Finish subwil015 quest 2023-02-04 19:39:10 +00:00
Toofy
5fd4ebab0e wip 2023-02-04 19:39:10 +00:00
Tahir
6f457a4e7e scripts: write a temp file when building modules so watchdog waits 2023-02-04 19:24:43 +00:00
Tahir
e5fd01baaf fix build cause extra slash in scripts cmake 2023-02-04 18:42:38 +00:00
Tahir
bd8c620e73 scripts: build modules to tmp directory before copying over to reload 2023-02-04 17:50:44 +00:00
Mordred
68a5040fb9 Class and db table for basic FC representation 2023-02-02 22:46:51 +01:00
Mordred
00d62fbc6c Major rework of yield events. 2023-02-01 13:34:21 +01:00
Mordred
9491b549a1 Some more work on FC related packets and custom scripts. 2023-01-30 13:11:05 +01:00
Mordred
78b66b9c92 Use proper exit position for house. 2023-01-28 17:26:48 +01:00
Mordred
cc0a7aa70a WiP Fixed exiting house 2023-01-26 22:39:50 +01:00
Mordred
1af0b33807 WiP fixed code redundancy 2023-01-26 22:04:23 +01:00
Mordred
f5d16ee916 Merge remote-tracking branch 'origin/ThreePointOh' into ThreePointThree 2023-01-24 08:32:36 +01:00
Mordred
bf14348e13
Merge pull request #849 from dude22072/ClassQuestWork
[3.0] Miner Questline (ARR+HW)
2023-01-24 08:05:45 +01:00
dude22072
e8068164d3 Miner Questline (ARR+HW) 2023-01-23 17:39:13 -06:00
Mordred
850509f8bd WiP Buying plots reenabled. 2023-01-23 22:58:25 +01:00
Lucy
98b5e1694f Prevent bed animation playing on zonein to inn
(cherry picked from commit 380c0f7cc6c028c868eff54e56f6bf6ff96e9883)
2023-01-23 06:03:33 +01:00
Adam
5a189bfbd0
Merge pull request #839 from dude22072/SidequestWork
[3.0] Central Shroud sidequests
2023-01-20 16:31:11 +11:00
dude22072
1267a66f81 Some Central Shroud quests 2023-01-19 18:00:27 -06:00
dude22072
bd08532f1f Cleanup an old quest that was acting weird 2023-01-19 15:12:28 -06:00
Lucy
49aeb1ec43 Implement Lurkers in the Grotto QB
(cherry picked from commit 4b2affb341e613bd99ccca54e0e0132a2bdb19e7)
2023-01-19 19:52:38 +01:00