Commit graph

873 commits

Author SHA1 Message Date
Ceikry
01734bbd2f Merge branch 'master' into 'master'
Fix: Morytania QA Pass 1, misc fixes

See merge request 2009scape/2009scape!231
2021-08-21 00:48:42 +00:00
skelsoft
53c9c5541a Fix: Morytania QA Pass 1, misc fixes 2021-08-21 00:48:42 +00:00
Ceikry
ec4f62d4f8 Merge branch 'master' into 'master'
Priest in Peril dialogue accuracy and 'null' npc chatbox

See merge request 2009scape/2009scape!229
2021-08-19 02:45:59 +00:00
Ceikry
eea8095643 Merge branch 'master' into 'master'
Turoth drop table corrections

See merge request 2009scape/2009scape!230
2021-08-19 02:42:28 +00:00
Woahscam
e514d78c91 Turoth drop table corrections 2021-08-19 02:42:28 +00:00
downthecrop
bfd74bbcee dialogue accuracy and 'null' npc chatbox 2021-08-18 16:41:08 -07:00
ceikry
476291f14b Corrected scroll exchange rate 2021-08-17 10:08:10 -05:00
ceikry
4e38a76b0b Fixed a bug with bogrog 2021-08-17 09:36:17 -05:00
ceikry
df9c5a6f1b Add check for NS completion for silver sickle 2021-08-16 06:59:44 -05:00
Ceikry
050fced0ea Merge branch 'funny-spirit-quest' into 'master'
Nature Spirit quest

See merge request 2009scape/2009scape!228
2021-08-16 02:22:10 +00:00
Ceikry
11963ede80 Nature Spirit quest 2021-08-16 02:22:10 +00:00
ceikry
54da219240 Clear + disable prayers (more cleanup) 2021-08-13 17:24:36 -05:00
ceikry
eedaa95a16 finalized prayer changes 2021-08-13 17:08:33 -05:00
ceikry
5efa040405 Wrap up prayer changes 2021-08-13 17:03:53 -05:00
ceikry
96ae9b35f8 Refactor prayer changes into a more organized location 2021-08-13 17:00:36 -05:00
ceikry
38a280d0a1 Fixed an exploit with prayer point decrementing 2021-08-13 16:56:22 -05:00
ceikry
c376997fe2 Merge remote-tracking branch 'origin/master' 2021-08-13 12:08:29 -05:00
ceikry
c0cdf6910a Fixed a bug with clipping assignment 2021-08-13 12:08:24 -05:00
Ceikry
c7159bf727 Merge branch 'master' into 'master'
Turoth spawn and config fixes

See merge request 2009scape/2009scape!227
2021-08-13 14:51:57 +00:00
Woahscam
0c3adc88af Turoth spawn and config fixes 2021-08-13 14:51:57 +00:00
Ceikry
82f1c171b4 Merge branch 'master' into 'master'
Changes to ExaminePacket.java

See merge request 2009scape/2009scape!226
2021-08-13 13:29:45 +00:00
Woahscam
369ac84f4d Changes to ExaminePacket.java 2021-08-13 13:29:45 +00:00
ceikry
8fb567bfa6 Merge remote-tracking branch 'origin/master' 2021-08-13 07:50:04 -05:00
ceikry
1d41ef242b Poisoning items without free inventory space should no longer nuke the product from existence 2021-08-13 07:49:57 -05:00
Ceikry
f8ab8e9a66 Merge branch 'master' into 'master'
Examine: Pizzas, Pies, Barrows Gear and Damaged Books

See merge request 2009scape/2009scape!225
2021-08-13 12:40:06 +00:00
skelsoft
6562d5a000 Examine: Pizzas, Pies, Barrows Gear and Damaged Books 2021-08-13 12:40:05 +00:00
ceikry
721000c491 Merge remote-tracking branch 'origin/master' 2021-08-12 10:11:11 -05:00
ceikry
e54b20581b New content api method 2021-08-12 10:11:05 -05:00
Ceikry
c553b7961d Merge branch 'master' into 'master'
Fix: Cooking Overhaul, Draynor Seed Market, and Port Sarim Examines

See merge request 2009scape/2009scape!224
2021-08-11 23:43:50 +00:00
skelsoft
cb8661d7fc Fix: Cooking Overhaul, Draynor Seed Market, and Port Sarim Examines 2021-08-11 23:43:50 +00:00
ceikry
9edb5cd8c4 Fixed potential exploit with the bonegrinder 2021-08-11 15:48:10 -05:00
ceikry
b2fa44c0bf I swear to god Arios... 2021-08-11 15:35:20 -05:00
ceikry
f24d6f44f7 Fixed a bug with slayer 2021-08-11 10:05:20 -05:00
ceikry
fdc060cbc1 Improved MS security 2021-08-10 22:16:48 -05:00
ceikry
d0a1bd3007 Arios does it again part 4124571293: euh 2021-08-10 09:15:28 -05:00
ceikry
b5e3216399 Why was this not ignored intellij? 2021-08-10 09:07:56 -05:00
ceikry
1bd5cb44d8 More junk management server code cleanup 2021-08-10 09:06:11 -05:00
ceikry
d23b53ba6f Trying to patch up some junky code in the management server 2021-08-10 00:02:47 -05:00
ceikry
5c8774de89 Cleanup CTZ/ServerStore 2021-08-09 19:03:09 -05:00
Ceikry
1affefbe81 Merge branch 'bork_daily_reset' into 'master'
Changed Bork to use daily reset.

See merge request 2009scape/2009scape!220
2021-08-10 00:02:05 +00:00
Ceikry
24b2fd7e6a Merge branch 'wiz_guild_fix' into 'master'
Code Cleanup - Wizards Guild uses ContentAPI now.

See merge request 2009scape/2009scape!221
2021-08-10 00:00:36 +00:00
Ceikry
37d5922df6 Merge branch 'server_run_fix' into 'master'
Removed space causing parser error.

See merge request 2009scape/2009scape!222
2021-08-09 23:59:50 +00:00
NixWigton
880e2ba4e1 Removed space causing parser error. 2021-08-09 18:52:04 -05:00
NixWigton
8f9af6b4c4 Code Cleanup - Wizards Guild uses ContentAPI now. 2021-08-09 18:41:12 -05:00
NixWigton
2f1fdde80b Changed Bork to use daily reset. 2021-08-09 18:34:56 -05:00
Ceikry
0b0f4f81ac Merge branch 'wiz_guild_fix' into 'master'
Allow boosts to be used to enter wizard's guild.

See merge request 2009scape/2009scape!219
2021-08-09 23:32:43 +00:00
Ceikry
34a88f9879 Merge branch 'master' into 'master'
Fix: Rats, Shades and their Robes, misc fixes

See merge request 2009scape/2009scape!215
2021-08-09 23:31:10 +00:00
skelsoft
6593b430d9 Fix: Rats, Shades and their Robes, misc fixes 2021-08-09 23:31:10 +00:00
Ceikry
9781777874 Merge branch 'cutscene_fix' into 'master'
Fixed issue where interface options disappear after cutscenes.

See merge request 2009scape/2009scape!218
2021-08-09 23:29:22 +00:00
NixWigton
6d181b439e Fixed issue where interface options disappear after cutscenes. 2021-08-09 16:34:39 -05:00