Skip to content

Commit

Permalink
Merge branch 'develop' into adv-beta
Browse files Browse the repository at this point in the history
  • Loading branch information
@myk002
myk002 committed Jan 12, 2025
2 parents 0a8841d + ae1e2e4 commit 83f465c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion plugins/stonesense
Submodule stonesense updated 34 files
+0 −52 BuildingConfiguration.cpp
+18 −3 BuildingConfiguration.h
+31 −49 CMakeLists.txt
+83 −95 ColorConfiguration.cpp
+10 −8 ColorConfiguration.h
+14 −32 ConditionalSprite.cpp
+774 −769 Config.cpp
+2 −3 Config.h
+0 −1 ConnectionState.cpp
+0 −1 ConnectionState.h
+8 −14 Constructions.cpp
+70 −62 ContentBuildingReader.cpp
+71 −189 ContentLoader.cpp
+18 −13 ContentLoader.h
+118 −136 CreatureConfiguration.cpp
+13 −6 CreatureConfiguration.h
+384 −374 Creatures.cpp
+8 −8 Creatures.h
+11 −9 GUI.cpp
+3 −4 GUI.h
+3 −3 GameBuildings.h
+0 −1 MapLoading.cpp
+3 −1 OcclusionTest.cpp
+1 −1 SpriteMaps.cpp
+17 −17 SpriteObjects.h
+2 −2 Tile.h
+2 −25 TileDirection.h
+0 −1 TiletypeMatcher.cpp
+0 −1 TiletypeMatcher.h
+2 −2 WorldSegment.cpp
+4 −4 WorldSegment.h
+50 −55 common.h
+7 −7 commonTypes.h
+5 −4 main.cpp

0 comments on commit 83f465c

Please sign in to comment.