Original PR: https://github.com/2006-Scape/2006Scape/pull/643 Author: @ipkpjersi Created: 12/27/2023 Status: ❌ Closed
Base: master ← Head: screenshots
master
screenshots
863ffde
4c65665
9dc9625
02a1707
4858e16
0b694a2
edfb4ec
1d15c2c
a315467
db5f9d2
59 files changed (+134834 additions, -134498 deletions)
📝 2006Scape Client/src/main/java/ClientSettings.java (+47 -0) 📝 2006Scape Client/src/main/java/Flo.java (+1 -1) 📝 2006Scape Client/src/main/java/Game.java (+90 -11) 📝 2006Scape Client/src/main/java/Main.java (+22 -3) 📝 2006Scape Client/src/main/java/ObjectManager.java (+6 -2) 📝 2006Scape Client/src/main/java/RSFrame.java (+1 -1) ➕ 2006Scape Server/data/cfg/npcDefinitions.json (+134246 -0) ➖ 2006Scape Server/data/cfg/npcDefinitions.xml (+0 -134240) 📝 2006Scape Server/data/cfg/spawns.json (+0 -40) ➕ 2006Scape Server/plugins/plugin/buttons/gameframe/SoundVolumeButtons.java (+37 -0) 📝 2006Scape Server/src/main/java/com/rs2/GameEngine.java (+9 -9) ➕ 2006Scape Server/src/main/java/com/rs2/game/content/combat/AttackType.java (+18 -0) 📝 2006Scape Server/src/main/java/com/rs2/game/content/combat/CombatAssistant.java (+15 -1) 📝 2006Scape Server/src/main/java/com/rs2/game/content/combat/npcs/NpcCombat.java (+68 -66) 📝 2006Scape Server/src/main/java/com/rs2/game/content/combat/npcs/NpcEmotes.java (+9 -8) 📝 2006Scape Server/src/main/java/com/rs2/game/content/minigames/Barrows.java (+0 -1) 📝 2006Scape Server/src/main/java/com/rs2/game/content/minigames/Dueling.java (+1 -1) 📝 2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/BlackKnightsFortress.java (+7 -1) 📝 2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/CooksAssistant.java (+7 -1) 📝 2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/DoricsQuest.java (+7 -1)
2006Scape Client/src/main/java/ClientSettings.java
2006Scape Client/src/main/java/Flo.java
2006Scape Client/src/main/java/Game.java
2006Scape Client/src/main/java/Main.java
2006Scape Client/src/main/java/ObjectManager.java
2006Scape Client/src/main/java/RSFrame.java
2006Scape Server/data/cfg/npcDefinitions.json
2006Scape Server/data/cfg/npcDefinitions.xml
2006Scape Server/data/cfg/spawns.json
2006Scape Server/plugins/plugin/buttons/gameframe/SoundVolumeButtons.java
2006Scape Server/src/main/java/com/rs2/GameEngine.java
2006Scape Server/src/main/java/com/rs2/game/content/combat/AttackType.java
2006Scape Server/src/main/java/com/rs2/game/content/combat/CombatAssistant.java
2006Scape Server/src/main/java/com/rs2/game/content/combat/npcs/NpcCombat.java
2006Scape Server/src/main/java/com/rs2/game/content/combat/npcs/NpcEmotes.java
2006Scape Server/src/main/java/com/rs2/game/content/minigames/Barrows.java
2006Scape Server/src/main/java/com/rs2/game/content/minigames/Dueling.java
2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/BlackKnightsFortress.java
2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/CooksAssistant.java
2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/DoricsQuest.java
...and 39 more files
Since we have a screenshots folder in the 2006Scape folder in the home path, we might as well make use of it.
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.
No dependencies set.
The note is not visible to the blocked user.
📋 Pull Request Information
Original PR: https://github.com/2006-Scape/2006Scape/pull/643
Author: @ipkpjersi
Created: 12/27/2023
Status: ❌ Closed
Base:
master← Head:screenshots📝 Commits (10+)
863ffdeAdded ability to take screenshots4c65665Removed duplicate screenshot warning message9dc9625Added subfolders option for screenshots02a1707Removed unused code4858e16Added check for screenshots0b694a2Fixed screenshots NPE when logged outedfb4ecAdded Local to titlebar when running locally1d15c2cAdded sendMessage param for screenshotsa315467Default to send messages for screenshotsdb5f9d2Use the sendMessage variable📊 Changes
59 files changed (+134834 additions, -134498 deletions)
View changed files
📝
2006Scape Client/src/main/java/ClientSettings.java(+47 -0)📝
2006Scape Client/src/main/java/Flo.java(+1 -1)📝
2006Scape Client/src/main/java/Game.java(+90 -11)📝
2006Scape Client/src/main/java/Main.java(+22 -3)📝
2006Scape Client/src/main/java/ObjectManager.java(+6 -2)📝
2006Scape Client/src/main/java/RSFrame.java(+1 -1)➕
2006Scape Server/data/cfg/npcDefinitions.json(+134246 -0)➖
2006Scape Server/data/cfg/npcDefinitions.xml(+0 -134240)📝
2006Scape Server/data/cfg/spawns.json(+0 -40)➕
2006Scape Server/plugins/plugin/buttons/gameframe/SoundVolumeButtons.java(+37 -0)📝
2006Scape Server/src/main/java/com/rs2/GameEngine.java(+9 -9)➕
2006Scape Server/src/main/java/com/rs2/game/content/combat/AttackType.java(+18 -0)📝
2006Scape Server/src/main/java/com/rs2/game/content/combat/CombatAssistant.java(+15 -1)📝
2006Scape Server/src/main/java/com/rs2/game/content/combat/npcs/NpcCombat.java(+68 -66)📝
2006Scape Server/src/main/java/com/rs2/game/content/combat/npcs/NpcEmotes.java(+9 -8)📝
2006Scape Server/src/main/java/com/rs2/game/content/minigames/Barrows.java(+0 -1)📝
2006Scape Server/src/main/java/com/rs2/game/content/minigames/Dueling.java(+1 -1)📝
2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/BlackKnightsFortress.java(+7 -1)📝
2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/CooksAssistant.java(+7 -1)📝
2006Scape Server/src/main/java/com/rs2/game/content/quests/impl/DoricsQuest.java(+7 -1)...and 39 more files
📄 Description
Since we have a screenshots folder in the 2006Scape folder in the home path, we might as well make use of it.
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.