Merge branch 'development' into api
# Conflicts: # src/main/java/emu/grasscutter/Grasscutter.java
Showing
- src/main/java/emu/grasscutter/game/entity/EntityGadget.java 142 additions, 3 deletionssrc/main/java/emu/grasscutter/game/entity/EntityGadget.java
- src/main/java/emu/grasscutter/game/entity/EntityItem.java 1 addition, 1 deletionsrc/main/java/emu/grasscutter/game/entity/EntityItem.java
- src/main/java/emu/grasscutter/game/entity/EntityMonster.java 9 additions, 20 deletionssrc/main/java/emu/grasscutter/game/entity/EntityMonster.java
- src/main/java/emu/grasscutter/game/entity/EntityVehicle.java 12 additions, 3 deletionssrc/main/java/emu/grasscutter/game/entity/EntityVehicle.java
- src/main/java/emu/grasscutter/game/entity/GameEntity.java 28 additions, 0 deletionssrc/main/java/emu/grasscutter/game/entity/GameEntity.java
- src/main/java/emu/grasscutter/game/inventory/GameItem.java 4 additions, 0 deletionssrc/main/java/emu/grasscutter/game/inventory/GameItem.java
- src/main/java/emu/grasscutter/game/player/TeamManager.java 3 additions, 3 deletionssrc/main/java/emu/grasscutter/game/player/TeamManager.java
- src/main/java/emu/grasscutter/game/props/EntityType.java 93 additions, 0 deletionssrc/main/java/emu/grasscutter/game/props/EntityType.java
- src/main/java/emu/grasscutter/game/world/Scene.java 146 additions, 4 deletionssrc/main/java/emu/grasscutter/game/world/Scene.java
- src/main/java/emu/grasscutter/game/world/World.java 44 additions, 8 deletionssrc/main/java/emu/grasscutter/game/world/World.java
- src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java 2 additions, 0 deletionssrc/main/java/emu/grasscutter/net/packet/PacketOpcodes.java
- src/main/java/emu/grasscutter/plugin/PluginManager.java 1 addition, 1 deletionsrc/main/java/emu/grasscutter/plugin/PluginManager.java
- src/main/java/emu/grasscutter/scripts/SceneScriptManager.java 345 additions, 0 deletions...main/java/emu/grasscutter/scripts/SceneScriptManager.java
- src/main/java/emu/grasscutter/scripts/ScriptLib.java 190 additions, 0 deletionssrc/main/java/emu/grasscutter/scripts/ScriptLib.java
- src/main/java/emu/grasscutter/scripts/ScriptLoader.java 74 additions, 0 deletionssrc/main/java/emu/grasscutter/scripts/ScriptLoader.java
- src/main/java/emu/grasscutter/scripts/constants/EventType.java 82 additions, 0 deletions...ain/java/emu/grasscutter/scripts/constants/EventType.java
- src/main/java/emu/grasscutter/scripts/constants/ScriptGadgetState.java 24 additions, 0 deletions.../emu/grasscutter/scripts/constants/ScriptGadgetState.java
- src/main/java/emu/grasscutter/scripts/constants/ScriptRegionShape.java 7 additions, 0 deletions.../emu/grasscutter/scripts/constants/ScriptRegionShape.java
- src/main/java/emu/grasscutter/scripts/data/SceneBlock.java 17 additions, 0 deletionssrc/main/java/emu/grasscutter/scripts/data/SceneBlock.java
- src/main/java/emu/grasscutter/scripts/data/SceneConfig.java 11 additions, 0 deletionssrc/main/java/emu/grasscutter/scripts/data/SceneConfig.java
Please register or sign in to comment