Commit Graph
17513 Commits
Author SHA1 Message Date
Justin 6f25710b86 Merge pull request #3146 from SRLJustin/mixin
mixin: getZ for WallDecoration
2022-03-21 00:05:35 +11:00
zjustin 86a6081a2c mixins: getZ for WallDecoration 2022-03-20 23:47:20 +11:00
Justin 44861b962e Merge pull request #3145 from SRLJustin/MAR20-upstream
project: upstream
2022-03-20 19:37:06 +11:00
zjustin e68fdc6540 mixins: getZ for BoundaryObject and FloorDecoration 2022-03-20 18:25:54 +11:00
zjustin 651e85fdb7 RSGraphicsObject: re-add override 2022-03-20 17:01:42 +11:00
zjustin 11714f1eec project: upstream merge 2022-03-20 16:51:25 +11:00
zjustin 57a73b0611 Merge branch 'master' of https://github.com/runelite/runelite
 Conflicts:
	cache-client/pom.xml
	cache-updater/pom.xml
	cache/pom.xml
	pom.xml
	runelite-api/pom.xml
	runelite-api/src/main/java/net/runelite/api/GraphicID.java
	runelite-client/pom.xml
	runelite-jshell/pom.xml
	runelite-script-assembler-plugin/pom.xml
2022-03-20 16:24:49 +11:00
Runelite auto updater 3097531564 Bump for 1.8.15-SNAPSHOT 2022-03-19 22:36:29 +00:00
Runelite auto updater cb018fc1fe Release 1.8.14 2022-03-19 22:36:21 +00:00
Adam 508c5928fe gpu: use DebugGL4 in debug mode 2022-03-19 18:05:53 -04:00
Hydrox6 7051bedc61 cannon: add support for shattered relics league ornamental cannon
Annoyingly, the cannonball projectiles are not fired out of the centre
of the cannon object like the original cannon does, so how the cannon's
position is stored had to be changed to a WorldArea
2022-03-18 17:04:49 -04:00
Hydrox6 51e2ff00c4 ItemMapping: add shattered relics ornament kits 2022-03-18 17:04:49 -04:00
Adam 2192ac7d45 client: allow setting system properties via runtime config 2022-03-18 16:19:47 -04:00
Adam dbfcc456f9 gpu: update to jogl 2.4.0-rc-20220318 2022-03-18 15:59:25 -04:00
Adam 3464551d83 gpu: remove egl dependency 2022-03-18 15:59:12 -04:00
Adam b9d905621d gpu: remove newt dependency 2022-03-18 15:59:04 -04:00
Jordan d3b660fee3 Merge pull request #14756 from Nightfirecat/fix-grim-tales-tower-roof 2022-03-17 18:17:01 +00:00
Jordan Atwood 53ee3eb747 roof removal: Add Grim Tales tower override 2022-03-17 11:05:26 -07:00
Kyle 9f10d5162d Update WeaponMap.java 2022-03-17 10:42:47 +00:00
Max Weber 52c2061ccd rl-api: use TileObjects' z for hulls/clickboxes/outlines 2022-03-16 19:21:04 -06:00
Justin 37e8c13a03 Merge pull request #3144 from JumpIfZero/rl-upstream-160322
project: RL upstream 160322
2022-03-17 09:07:24 +11:00
Justin 4491d2383c project: bump OPRS version 2022-03-17 09:02:21 +11:00
JumpIfZero 4b99e4f5ba project: Bump RL version 2022-03-16 15:23:41 +02:00
JumpIfZero 5442ba7c88 Merge remote-tracking branch 'rl-upstream/master' into rl-upstream-160322 2022-03-16 14:00:41 +02:00
Adam 4f8991dc7e loot tracker: add remember loot option 2022-03-15 18:24:01 -04:00
Adam e953631a08 chat message manager: fix gim rl-format messages
The rl-format messages aren't prepended with |, causing them to be sent to normal clan chat instead.
2022-03-15 15:42:17 -04:00
Adam 310b007409 Revert "gpu: Fix loading gluegen natives on some Windows configurations"
This reverts commit 35949bce22.
2022-03-13 23:35:39 -04:00
Adam d8ba9b13ba loottracker: replace repaint calls with revalidate
This fixes removing panels from the logs container not correctly rebuilding the container to remove the space the box was previously in
2022-03-13 19:59:44 -04:00
Adam 08da9a2d8a loot tracker: add wilderness loot chest 2022-03-13 16:42:46 -04:00
AdamandShawn Shadrix 88933be3df loot tracker: track caught implings
Co-authored-by: Shawn Shadrix <shshadri@ncsu.edu>
2022-03-13 15:55:15 -04:00
AdamandShawn Shadrix a877c58005 loot tracker: support opening multiple imp jars in 1 tick
This tracks the number of removed jars to determine how many were
opened. This only works when opening multiple of the same type of jar.

Co-authored-by: Shawn Shadrix <shshadri@ncsu.edu>
2022-03-13 15:55:15 -04:00
AdamandShawn Shadrix 08359a0df0 loottracker: add imp jars
Co-authored-by: Shawn Shadrix <shshadri@ncsu.edu>
2022-03-13 15:55:15 -04:00
Adam 28d4ceb2b5 loottracker: refactor inv change events
Instead of having logic to set the event type and then pick it up again in the inv change event, store a callback to be called on inv change
2022-03-13 15:55:12 -04:00
Justin cc14702248 Merge pull request #3141 from open-osrs/GRADLE-WRAPPER-UPDATE
gradle: Update gradle wrapper
2022-03-13 17:39:26 +11:00
Jordan eabaa9cab4 Merge pull request #14229 from Nightfirecat/tutorial-island-roof-fix 2022-03-10 01:02:42 +00:00
Jordan Atwood ef20508ccd roof removal: Add Tutorial Island overrides 2022-03-09 16:58:53 -08:00
Jordan 5d1ad3d374 Merge pull request #14357 from Nightfirecat/cabin-fever-ships-roof-fix 2022-03-10 00:58:17 +00:00
Jordan Atwood 3190e3ce2a roof removal: Fix Cabin Fever ships 2022-03-09 16:53:31 -08:00
OpenOSRS f743fa03d0 gradle: Update gradle wrapper 2022-03-10 00:20:01 +00:00
Owain van Brakel 895a5c4b1c Merge pull request #3140 from Owain94/upstream-0903
project: Merge upstream
2022-03-09 23:10:38 +01:00
Owain van Brakel 89a347f28c Merge pull request #3139 from open-osrs/GIM-messages 2022-03-09 22:57:58 +01:00
Owain van Brakel 2fe8585035 loottracker: Remove import loot panel 2022-03-09 22:57:43 +01:00
Owain van Brakel eefd891cb7 project: Bump OpenOSRS version 2022-03-09 22:44:29 +01:00
Owain van Brakel 40e9acfd09 project: Bump RuneLite version 2022-03-09 22:44:05 +01:00
Owain van Brakel 37dea6f94a Merge remote-tracking branch 'runelite/master' 2022-03-09 22:43:12 +01:00
Runelite auto updater 4eb0fb56e3 Bump for 1.8.14-SNAPSHOT 2022-03-09 16:29:02 +00:00
Runelite auto updater c121e65209 Release 1.8.13 2022-03-09 16:28:54 +00:00
Adam de2edb2033 Add barbarian rod anim to fishing and idle notifier 2022-03-09 10:41:31 -05:00
Owain van Brakel 319246ce57 Merge remote-tracking branch 'runelite/master' 2022-03-09 09:03:02 +01:00
Owain van Brakel 4dac0b84fc mixins: Fix messages for GIM 2022-03-09 08:58:53 +01:00