Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Clients/Korangar
Submodule Korangar updated 149 files
2 changes: 1 addition & 1 deletion Clients/RagnarokRebuildTCP
Submodule RagnarokRebuildTCP updated 96 files
+ RebuildClient/Assets/Data/GameConfig.dll
+ RebuildClient/Assets/Data/RebuildSharedData.dll
+133 −8 RebuildClient/Assets/Scripts/Effects/EffectHandlers/General/HitEffect.cs
+1 −1 RebuildClient/Assets/Scripts/Effects/EffectHandlers/General/RoSpriteProjectileEffect.cs
+3 −0 RebuildClient/Assets/Scripts/Effects/EffectHandlers/Skills/Knight.meta
+76 −0 RebuildClient/Assets/Scripts/Effects/EffectHandlers/Skills/Knight/BowlingBashImpactEffect.cs
+3 −0 RebuildClient/Assets/Scripts/Effects/EffectHandlers/Skills/Knight/BowlingBashImpactEffect.cs.meta
+53 −0 RebuildClient/Assets/Scripts/Effects/EffectHandlers/Skills/Knight/SpearBoomerangEffect.cs
+3 −0 RebuildClient/Assets/Scripts/Effects/EffectHandlers/Skills/Knight/SpearBoomerangEffect.cs.meta
+32 −0 RebuildClient/Assets/Scripts/Effects/EffectHandlers/Skills/Priest/KyrieEleisonEffect.cs
+3 −0 RebuildClient/Assets/Scripts/Effects/EffectHandlers/Skills/Priest/KyrieEleisonEffect.cs.meta
+4 −2 RebuildClient/Assets/Scripts/Effects/EffectParticleManager.cs
+16 −0 RebuildClient/Assets/Scripts/Effects/EffectSharedMaterialManager.cs
+24 −2 RebuildClient/Assets/Scripts/Effects/PrimitiveData/CircleData.cs
+2 −0 RebuildClient/Assets/Scripts/Effects/PrimitiveData/CylinderData.cs
+6 −0 RebuildClient/Assets/Scripts/Effects/PrimitiveHandlers/Circle2DPrimitive.cs
+6 −0 RebuildClient/Assets/Scripts/Effects/PrimitiveHandlers/CirclePrimitive.cs
+2 −0 RebuildClient/Assets/Scripts/Effects/PrimitiveHandlers/Cylinder3DPrimitive.cs
+6 −0 RebuildClient/Assets/Scripts/Effects/RagnarokEffectData.Generated.cs
+1 −1 RebuildClient/Assets/Scripts/MapEditor/RoMapEditor.cs
+8 −2 RebuildClient/Assets/Scripts/Network/IncomingPacketHandlers/Combat/PacketAttack.cs
+6 −0 RebuildClient/Assets/Scripts/Network/IncomingPacketHandlers/Combat/PacketOnSkill.cs
+6 −0 RebuildClient/Assets/Scripts/Network/IncomingPacketHandlers/Combat/PacketSkillIndirect.cs
+1 −1 RebuildClient/Assets/Scripts/Network/IncomingPacketHandlers/Network/PacketCreateEntity.cs
+9 −0 RebuildClient/Assets/Scripts/Network/Messaging/EntityMessageQueue.cs
+2 −1 RebuildClient/Assets/Scripts/Network/Messaging/EntityMessageType.cs
+65 −25 RebuildClient/Assets/Scripts/Network/ServerControllable.cs
+2 −2 RebuildClient/Assets/Scripts/PlayerControl/ClientCommandHandler.cs
+80 −65 RebuildClient/Assets/Scripts/SkillHandlers/ClientSkillHandlerGenerated.cs
+32 −0 RebuildClient/Assets/Scripts/SkillHandlers/Handlers/Knight/BowlingBashHandler.cs
+3 −0 RebuildClient/Assets/Scripts/SkillHandlers/Handlers/Knight/BowlingBashHandler.cs.meta
+25 −0 RebuildClient/Assets/Scripts/SkillHandlers/Handlers/Knight/PierceHandler.cs
+3 −0 RebuildClient/Assets/Scripts/SkillHandlers/Handlers/Knight/PierceHandler.cs.meta
+28 −0 RebuildClient/Assets/Scripts/SkillHandlers/Handlers/Knight/SpearBoomerangHandler.cs
+3 −0 RebuildClient/Assets/Scripts/SkillHandlers/Handlers/Knight/SpearBoomerangHandler.cs.meta
+28 −0 RebuildClient/Assets/Scripts/SkillHandlers/Handlers/Priest/KyrieEleisonHandler.cs
+3 −0 RebuildClient/Assets/Scripts/SkillHandlers/Handlers/Priest/KyrieEleisonHandler.cs.meta
+25 −0 RebuildClient/Assets/Scripts/SkillHandlers/SkillHandlerBase.cs
+13 −7 RebuildClient/Assets/Scripts/Sprites/ClientDataLoader.cs
+3 −0 RebuildClient/Assets/Scripts/Sprites/RoSpriteData.cs
+3 −0 RebuildClient/Assets/Scripts/Sprites/RoSpriteRendererStandard.cs
+4 −0 RoRebuildServer/GameConfig/ServerData/Db/Effects.csv
+17 −0 RoRebuildServer/GameConfig/ServerData/Db/JobWeaponInfo.csv
+2 −2 RoRebuildServer/GameConfig/ServerData/Db/Jobs.csv
+1 −0 RoRebuildServer/GameConfig/ServerData/Db/WeaponAttackTiming.csv
+2 −2 RoRebuildServer/GameConfig/ServerData/Script/Items/ItemEffects.txt
+2 −2 RoRebuildServer/GameConfig/ServerData/Script/MonsterSkills/Bosses.txt
+1 −1 RoRebuildServer/GameConfig/ServerData/Script/MonsterSkills/Misc.txt
+45 −2 RoRebuildServer/GameConfig/ServerData/Skills/Skills.toml
+7 −0 RoRebuildServer/GameConfig/ServerData/Skills/StatusEffects.toml
+14 −0 RoRebuildServer/RebuildSharedData/Data/Position.cs
+1 −0 RoRebuildServer/RebuildSharedData/Enum/NpcDisplayType.cs
+1 −0 RoRebuildServer/RebuildSharedData/Enum/PlayerFollower.cs
+3 −2 RoRebuildServer/RoRebuildServer/EntityComponents/CombatEntity.DamageHandling.cs
+1 −1 RoRebuildServer/RoRebuildServer/EntityComponents/CombatEntity.cs
+6 −0 RoRebuildServer/RoRebuildServer/EntityComponents/Npcs/NpcInteractionState.cs
+51 −0 RoRebuildServer/RoRebuildServer/EntityComponents/Player.cs
+39 −0 RoRebuildServer/RoRebuildServer/Networking/CommandBuilder.cs
+16 −0 RoRebuildServer/RoRebuildServer/Networking/PacketHandlers/Character/PacketChangeFollower.cs
+14 −0 RoRebuildServer/RoRebuildServer/Simulation/Skills/SkillHandlers/Assassin/GrimtoothHandler.cs
+14 −0 RoRebuildServer/RoRebuildServer/Simulation/Skills/SkillHandlers/Assassin/PoisonReactHandler.cs
+14 −0 RoRebuildServer/RoRebuildServer/Simulation/Skills/SkillHandlers/Assassin/VenomDustHandler.cs
+14 −0 RoRebuildServer/RoRebuildServer/Simulation/Skills/SkillHandlers/Assassin/VenomSplasherHandler.cs
+12 −0 RoRebuildServer/RoRebuildServer/Simulation/Skills/SkillHandlers/Blacksmith/MaximizePowerHandler.cs
+14 −0 RoRebuildServer/RoRebuildServer/Simulation/Skills/SkillHandlers/Blacksmith/PowerThrustHandler.cs
+14 −0 RoRebuildServer/RoRebuildServer/Simulation/Skills/SkillHandlers/Blacksmith/WeaponPerfectionHandler.cs
+34 −0 RoRebuildServer/RoRebuildServer/Simulation/Skills/SkillHandlers/Hunter/ClaymoreTrapHandler.cs
+34 −0 RoRebuildServer/RoRebuildServer/Simulation/Skills/SkillHandlers/Hunter/FlasherHandler.cs
+34 −0 RoRebuildServer/RoRebuildServer/Simulation/Skills/SkillHandlers/Hunter/FreezingTrapHandler.cs
+14 −0 RoRebuildServer/RoRebuildServer/Simulation/Skills/SkillHandlers/Hunter/RemoveTrapHandler.cs
+34 −0 RoRebuildServer/RoRebuildServer/Simulation/Skills/SkillHandlers/Hunter/SandmanTrapHandler.cs
+37 −0 RoRebuildServer/RoRebuildServer/Simulation/Skills/SkillHandlers/Hunter/ShockwaveTrapHandler.cs
+58 −0 RoRebuildServer/RoRebuildServer/Simulation/Skills/SkillHandlers/Hunter/SkidTrapHandler.cs
+14 −0 RoRebuildServer/RoRebuildServer/Simulation/Skills/SkillHandlers/Hunter/SpringTrapHandler.cs
+34 −0 RoRebuildServer/RoRebuildServer/Simulation/Skills/SkillHandlers/Hunter/TalkieBoxHandler.cs
+6 −0 RoRebuildServer/RoRebuildServer/Simulation/Skills/SkillHandlers/Hunter/TrapLoaders.cs
+106 −0 RoRebuildServer/RoRebuildServer/Simulation/Skills/SkillHandlers/Knight/BowlingBashHandler.cs
+14 −0 RoRebuildServer/RoRebuildServer/Simulation/Skills/SkillHandlers/Knight/CounterAttackHandler.cs
+36 −0 RoRebuildServer/RoRebuildServer/Simulation/Skills/SkillHandlers/Knight/PecoRidingHandler.cs
+42 −0 RoRebuildServer/RoRebuildServer/Simulation/Skills/SkillHandlers/Knight/PierceHandler.cs
+54 −0 RoRebuildServer/RoRebuildServer/Simulation/Skills/SkillHandlers/Knight/SpearBoomerangHandler.cs
+14 −0 RoRebuildServer/RoRebuildServer/Simulation/Skills/SkillHandlers/Knight/SpearStabHandler.cs
+21 −22 RoRebuildServer/RoRebuildServer/Simulation/Skills/SkillHandlers/Merchant/PushCartHandler.cs
+13 −4 RoRebuildServer/RoRebuildServer/Simulation/Skills/SkillHandlers/SkillHandlerTrap.cs
+45 −0 RoRebuildServer/RoRebuildServer/Simulation/Skills/SkillHandlers/Wizard/FirePillarHandler.cs
+14 −0 RoRebuildServer/RoRebuildServer/Simulation/Skills/SkillHandlers/Wizard/FrostNovaHandler.cs
+14 −0 RoRebuildServer/RoRebuildServer/Simulation/Skills/SkillHandlers/Wizard/IceWallHandler.cs
+14 −0 RoRebuildServer/RoRebuildServer/Simulation/Skills/SkillHandlers/Wizard/MeteorStormHandler.cs
+14 −0 RoRebuildServer/RoRebuildServer/Simulation/Skills/SkillHandlers/Wizard/QuagmireHandler.cs
+14 −0 RoRebuildServer/RoRebuildServer/Simulation/Skills/SkillHandlers/Wizard/SenseHandler.cs
+14 −0 RoRebuildServer/RoRebuildServer/Simulation/Skills/SkillHandlers/Wizard/SighthrasherHandler.cs
+12 −0 RoRebuildServer/RoRebuildServer/Simulation/Skills/SkillHandlers/Wizard/StormGustHandler.cs
+13 −2 RoRebuildServer/RoRebuildServer/Simulation/StatusEffects/1stJob/StatusMagnumBreak.cs
+3 −0 RoRebuildServer/RoRebuildServer/Simulation/StatusEffects/2ndJobs/StatusKyrieEleison.cs
+16 −0 RoRebuildServer/RoRebuildServer/Simulation/StatusEffects/2ndJobs/StatusPecoRiding.cs
+81 −64 RoRebuildServer/RoRebuildServer/Simulation/Util/MathHelper.cs
2 changes: 1 addition & 1 deletion Clients/bevy_ro_client
Submodule bevy_ro_client updated 104 files
2 changes: 1 addition & 1 deletion Clients/ragnarok-offline
Submodule ragnarok-offline updated 626 files
2 changes: 1 addition & 1 deletion Clients/roBrowser
Submodule roBrowser updated 51 files
+3 −0 README.md
+8 −0 doc/README.md
+5 −2 src/Controls/EntityControl.js
+4 −1 src/Core/Client.js
+307 −227 src/DB/DBManager.js
+6 −2 src/DB/Effects/EffectTable.js
+1 −1 src/DB/Items/WeaponHitSoundTable.js
+73 −1 src/DB/Items/WeaponType.js
+90 −0 src/DB/Items/WeaponTypeExpansion.js
+4 −1 src/Engine/MapEngine.js
+35 −166 src/Engine/MapEngine/Entity.js
+1 −1 src/Engine/MapEngine/Main.js
+26 −0 src/Engine/MapEngine/NPC.js
+46 −0 src/Engine/MapEngine/PCGoldTimer.js
+16 −12 src/Engine/MapEngine/Skill.js
+9 −4 src/Engine/MapEngine/Store.js
+1 −1 src/Engine/MapEngine/UIOpen.js
+1 −1 src/Loaders/GrannyModel.js
+6 −0 src/Network/PacketRegister.js
+62 −1 src/Network/PacketStructure.js
+3 −1 src/Preferences/Graphics.js
+6 −6 src/Renderer/Effects/Damage.js
+4 −0 src/Renderer/Effects/ThreeDEffect.js
+14 −1 src/Renderer/Entity/EntityAction.js
+0 −2 src/Renderer/Entity/EntitySignboard.js
+2 −2 src/Renderer/Entity/EntityState.js
+4 −0 src/Renderer/Entity/EntityView.js
+45 −13 src/Renderer/Entity/EntityWalk.js
+1 −0 src/Renderer/Map/Models.js
+2 −2 src/UI/Components/Announce/Announce.js
+152 −86 src/UI/Components/ChatBox/ChatBox.js
+1 −1 src/UI/Components/Equipment/EquipmentV0/EquipmentV0.js
+1 −1 src/UI/Components/Equipment/EquipmentV1/EquipmentV1.js
+1 −1 src/UI/Components/Equipment/EquipmentV2/EquipmentV2.js
+1 −1 src/UI/Components/Equipment/EquipmentV3/EquipmentV3.js
+9 −0 src/UI/Components/GraphicsOption/GraphicsOption.html
+11 −0 src/UI/Components/GraphicsOption/GraphicsOption.js
+1 −1 src/UI/Components/Inventory/InventoryV1/InventoryV1.js
+1 −1 src/UI/Components/Inventory/InventoryV2/InventoryV2.js
+47 −2 src/UI/Components/Inventory/InventoryV3/InventoryV3.js
+0 −3 src/UI/Components/LaphineUpg/LaphineUpg.js
+296 −2 src/UI/Components/MobileUI/MobileUI.css
+67 −7 src/UI/Components/MobileUI/MobileUI.html
+435 −5 src/UI/Components/MobileUI/MobileUI.js
+4 −0 src/UI/Components/PCGoldTimer/PCGoldTimer.css
+6 −0 src/UI/Components/PCGoldTimer/PCGoldTimer.html
+126 −0 src/UI/Components/PCGoldTimer/PCGoldTimer.js
+107 −83 src/UI/Components/PincodeWindow/PincodeWindow.js
+1 −1 src/UI/Components/Rodex/RodexIcon.css
+1 −1 src/UI/Components/SkillList/SkillList/SkillList.js
+40 −16 src/UI/Components/Vending/Vending.js
2 changes: 1 addition & 1 deletion Servers/RustRO
Submodule RustRO updated 0 files
2 changes: 1 addition & 1 deletion Servers/rAthena
Submodule rAthena updated 90 files
+1 −3 .github/workflows/analysis_codeql.yml
+9 −3 .github/workflows/npc_db_validation.yml
+3 −2 conf/atcommands.yml
+4 −2 conf/battle/client.conf
+5 −0 conf/battle/drops.conf
+1 −1 conf/battle/homunc.conf
+1 −0 conf/inter_athena.conf
+5 −1 conf/msg_conf/map_msg.conf
+1 −1 conf/msg_conf/map_msg_por.conf
+1 −1 conf/msg_conf/map_msg_spn.conf
+2 −1 db/import-tmpl/job_stats.yml
+6 −1 db/job_stats.yml
+4 −1 db/pre-re/item_db_equip.yml
+5 −5 db/pre-re/item_db_etc.yml
+2 −1 db/pre-re/job_aspd.yml
+2 −1 db/pre-re/job_basepoints.yml
+2 −1 db/pre-re/job_exp.yml
+2 −1 db/pre-re/job_stats.yml
+8 −0 db/pre-re/status.yml
+299 −250 db/re/exp_homun.yml
+39 −25 db/re/item_combos.yml
+60 −55 db/re/item_db_equip.yml
+31 −18 db/re/item_db_etc.yml
+0 −1 db/re/item_group_db.yml
+2 −1 db/re/job_aspd.yml
+2 −1 db/re/job_basepoints.yml
+1,167 −1,418 db/re/job_exp.yml
+157 −0 db/re/job_outfits.yml
+2 −1 db/re/job_stats.yml
+17 −0 db/re/skill_db.yml
+14 −0 db/re/skill_tree.yml
+32 −0 db/re/status.yml
+1 −4 doc/atcommands.txt
+1 −0 doc/yaml/db/job_basepoints.yml
+1 −0 doc/yaml/db/job_exp.yml
+1 −0 doc/yaml/db/job_stats.yml
+2 −2 doc/yaml/sql/item_db.sql
+2 −2 doc/yaml/sql/item_db2.sql
+2 −2 doc/yaml/sql/item_db2_re.sql
+2 −2 doc/yaml/sql/item_db_re.sql
+1 −1 doc/yaml/sql/mob_db.sql
+1 −1 doc/yaml/sql/mob_db2.sql
+1 −1 doc/yaml/sql/mob_db2_re.sql
+1 −1 doc/yaml/sql/mob_db_re.sql
+0 −1 npc/re/mobs/dungeons/mal_dun.txt
+31 −21 sql-files/README.md
+2 −2 sql-files/item_db.sql
+3 −92 sql-files/item_db2.sql
+2 −95 sql-files/item_db2_re.sql
+1 −2,022 sql-files/item_db_equip.sql
+1 −2,251 sql-files/item_db_etc.sql
+2 −2 sql-files/item_db_re.sql
+1 −7,748 sql-files/item_db_re_equip.sql
+1 −5,291 sql-files/item_db_re_etc.sql
+1 −3,646 sql-files/item_db_re_usable.sql
+1 −1,909 sql-files/item_db_usable.sql
+11 −11 sql-files/main.sql
+2 −1,009 sql-files/mob_db.sql
+2 −43 sql-files/mob_db2.sql
+2 −43 sql-files/mob_db2_re.sql
+1 −2,066 sql-files/mob_db_re.sql
+1 −5,739 sql-files/mob_skill_db.sql
+1 −83 sql-files/mob_skill_db2.sql
+1 −83 sql-files/mob_skill_db2_re.sql
+1 −12,061 sql-files/mob_skill_db_re.sql
+35 −0 sql-files/upgrades/upgrade_20250915.sql
+43 −0 sql-files/upgrades/upgrade_20251030.sql
+121 −0 sql-files/upgrades/upgrade_20251031.sql
+33 −13 src/char/char.cpp
+16 −62 src/char/int_storage.cpp
+0 −4 src/char/int_storage.hpp
+1 −7 src/char/inter.cpp
+18 −1 src/common/mmo.hpp
+39 −15 src/map/atcommand.cpp
+22 −2 src/map/battle.cpp
+2 −4 src/map/battle.hpp
+83 −42 src/map/clif.cpp
+1 −1 src/map/clif.hpp
+0 −1 src/map/clif_packetdb.hpp
+7 −2 src/map/mob.cpp
+1 −1 src/map/mob.hpp
+3 −0 src/map/npc.cpp
+83 −21 src/map/pc.cpp
+2 −1 src/map/pc.hpp
+6 −5 src/map/script.cpp
+18 −0 src/map/script_constants.hpp
+23 −2 src/map/skill.cpp
+10 −7 src/map/status.cpp
+4 −0 src/map/status.hpp
+5 −0 src/tool/yaml2sql.cpp
2 changes: 1 addition & 1 deletion Tools/BrowEdit3
Submodule BrowEdit3 updated 71 files
+9 −2 BrowEdit3.vcxproj
+21 −0 BrowEdit3.vcxproj.filters
+4 −0 browedit/BrowEdit.cpp
+2 −0 browedit/BrowEdit.h
+2 −2 browedit/HotkeyActions.cpp
+1 −0 browedit/HotkeyRegistry.h
+1 −1 browedit/Lightmapper.cpp
+5 −6 browedit/Map.cpp
+9 −1 browedit/Map.h
+1 −1 browedit/MapView.Gatmode.cpp
+44 −7 browedit/MapView.Heightmode.cpp
+5 −0 browedit/MapView.Texturemode.cpp
+36 −44 browedit/MapView.Wallmode.cpp
+496 −0 browedit/MapView.Watermode.cpp
+66 −6 browedit/MapView.cpp
+12 −3 browedit/MapView.h
+2 −2 browedit/ModelEditor.cpp
+5 −3 browedit/NodeRenderer.cpp
+10 −1 browedit/NodeRenderer.h
+72 −1 browedit/actions/GndTextureActions.cpp
+8 −0 browedit/actions/GndTextureActions.h
+11 −0 browedit/actions/ObjectChangeAction.h
+8 −8 browedit/actions/SelectWallAction.cpp
+27 −0 browedit/actions/TileSelectAction.cpp
+13 −0 browedit/actions/TileSelectAction.h
+47 −0 browedit/actions/WaterHeightChangeAction.cpp
+20 −0 browedit/actions/WaterHeightChangeAction.h
+77 −0 browedit/actions/WaterZoneSelectAction.cpp
+31 −0 browedit/actions/WaterZoneSelectAction.h
+5 −4 browedit/components/BillboardRenderer.cpp
+3 −2 browedit/components/BillboardRenderer.h
+5 −4 browedit/components/GatRenderer.cpp
+2 −2 browedit/components/GatRenderer.h
+46 −0 browedit/components/Gnd.cpp
+1 −0 browedit/components/Gnd.h
+5 −4 browedit/components/GndRenderer.cpp
+2 −2 browedit/components/GndRenderer.h
+50 −33 browedit/components/LubRenderer.cpp
+9 −5 browedit/components/LubRenderer.h
+5 −3 browedit/components/Renderer.h
+24 −38 browedit/components/Rsm.cpp
+64 −34 browedit/components/RsmRenderer.cpp
+4 −3 browedit/components/RsmRenderer.h
+7 −1 browedit/components/Rsw.Effect.cpp
+1 −1 browedit/components/Rsw.Model.cpp
+2 −1 browedit/components/Rsw.Object.cpp
+150 −111 browedit/components/Rsw.cpp
+9 −4 browedit/components/Rsw.h
+30 −32 browedit/components/WaterRenderer.cpp
+3 −3 browedit/components/WaterRenderer.h
+7 −8 browedit/gl/FBO.cpp
+2 −2 browedit/gl/FBO.h
+11 −2 browedit/gl/Vertex.h
+1 −3 browedit/math/Ray.cpp
+1 −1 browedit/math/Ray.h
+34 −0 browedit/shaders/OutlineShader.h
+6 −2 browedit/shaders/RsmShader.h
+9 −5 browedit/util/Util.cpp
+3 −0 browedit/windows/CropSettingsWindow.cpp
+2 −0 browedit/windows/MenuBar.cpp
+4 −0 browedit/windows/ObjectSelectWindow.cpp
+6 −1 browedit/windows/Toolbar.cpp
+3 −6 browedit/windows/WallEditWindow.cpp
+160 −0 browedit/windows/WaterEditWindow.cpp
+1 −1 data/defaulthotkeys.json
+1 −1 data/shaders/lub.fs
+6 −3 data/shaders/lub.vs
+85 −0 data/shaders/outline.fs
+12 −0 data/shaders/outline.vs
+12 −6 data/shaders/rsm.fs
+173 −125 imgui.ini