Commit graph

600 commits

Author SHA1 Message Date
The Celery Man
b67b658718 Merge pull request #284 from Ceikry/master
Again, I hate updating from main because of the .gitignore issue.
2020-03-30 13:26:57 -05:00
Ceikry
155a309c00 Revs fixed 2020-03-30 13:25:31 -05:00
Ceikry
304af7c947 Revert "Fixed revs"
This reverts commit 00091af434.
2020-03-30 13:24:00 -05:00
Ceikry
00091af434 Fixed revs 2020-03-30 13:21:48 -05:00
Ceikry
8df92713a6 Merge remote-tracking branch 'origin/master' 2020-03-30 13:20:42 -05:00
Ceikry
e689cf691c Fixed revs 2020-03-30 13:19:14 -05:00
The Celery Man
af116fa495 Merge pull request #9 from dginovker/master
update
2020-03-30 13:15:22 -05:00
The Celery Man
35acfebed1 Merge pull request #281 from Ceikry/master
Fixed revenant PVP armor drops and increased revenant cap
2020-03-30 13:09:25 -05:00
Ceikry
e28e4dfc26 Revert "dropfix"
This reverts commit ef0419e50d.
2020-03-30 13:07:50 -05:00
Ceikry
ef0419e50d dropfix 2020-03-30 13:05:25 -05:00
Ceikry
1ff7f9f15f Fixed revenant PVP armor drops and increased revenant cap 2020-03-30 12:55:28 -05:00
Daniel Ginovker
531dafa834 Merge pull request #280 from Jamix77/master
Fixed everything
2020-03-30 12:23:39 -04:00
jamix77
0f7ee05670 Fixed a dupe and fixed the game
Fixed a dupe and fixed the game.
2020-03-30 17:06:12 +01:00
jamix77
50bc8ce864 Revert "Fixed revenant PVP armor drops and increased revenant cap"
This reverts commit 8e6ad7177d.
2020-03-30 17:04:32 +01:00
jamix77
ff78fe6360 Merge remote-tracking branch 'upstream/master' 2020-03-30 16:58:53 +01:00
jamix77
7e38dc6b67 Merge remote-tracking branch 'upstream/master' 2020-03-30 15:36:01 +01:00
Daniel Ginovker
c508d798ba Merge pull request #279 from Jamix77/master
Sophanem Bank
2020-03-30 10:21:30 -04:00
jamix77
67753e4cdc Sophanem Bank
Finally discovered!
2020-03-30 15:11:25 +01:00
Daniel Ginovker
9268435280 Merge pull request #274 from Ceikry/master
Fixed revenant PVP armor drops and increased revenant cap
2020-03-29 20:57:03 -04:00
Ceikry
8e6ad7177d Fixed revenant PVP armor drops and increased revenant cap 2020-03-29 19:53:01 -05:00
dginovker
5c6273036c For some reason the switch statement won't work for all of them, so we need a plugin too 2020-03-29 15:06:04 -04:00
dginovker
5fad3b5b2f Fix response message when not having items on firing oven 2020-03-29 14:11:45 -04:00
dginovker
3c78f3ea8d Fix merge conflict 2020-03-29 13:42:54 -04:00
CSS-Lletya
a24bf25a79 Port Sarim spawns 2020-03-29 13:36:54 -04:00
CSS-Lletya
7d4119c4ca Item Names class, use isntead of IDs 2020-03-29 13:36:13 -04:00
CSS-Lletya
9729514eec Security Guard Dialogue 2020-03-29 13:35:47 -04:00
Daniel Ginovker
2e72954866 Merge pull request #271 from Jamix77/master
Many a fix.
2020-03-29 13:30:45 -04:00
jamix77
2bbde08a01 Fixes
yeah fixes stuff tyvm
2020-03-29 18:13:01 +01:00
jamix77
9f11a21858 Revert "Fixed many small bugs."
This reverts commit 9efcb103f1.
2020-03-29 18:10:04 +01:00
jamix77
9efcb103f1 Fixed many small bugs.
Fixed the small stuff for the big picture.
2020-03-29 18:07:38 +01:00
CSS-Lletya
0d880a6bd1 Shooting Star chat message no longer cut off 2020-03-29 12:37:34 -04:00
CSS-Lletya
aacc3e6316 Added Mugger spawn to varrock west mine 2020-03-29 12:34:20 -04:00
Daniel Ginovker
b739673807 Merge pull request #269 from CSS-Lletya/master
Few fixes
2020-03-29 11:16:53 -04:00
CSS-Lletya
ad9b6ec1b9 Update GoblinVillagePopulationPlugin.java 2020-03-29 00:19:34 -04:00
CSS-Lletya
f0cde9d264 Goblin Village SIgn Post Soft fix 2020-03-28 23:55:44 -04:00
CSS-Lletya
380c4aa09b Fixed Varrock Hard Diary task 2020-03-28 23:41:41 -04:00
CSS-Lletya
0806bcb285 Force Tweening enabled 2020-03-28 23:30:30 -04:00
dginovker
7e1b67df5b Merge branch 'CSS-Lletya-master' 2020-03-28 23:28:06 -04:00
dginovker
9a6c2d6c86 Fix merge conlfict 2020-03-28 23:27:57 -04:00
CSS-Lletya
6e58329a25 Wanted Posted interaction 2020-03-28 23:26:35 -04:00
CSS-Lletya
f2ad79410f Fixed Shooting Star location mixup 2020-03-28 23:16:47 -04:00
Daniel Ginovker
d116a084af Merge pull request #256 from Ceikry/master
New Player Commands!
2020-03-28 19:32:32 -04:00
Daniel Ginovker
dfb01dea88 Merge pull request #255 from Jamix77/master
Fixed KBD
2020-03-28 19:31:37 -04:00
CSS-Lletya
74f4a0051f Added missing Leather Gloves in Father Urhney's Shack 2020-03-28 19:22:26 -04:00
Ceikry
4c08e4203d Added new commands to ::commands 2020-03-28 18:22:14 -05:00
jamix77
628568e3db Fixed KBD
It's been done, after being broken for so long it's finally been fixed!
2020-03-28 23:19:58 +00:00
Ceikry
127a457e70 Revert "Added new player commands"
This reverts commit 5ff64891a4.
2020-03-28 18:17:03 -05:00
Ceikry
5ff64891a4 Added new player commands 2020-03-28 18:16:29 -05:00
The Celery Man
7cda4b92f0 Merge pull request #8 from dginovker/master
update
2020-03-28 18:10:02 -05:00
Ceikry
a4464adaf4 Revert "Added new commands to ::commands"
This reverts commit 33c43b8a6a.
2020-03-28 18:09:25 -05:00