marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
openclonk/src
History
Julius Michaelis 35c3d4a421 Merge branch 'master' into floating-point 
(Just merged. Nothing was tested.)

Conflicts:
	config.h.cmake
	docs/de.po
	planet/Objects.ocd/Libraries.ocd/PowerConsumer.ocd/Script.c
	planet/Objects.ocd/Structures.ocd/Elevator.ocd/Case.ocd/Script.c
	planet/Objects.ocd/Vegetation.ocd/Grass.ocd/Script.c
	planet/Tests.ocf/AirRace.ocs/Extra.ocd/Rocket.ocd/Script.c
	planet/Tests.ocf/AirRace.ocs/Extra.ocd/WeaponSpawn.ocd/Script.c
	planet/Tests.ocf/AirRace.ocs/Script.c
	planet/Tests.ocf/Experimental.ocd/LiftTower.ocd/Hook.ocd/Script.c
	planet/Tests.ocf/Experimental.ocd/LiftTower.ocd/Rope.ocd/Script.c
	planet/Tests.ocf/Moss_Test.ocs/Script.c
	src/script/C4AulParse.cpp
 		2012-12-28 17:52:14 +01:00
..
c4group update: Log an error message when extracting the update program fails 2012-11-19 22:45:19 +01:00
config Add config option for automatic windowed/fullscreen switching 2012-09-29 23:49:30 +02:00
control Remove some superflouos output from the dedicated server 2012-11-30 22:20:16 +01:00
editor editor: Fix USE_CONSOLE 2012-11-16 00:05:58 +01:00
game Merge branch 'master' into floating-point 2012-12-28 17:52:14 +01:00
gamescript Merge branch 'master' into floating-point 2012-12-28 17:52:14 +01:00
graphics Merge StdFont.cpp and C4Fonts.cpp 2012-11-12 02:30:16 +01:00
gui Make network lobby command line processing available to the editor and dedi 2012-11-30 22:20:15 +01:00
landscape Merge branch 'master' into floating-point 2012-12-28 17:52:14 +01:00
lib Merge branch 'master' into floating-point 2012-12-28 17:52:14 +01:00
netio Merge default to floating-point 2012-03-22 18:02:48 +01:00
netpuncher Merge default to floating-point 2012-03-22 18:02:48 +01:00
network Make network lobby command line processing available to the editor and dedi 2012-11-30 22:20:15 +01:00
object Merge branch 'master' into floating-point 2012-12-28 17:52:14 +01:00
platform Merge branch 'master' into floating-point 2012-12-28 17:52:14 +01:00
player Reorder engine source file organization a bit 2012-04-27 19:04:43 +02:00
res mac: Change prefix of Objective-C classes/filenames from Clonk to C4, give xib files names that make more sense 2012-09-02 15:39:29 +02:00
script Merge branch 'master' into floating-point 2012-12-28 17:52:14 +01:00
zlib Merge default to floating-point 2012-03-22 18:02:48 +01:00
C4Globals.cpp build fix 2012-10-12 20:15:37 +02:00
C4Include.cpp Reorganize C4Include.h and Standard.h 2010-01-02 01:11:54 +01:00
C4Include.h Move leak checking behind standard header inclusion 2012-06-04 01:18:28 +02:00
C4Prototypes.h clean up mouse controls, reduced cursor graphics to the used ones 2012-11-16 17:29:42 +01:00
C4Version.h.in Remove build number aka C4XVER4 2012-10-18 23:54:50 +02:00