Merge branch 'break-core-master'

Browse Source

...

This commit is contained in:

iProgramInCpp

2023-08-05 14:29:13 +03:00

parent ed7b738cf7 8b92eced31

commit 93a07d3629

345 changed files with 2675 additions and 2803 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

source/App/App.cpp → source/App.cpp

0

source/App/App.hpp → source/App.hpp

0

source/App/AppPlatform.cpp → source/AppPlatform.cpp

0

source/App/AppPlatform.hpp → source/AppPlatform.hpp

0

source/App/Minecraft.cpp → source/Minecraft.cpp

0

source/App/Minecraft.hpp → source/Minecraft.hpp

0

source/App/NinecraftApp.cpp → source/NinecraftApp.cpp

0

source/App/NinecraftApp.hpp → source/NinecraftApp.hpp

0

source/Base/AABB.cpp → source/client/common/AABB.cpp

0

source/Base/AABB.hpp → source/client/common/AABB.hpp

0

source/Base/CThread.cpp → source/client/common/CThread.cpp

0

source/Base/CThread.hpp → source/client/common/CThread.hpp

0

source/Base/HitResult.cpp → source/client/common/HitResult.cpp

0

source/Base/HitResult.hpp → source/client/common/HitResult.hpp

0

source/Base/ImprovedNoise.cpp → source/client/common/ImprovedNoise.cpp

0

source/Base/ImprovedNoise.hpp → source/client/common/ImprovedNoise.hpp

0

source/Base/LongHack.hpp → source/client/common/LongHack.hpp

0

source/Base/Matrix.cpp → source/client/common/Matrix.cpp

0

source/Base/Matrix.hpp → source/client/common/Matrix.hpp

0

source/Base/Mth.cpp → source/client/common/Mth.cpp

0

source/Base/Mth.hpp → source/client/common/Mth.hpp

0

source/Options.cpp → source/client/common/Options.cpp

0

source/Options.hpp → source/client/common/Options.hpp

0

source/Base/PerlinNoise.cpp → source/client/common/PerlinNoise.cpp

0

source/Base/PerlinNoise.hpp → source/client/common/PerlinNoise.hpp

0

source/Base/Random.cpp → source/client/common/Random.cpp

0

source/Base/Random.hpp → source/client/common/Random.hpp

0

source/Base/Synth.cpp → source/client/common/Synth.cpp

0

source/Base/Synth.hpp → source/client/common/Synth.hpp

0

source/Base/Timer.cpp → source/client/common/Timer.cpp

0

source/Base/Timer.hpp → source/client/common/Timer.hpp

0

source/Base/Util.cpp → source/client/common/Util.cpp

0

source/Base/Util.hpp → source/client/common/Util.hpp

0

source/Base/Utils.cpp → source/client/common/Utils.cpp

0

source/Base/Utils.hpp → source/client/common/Utils.hpp

0

source/Base/Vec3.cpp → source/client/common/Vec3.cpp

0

source/Base/Vec3.hpp → source/client/common/Vec3.hpp

0

source/GUI/Gui.cpp → source/client/gui/Gui.cpp

0

source/GUI/Gui.hpp → source/client/gui/Gui.hpp

0

source/GUI/GuiComponent.cpp → source/client/gui/GuiComponent.cpp

0

source/GUI/GuiComponent.hpp → source/client/gui/GuiComponent.hpp

0

source/GUI/Screen/Screen.cpp → source/client/gui/Screen.cpp

0

source/GUI/Screen/Screen.hpp → source/client/gui/Screen.hpp

0

source/GUI/AvailableGamesList.cpp → source/client/gui/components/AvailableGamesList.cpp

0

source/GUI/AvailableGamesList.hpp → source/client/gui/components/AvailableGamesList.hpp

0

source/GUI/Button.cpp → source/client/gui/components/Button.cpp

0

source/GUI/Button.hpp → source/client/gui/components/Button.hpp

0

source/GUI/RolledSelectionList.cpp → source/client/gui/components/RolledSelectionList.cpp

0

source/GUI/RolledSelectionList.hpp → source/client/gui/components/RolledSelectionList.hpp

0

source/GUI/ScrolledSelectionList.cpp → source/client/gui/components/ScrolledSelectionList.cpp

0

source/GUI/ScrolledSelectionList.hpp → source/client/gui/components/ScrolledSelectionList.hpp

0

source/GUI/SmallButton.cpp → source/client/gui/components/SmallButton.cpp

0

source/GUI/SmallButton.hpp → source/client/gui/components/SmallButton.hpp

0

source/GUI/TextInputBox.cpp → source/client/gui/components/TextInputBox.cpp

0

source/GUI/TextInputBox.hpp → source/client/gui/components/TextInputBox.hpp

0

source/GUI/WorldSelectionList.cpp → source/client/gui/components/WorldSelectionList.cpp

0

source/GUI/WorldSelectionList.hpp → source/client/gui/components/WorldSelectionList.hpp

0

source/GUI/Screen/ChatScreen.cpp → source/client/gui/screens/ChatScreen.cpp

0

source/GUI/Screen/ChatScreen.hpp → source/client/gui/screens/ChatScreen.hpp

0

source/GUI/Screen/ConfirmScreen.cpp → source/client/gui/screens/ConfirmScreen.cpp

0

source/GUI/Screen/ConfirmScreen.hpp → source/client/gui/screens/ConfirmScreen.hpp

0

source/GUI/Screen/CreateWorldScreen.cpp → source/client/gui/screens/CreateWorldScreen.cpp

0

source/GUI/Screen/CreateWorldScreen.hpp → source/client/gui/screens/CreateWorldScreen.hpp

0

source/GUI/Screen/DeleteWorldScreen.cpp → source/client/gui/screens/DeleteWorldScreen.cpp

0

source/GUI/Screen/DeleteWorldScreen.hpp → source/client/gui/screens/DeleteWorldScreen.hpp

0

source/GUI/Screen/IngameBlockSelectionScreen.cpp → source/client/gui/screens/IngameBlockSelectionScreen.cpp

0

source/GUI/Screen/IngameBlockSelectionScreen.hpp → source/client/gui/screens/IngameBlockSelectionScreen.hpp

0

source/GUI/Screen/InvalidLicenseScreen.cpp → source/client/gui/screens/InvalidLicenseScreen.cpp

0

source/GUI/Screen/InvalidLicenseScreen.hpp → source/client/gui/screens/InvalidLicenseScreen.hpp

0

source/GUI/Screen/JoinGameScreen.cpp → source/client/gui/screens/JoinGameScreen.cpp

0

source/GUI/Screen/JoinGameScreen.hpp → source/client/gui/screens/JoinGameScreen.hpp

0

source/GUI/Screen/OptionsScreen.cpp → source/client/gui/screens/OptionsScreen.cpp

0

source/GUI/Screen/OptionsScreen.hpp → source/client/gui/screens/OptionsScreen.hpp

0

source/GUI/Screen/PauseScreen.cpp → source/client/gui/screens/PauseScreen.cpp

0

source/GUI/Screen/PauseScreen.hpp → source/client/gui/screens/PauseScreen.hpp

0

source/GUI/Screen/ProgressScreen.cpp → source/client/gui/screens/ProgressScreen.cpp

0

source/GUI/Screen/ProgressScreen.hpp → source/client/gui/screens/ProgressScreen.hpp

0

source/GUI/Screen/RenameMPLevelScreen.cpp → source/client/gui/screens/RenameMPLevelScreen.cpp

0

source/GUI/Screen/RenameMPLevelScreen.hpp → source/client/gui/screens/RenameMPLevelScreen.hpp

0

source/GUI/Screen/SavingWorldScreen.cpp → source/client/gui/screens/SavingWorldScreen.cpp

0

source/GUI/Screen/SavingWorldScreen.hpp → source/client/gui/screens/SavingWorldScreen.hpp

0

source/GUI/Screen/SelectWorldScreen.cpp → source/client/gui/screens/SelectWorldScreen.cpp

0

source/GUI/Screen/SelectWorldScreen.hpp → source/client/gui/screens/SelectWorldScreen.hpp

0

source/GUI/Screen/StartMenuScreen.cpp → source/client/gui/screens/StartMenuScreen.cpp

0

source/GUI/Screen/StartMenuScreen.hpp → source/client/gui/screens/StartMenuScreen.hpp

0

source/Renderer/Cube.cpp → source/client/model/Cube.cpp

0

source/Renderer/Cube.hpp → source/client/model/Cube.hpp

0

source/World/Entity/Models/HumanoidModel.cpp → source/client/model/HumanoidModel.cpp

0

source/World/Entity/Models/HumanoidModel.hpp → source/client/model/HumanoidModel.hpp

0

source/World/Entity/Models/Model.cpp → source/client/model/Model.cpp

0

source/World/Entity/Models/Model.hpp → source/client/model/Model.hpp

0

source/Renderer/PolygonQuad.cpp → source/client/model/PolygonQuad.cpp

0

source/Renderer/PolygonQuad.hpp → source/client/model/PolygonQuad.hpp

0

source/Network/ClientSideNetworkHandler.cpp → source/client/network/ClientSideNetworkHandler.cpp

0

source/Network/ClientSideNetworkHandler.hpp → source/client/network/ClientSideNetworkHandler.hpp

0

source/Network/MinecraftPackets.cpp → source/client/network/MinecraftPackets.cpp

0

source/Network/MinecraftPackets.hpp → source/client/network/MinecraftPackets.hpp

0

source/Network/NetEventCallback.cpp → source/client/network/NetEventCallback.cpp

0

source/Network/NetEventCallback.hpp → source/client/network/NetEventCallback.hpp

0

source/Network/Packet.hpp → source/client/network/Packet.hpp

Some files were not shown because too many files have changed in this diff Show More