Skip to content

Commit

Permalink
Update openclonk submodule
Browse files Browse the repository at this point in the history 
Includes a fix for BMP palette colors.
  • Loading branch information
@lluchs
lluchs committed Apr 1, 2017
1 parent 7368ecf commit ffdc932
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion openclonk
Submodule openclonk updated 77 files
+8 −5 CMakeLists.txt
+1 −1 planet/Objects.ocd/Animals.ocd/Chippie.ocd/Script.c
+0 −1 planet/Objects.ocd/Environment.ocd/Disasters.ocd/BoilingAcid.ocd/Bubble.ocd/DefCore.txt
+2 −2 planet/Objects.ocd/Environment.ocd/Disasters.ocd/BoilingAcid.ocd/Bubble.ocd/Script.c
+32 −9 planet/Objects.ocd/Environment.ocd/Disasters.ocd/BoilingAcid.ocd/Script.c
+0 −5 planet/Objects.ocd/Environment.ocd/Disasters.ocd/BoilingAcid.ocd/Spawner.ocd/DefCore.txt
+0 −42 planet/Objects.ocd/Environment.ocd/Disasters.ocd/BoilingAcid.ocd/Spawner.ocd/Script.c
+0 −1 planet/Objects.ocd/Environment.ocd/Disasters.ocd/BoilingLava.ocd/Bubble.ocd/DefCore.txt
+3 −3 planet/Objects.ocd/Environment.ocd/Disasters.ocd/BoilingLava.ocd/Bubble.ocd/Script.c
+25 −7 planet/Objects.ocd/Environment.ocd/Disasters.ocd/BoilingLava.ocd/Script.c
+0 −5 planet/Objects.ocd/Environment.ocd/Disasters.ocd/BoilingLava.ocd/Spawner.ocd/DefCore.txt
+0 −39 planet/Objects.ocd/Environment.ocd/Disasters.ocd/BoilingLava.ocd/Spawner.ocd/Script.c
+7 −1 planet/Objects.ocd/Libraries.ocd/Animal.ocd/Script.c
+3 −0 planet/System.ocg/SaveScenario.c
+3 −0 planet/Tutorials.ocf/Sandbox.ocs/Authors.txt
+15 −0 planet/Tutorials.ocf/Sandbox.ocs/DescDE.txt
+15 −0 planet/Tutorials.ocf/Sandbox.ocs/DescUS.txt
+7 −0 planet/Tutorials.ocf/Sandbox.ocs/GodsHand.ocd/DefCore.txt
+ − planet/Tutorials.ocf/Sandbox.ocs/GodsHand.ocd/Graphics.png
+35 −0 planet/Tutorials.ocf/Sandbox.ocs/GodsHand.ocd/Script.c
+2 −0 planet/Tutorials.ocf/Sandbox.ocs/GodsHand.ocd/StringTblDE.txt
+2 −0 planet/Tutorials.ocf/Sandbox.ocs/GodsHand.ocd/StringTblUS.txt
+52 −0 planet/Tutorials.ocf/Sandbox.ocs/Map.c
+8 −0 planet/Tutorials.ocf/Sandbox.ocs/Marker.ocd/DefCore.txt
+ − planet/Tutorials.ocf/Sandbox.ocs/Marker.ocd/Graphics.png
+55 −0 planet/Tutorials.ocf/Sandbox.ocs/Marker.ocd/Script.c
+2 −0 planet/Tutorials.ocf/Sandbox.ocs/Marker.ocd/StringTblDE.txt
+2 −0 planet/Tutorials.ocf/Sandbox.ocs/Marker.ocd/StringTblUS.txt
+7 −0 planet/Tutorials.ocf/Sandbox.ocs/Scenario.txt
+38 −0 planet/Tutorials.ocf/Sandbox.ocs/Script.c
+ − planet/Tutorials.ocf/Sandbox.ocs/Sound.ocg/warp.ogg
+14 −0 planet/Tutorials.ocf/Sandbox.ocs/SprayCan.ocd/DefCore.txt
+ − planet/Tutorials.ocf/Sandbox.ocs/SprayCan.ocd/Graphics.mesh
+ − planet/Tutorials.ocf/Sandbox.ocs/SprayCan.ocd/Graphics.skeleton
+ − planet/Tutorials.ocf/Sandbox.ocs/SprayCan.ocd/Overlay.png
+119 −0 planet/Tutorials.ocf/Sandbox.ocs/SprayCan.ocd/Script.c
+ − planet/Tutorials.ocf/Sandbox.ocs/SprayCan.ocd/SprayCan.jpg
+37 −0 planet/Tutorials.ocf/Sandbox.ocs/SprayCan.ocd/SprayCan.material
+ − planet/Tutorials.ocf/Sandbox.ocs/SprayCan.ocd/SprayCan.wav
+2 −0 planet/Tutorials.ocf/Sandbox.ocs/SprayCan.ocd/StringTblDE.txt
+2 −0 planet/Tutorials.ocf/Sandbox.ocs/SprayCan.ocd/StringTblUS.txt
+2,131 −0 planet/Tutorials.ocf/Sandbox.ocs/System.ocg/Clonk_SandboxUI.c
+91 −0 planet/Tutorials.ocf/Sandbox.ocs/System.ocg/StringTblDE.txt
+7 −0 planet/Tutorials.ocf/Sandbox.ocs/Teleporter.ocd/DefCore.txt
+ − planet/Tutorials.ocf/Sandbox.ocs/Teleporter.ocd/Graphics.png
+34 −0 planet/Tutorials.ocf/Sandbox.ocs/Teleporter.ocd/Script.c
+2 −0 planet/Tutorials.ocf/Sandbox.ocs/Teleporter.ocd/StringTblDE.txt
+2 −0 planet/Tutorials.ocf/Sandbox.ocs/Teleporter.ocd/StringTblUS.txt
+2 −0 planet/Tutorials.ocf/Sandbox.ocs/Title.txt
+6 −0 src/config/C4Config.cpp
+6 −3 src/control/C4GameSave.cpp
+2 −2 src/editor/C4ConsoleQtNewScenario.cpp
+8 −8 src/game/C4Game.cpp
+39 −23 src/game/C4GameScript.cpp
+1 −1 src/graphics/C4GraphicsResource.cpp
+2 −2 src/gui/C4StartupScenSelDlg.cpp
+1 −1 src/gui/C4StartupScenSelDlg.h
+3 −3 src/landscape/C4Map.cpp
+20 −13 src/landscape/C4Scenario.cpp
+8 −8 src/landscape/C4Scenario.h
+7 −2 src/landscape/C4Texture.cpp
+0 −16 src/lib/Standard.cpp
+9 −0 src/lib/StdBuf.h
+48 −13 src/lib/StdCompiler.cpp
+97 −86 src/lib/StdCompiler.h
+1 −1 src/network/C4NetIO.cpp
+2 −2 src/network/C4Network2IO.cpp
+3 −1 src/network/C4Network2IO.h
+2 −2 src/network/C4Network2Res.cpp
+3 −1 src/network/C4Network2Res.h
+118 −43 src/platform/StdRegistry.cpp
+52 −42 src/platform/StdRegistry.h
+7 −4 src/platform/StdSchedulerWin32.cpp
+0 −10 src/platform/StdSync.h
+5 −1 src/script/C4AulLink.cpp
+22 −0 src/script/C4PropList.cpp
+1 −0 src/script/C4PropList.h

0 comments on commit ffdc932

Please sign in to comment.