forked from Mirrors/openclonk
196f528201
Conflicts: planet/Objects.ocd/HUD.ocd/FancyGridMenu.ocd/DefCore.txt planet/Objects.ocd/HUD.ocd/GridMenu.ocd/DefCore.txt planet/Objects.ocd/Helpers.ocd/Dummy.ocd/Graphics.png planet/Objects.ocd/Items.ocd/Tools.ocd/WindBag.ocd/Script.c planet/Objects.ocd/Items.ocd/Weapons.ocd/Javelin.ocd/Script.c planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c planet/Objects.ocd/Libraries.ocd/Constructor.ocd/ConstructionMenu.ocd/Script.c planet/Objects.ocd/Libraries.ocd/Constructor.ocd/Script.c planet/Objects.ocd/Libraries.ocd/Flag.ocd/Marker.ocd/Script.c planet/Objects.ocd/Libraries.ocd/Producer.ocd/Script.c planet/Objects.ocd/Structures.ocd/Flagpole.ocd/Script.c planet/Objects.ocd/Structures.ocd/Pump.ocd/Script.c src/game/C4Game.cpp src/gamescript/C4GameScript.cpp src/gui/C4GameMessage.cpp src/landscape/C4Landscape.cpp |
||
---|---|---|
.. | ||
DefCore.txt | ||
Script.c |