Commit graph

1267 commits

Author SHA1 Message Date
Ryan
1977ac3005 updated readme, fixed .gitattributes to track cache contents 2022-01-01 02:41:38 +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
Ceikry
4a0dfed172 Converted all item on item plugins to listeners 2021-12-19 22:12:12 +00:00
Ceikry
db20e878f4 Merge branch 'toy-horsey-listener' into 'master'
Updated const lib, Toy Horsey rewrite

See merge request 2009scape/2009scape!355
2021-12-19 16:13:08 +00:00
Woahscam
efaf44fee4 Updated const lib, Toy Horsey rewrite 2021-12-19 16:13:08 +00:00
Ceikry
0b047b513c Merge branch 'migrate-plugin-listener' into 'master'
API overhaul, convert Toy Plugins to Listeners

See merge request 2009scape/2009scape!354
2021-12-19 08:59:35 +00:00
Ceikry
d7fd988f50 API overhaul, convert Toy Plugins to Listeners 2021-12-19 08:59:35 +00:00
Ceikry
762604b1c5 Merge branch 'adventure-bot-refactor' into 'master'
Refactor bot dialogue out to json

See merge request 2009scape/2009scape!353
2021-12-19 07:33:23 +00:00
Ceikry
614439fd0c Refactor bot dialogue out to json 2021-12-19 07:33:23 +00:00
Ceikry
63479d18eb Merge branch 'refactor-world-update-worker' into 'master'
Massive refactor of several different components including networking fixes

See merge request 2009scape/2009scape!352
2021-12-19 05:40:17 +00:00
Ceikry
10219652b0 Massive refactor of several different components including networking fixes 2021-12-19 05:40:17 +00:00
ceikry
ecaed745ef Push new default config 2021-12-18 22:00:44 -06:00
Ceikry
670d4d09a3 Merge branch 'json-to-toml' into 'master'
Change server config language from JSON to TOML

See merge request 2009scape/2009scape!351
2021-12-19 03:53:31 +00:00
Ceikry
cd7470ff66 Change server config language from JSON to TOML 2021-12-19 03:53:30 +00:00
Ceikry
70a709fb14 Merge branch 'sc-backport' into 'master'
Refactorings and improvements backported from the stealing-creation branch.

See merge request 2009scape/2009scape!350
2021-12-19 03:28:20 +00:00
Avi Weinstock
2bd3154611 Refactorings and improvements backported from the stealing-creation branch. 2021-12-19 03:28:20 +00:00
Ceikry
236f95ff63 Merge branch 'server-gui' into 'master'
Server Performance Monitor, Plethora of Performance Improvements

See merge request 2009scape/2009scape!349
2021-12-19 03:06:17 +00:00
Ceikry
6af8b79126 Server Performance Monitor, Plethora of Performance Improvements 2021-12-19 03:06:17 +00:00
Ceikry
b4f3224287 Merge branch 'fishing-trawler-fixes' into 'master'
Fishing and fishing trawler now use closer-to-empirical formulae.

See merge request 2009scape/2009scape!348
2021-12-17 00:39:45 +00:00
Avi Weinstock
f2e26234ae Fishing and fishing trawler now use closer-to-empirical formulae. 2021-12-17 00:39:45 +00:00
ceikry
25c97d500a Implement HCIM rework 2021-12-15 20:46:07 -06:00
ceikry
e234c9fa28 Implement HCIM rework 2021-12-15 20:45:15 -06:00
Ceikry
7a7721b66c Merge branch 'xp' into 'master'
fix granting hp xp on controlled

See merge request 2009scape/2009scape!343
2021-12-16 00:25:16 +00:00
vk
376779c147 fix granting hp xp on controlled 2021-12-16 00:25:16 +00:00
Ceikry
a2028762d8 Merge branch 'fix-barrows-degrade' into 'master'
Barrows equipment now lasts for 15 hours of combat instead of 40 minutes of combat.

See merge request 2009scape/2009scape!347
2021-12-11 22:42:59 +00:00