Commit Graph

1290 Commits

Author SHA1 Message Date
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
Ceikry ede16462a8 Merge branch 'summoning-renew' into 'master'
Allow renewing summoning familiars, and make bobs drop items on dismissal even...

See merge request 2009scape/2009scape!365
2021-12-31 01:22:23 +00:00
Avi Weinstock c21e75bf55 Allow renewing summoning familiars, and make bobs drop items on dismissal even... 2021-12-31 01:22:23 +00:00
Ceikry 943c2eaa8e Merge branch 'clue-level' into 'master'
Clue Scroll Bugfix and Dynamic Drop Ids

See merge request 2009scape/2009scape!362
2021-12-30 18:49:02 +00:00
downthecrop 5d0ecd79bf Clue Scroll Bugfix and Dynamic Drop Ids 2021-12-30 18:49:02 +00:00
Ceikry 5d4c67b02a Merge branch 'fix-zammywine' into 'master'
Fix wine of zamorak pickup interaction.

See merge request 2009scape/2009scape!363
2021-12-30 17:22:30 +00:00
Avi Weinstock a5eb4e8d21 Fix wine of zamorak pickup interaction. 2021-12-30 17:22:30 +00:00
ceikry 8023aa90b5 uncomment wilderness zone 2021-12-29 16:03:28 -06:00
ceikry 7b1faf317c Revert "Converted all item on item plugins to listeners"
This reverts commit 4a0dfed1
2021-12-27 18:18:43 -06:00
Ceikry b89ec2f2cd Merge branch 'witchaven-levers' into 'master'
Add witchaven lever puzzle (was supposed to be included in family crest).

See merge request 2009scape/2009scape!359
2021-12-26 00:25:09 +00:00
Avi Weinstock 024a34d11e Add witchaven lever puzzle (was supposed to be included in family crest). 2021-12-26 00:25:09 +00:00
Ceikry e4d05c8847 Merge branch 'cabbage-sfx' into 'master'
Add proper sound effects for the explorer's ring and fix leaf-bladed sword's sound effects.

See merge request 2009scape/2009scape!360
2021-12-26 00:25:02 +00:00
Avi Weinstock 913173a3bd Add proper sound effects for the explorer's ring and fix leaf-bladed sword's sound effects. 2021-12-26 00:25:02 +00:00
Ceikry eb73b64137 Merge branch 'improve-bloom' into 'master'
Add mort myre stems and pears to bloom's effect, and add the sound effect for bloom.

See merge request 2009scape/2009scape!361
2021-12-26 00:20:22 +00:00
Avi Weinstock 46dee8fa95 Add mort myre stems and pears to bloom's effect, and add the sound effect for bloom. 2021-12-26 00:20:21 +00:00
Ceikry b057a4bea6 Merge branch 'family-crest' into 'master'
Add: Family Crest

See merge request 2009scape/2009scape!358
2021-12-22 01:26:10 +00:00
Avi Weinstock f625a8ff01 Add: Family Crest 2021-12-22 01:26:10 +00:00
ceikry b0c231459b 2 second function overload fix 2021-12-21 18:24:58 -06:00
ceikry 67cb61b871 Further cleanup/removal of unused/unneeded files 2021-12-20 20:58:40 -06:00
ceikry 1178f4b402 Config corrections 2021-12-20 20:42:00 -06:00
ceikry 1a8c45e058 cleanup 2021-12-20 20:30:28 -06:00
ceikry ab4b0c12e7 Re-add cache via git LFS 2021-12-20 19:08:04 -06:00
ceikry ff9aa417b1 Merge branch 'master' of https://gitlab.com/2009scape/2009scape 2021-12-20 18:33:05 -06:00
ceikry 513126e25a Removed cache 2021-12-20 18:32:50 -06:00
Ceikry 54123935dc Merge branch 'migrate-plugin-listener' into 'master'
Converted all item -> withnpc plugins to listeners

See merge request 2009scape/2009scape!357
2021-12-19 23:47:14 +00:00
Ceikry a8b00c25a2 Converted all item -> withnpc plugins to listeners 2021-12-19 23:47:14 +00:00
Ceikry ea1db77145 Merge branch 'migrate-plugin-listener' into 'master'
Converted all item on item plugins to listeners

See merge request 2009scape/2009scape!356
2021-12-19 22:12:12 +00:00