Commit graph

1316 commits

Author SHA1 Message Date
ryannathans
662efb07af remove server monitor surprise 2022-01-11 21:14:58 +11:00
ryannathans
8dbab51dfc hotfix for headless environments (again) 2022-01-11 21:06:25 +11:00
Ryan
a117451328 Merge branch 'master-but-core-reverted' into 'master'
Fix stability issues and a various assortment of other bugs

See merge request 2009scape/2009scape!384
2022-01-11 09:36:57 +00:00
Ryan
47bc652eed Fix stability issues and a various assortment of other bugs 2022-01-11 09:36:57 +00:00
Ryan
d3bb3905b3 Merge branch 'fishing-edge-2' into 'master'
Fishing Guild & Edgeville Fixes

See merge request 2009scape/2009scape!385
2022-01-11 06:25:42 +00:00
downthecrop
8f4a003db8 Fishing Guild & Edgeville Fixes 2022-01-11 06:25:42 +00:00
Ryan
fb4296debd Merge branch 'fix-blastcoal-saves' into 'master'
Fix player saves for players who used coal on the conveyer belt before bf-fixes.

See merge request 2009scape/2009scape!380
2022-01-06 00:02:54 +00:00
Avi Weinstock
1b0bdf4de5 Fix player saves for players who used coal on the conveyer belt before bf-fixes. 2022-01-05 14:49:45 -05:00
Ceikry
eca439b99e Merge branch 'bf-fixes' into 'master'
Prevent furnace temperature from going negative and deduplicate bar handling.

See merge request 2009scape/2009scape!379
2022-01-03 19:24:31 +00:00
Avi Weinstock
d81803f938 Prevent furnace temperature from going negative and deduplicate bar handling. 2022-01-03 19:24:30 +00:00
Ceikry
29b50dfbac Merge branch 'fixbracelet' into 'master'
fix #247 - emerald and diamond bracelet enchant no longer noted

See merge request 2009scape/2009scape!373
2022-01-03 02:41:44 +00:00
Ryan
7f1a8b5b44 fix #247 - emerald and diamond bracelet enchant no longer noted 2022-01-03 02:41:44 +00:00
Ceikry
b22790c1a4 Merge branch 'chartercost' into 'master'
fix #245 - replace -1 charter boat costs with 0

See merge request 2009scape/2009scape!374
2022-01-03 02:41:34 +00:00
Ryan
47433958ae fix #245 - replace -1 charter boat costs with 0 2022-01-03 02:41:33 +00:00
Ceikry
79d26a9b5a Merge branch 'pickpocketwoman' into 'master'
fix #236 - can now pickpocket woman (id 25)

See merge request 2009scape/2009scape!375
2022-01-03 02:41:23 +00:00
Ryan
39ee7bdefc fix #236 - can now pickpocket woman (id 25) 2022-01-03 02:41:22 +00:00
Ceikry
ccd7516126 Merge branch 'godarmour' into 'master'
remove range strength and prayer bonus from rune god armour

See merge request 2009scape/2009scape!376
2022-01-03 02:41:12 +00:00
Ryan
04733d6d94 remove range strength and prayer bonus from rune god armour 2022-01-03 02:41:12 +00:00
Ceikry
4f80528530 Merge branch 'magicdartxp' into 'master'
fix #205 - make xp on magic dart authentic

See merge request 2009scape/2009scape!377
2022-01-03 02:41:00 +00:00
Ryan
4ffb8be25d fix #205 - make xp on magic dart authentic 2022-01-03 02:40:59 +00:00
Ceikry
11eaa9f3a8 Merge branch 'revert-dynamic-region-changes' into 'master'
Revert the dynamic region based parts of sc-backports, which seem to have...

See merge request 2009scape/2009scape!378
2022-01-02 21:36:00 +00:00
Avi Weinstock
efba27e661 Revert the dynamic region based parts of sc-backports, which seem to have... 2022-01-02 21:36:00 +00:00
Ceikry
f694361a7b Merge branch 'fixcannonballs' into 'master'
fix cannonballs

See merge request 2009scape/2009scape!372
2022-01-02 15:27:53 +00:00
Ryan
2bd8999aa0 fix cannonballs 2022-01-02 15:27:53 +00:00
ceikry
bc67e988cf add redundant unlocks to penguin spy pulse 2022-01-01 15:15:57 -06:00
ceikry
28efb3c5a7 Fixed global kill counter initialization 2022-01-01 14:52:32 -06:00
ceikry
fca2aa0ccf Fixed another incorrect dialogue initialization 2022-01-01 12:55:43 -06:00
ceikry
d296b48dea Merge remote-tracking branch 'origin/master' 2022-01-01 11:27:26 -06:00
ceikry
2b98e963b9 Convert poorly written Fam Crest plugin to Listener 2022-01-01 11:27:18 -06:00
Ceikry
11740aaa52 Merge branch 'fc-hotfix' into 'master'
Allow starting family crest.

See merge request 2009scape/2009scape!371
2022-01-01 08:12:42 +00:00
Avi Weinstock
6c5eb2728a Allow starting family crest. 2022-01-01 08:12:42 +00:00
ceikry
1e6ca6b379 Reintroduce watchdog 2022-01-01 02:12:23 -06:00
ceikry
daf050230c Disable server monitor for now (note to self: Kotlin objects instantiate no matter what, even if not being called to.) 2021-12-31 22:46:59 -06:00
ceikry
777e9b7f04 Hotfix for headless environments 2021-12-31 22:44:28 -06:00
ceikry
9006ce9d98 Add missing entries to changelog 2021-12-31 22:17:07 -06:00
ceikry
5a92c4c4ce Update changelog 2021-12-31 22:15:34 -06:00
ceikry
a79d11c707 Merge remote-tracking branch 'origin/master' 2021-12-31 21:45:29 -06:00
ceikry
a22b5b18c3 Fix removal of xp multiplier enforcements 2021-12-31 21:45:20 -06:00
Ceikry
a667a7f3e5 Merge branch 'readme' into 'master'
updated readme, fixed .gitattributes to track cache contents

See merge request 2009scape/2009scape!367
2022-01-01 02:41:38 +00:00
Ryan
1977ac3005 updated readme, fixed .gitattributes to track cache contents 2022-01-01 02:41:38 +00:00
ceikry
c2e97287ad Disable gift roll plugin 2021-12-31 18:49:20 -06:00
ceikry
7db178a948 Apply Fractals MR patches 2021-12-31 16:57:37 -06:00
Ceikry
32b9d0b6fd Merge branch 'master' into 'master'
Redwings Content Drop: Blast Furnace, Secondary Banks, Seers Diary

See merge request 2009scape/2009scape!369
2021-12-31 22:56:38 +00:00
skelsoft
b263b8acea Redwings Content Drop: Blast Furnace, Secondary Banks, Seers Diary 2021-12-31 22:56:38 +00:00
Ceikry
6b4d2399fa Merge branch 'battlestaves-7k' into 'master'
Battlestaves cost 7k from zaff.

See merge request 2009scape/2009scape!366
2021-12-31 17:19:16 +00:00
Avi Weinstock
34eb9e5d05 Battlestaves cost 7k from zaff. 2021-12-31 17:19:16 +00:00
ceikry
07c044b119 Missed a line 2021-12-31 09:53:32 -06:00
ceikry
b7f0c64f95 Swap ammo mould over to ContentAPI 2021-12-31 09:51:49 -06:00
Ceikry
46d0406581 Merge branch 'cballrewrite' into 'master'
Smelting Cannonballs Now Authentic, fixed Container.containsAtLeastOneItem(item)

See merge request 2009scape/2009scape!368
2021-12-31 15:45:22 +00:00
Ryan
d48f585a28 Smelting Cannonballs Now Authentic, fixed Container.containsAtLeastOneItem(item) 2021-12-31 15:45:22 +00:00