marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
openclonk/src
History
David Dormagen ac738735b2 Merge branch 'master' into Controls 
Conflicts:
	planet/Objects.ocd/Vehicles.ocd/Airplane.ocd/Script.c
	src/game/C4Game.cpp
	src/game/C4GraphicsSystem.cpp
	src/gamescript/C4GameScript.cpp
 		2015-09-02 08:19:34 +02:00
..
c4group Fix crash on global or scenario script reload. 2015-08-20 13:15:11 -04:00
config Shader gamma implementation 2015-08-31 17:35:08 +01:00
control Merge branch 'master' into Controls 2015-09-02 08:19:34 +02:00
editor Fix some unused variables and integer type conversions. 2015-09-01 22:18:39 -04:00
game Merge branch 'master' into Controls 2015-09-02 08:19:34 +02:00
gamescript Merge branch 'master' into Controls 2015-09-02 08:19:34 +02:00
graphics revert workaround made for #1368, doesn't work on (certain) Intel chipsets. Instead, limit the maximum bone count to 64 so to meet the limit of 1024 uniform components by certain graphics cards (#1285) 2015-08-31 19:28:00 +02:00
gui Merge branch 'master' into Controls 2015-09-02 08:19:34 +02:00
landscape Shader gamma implementation 2015-08-31 17:35:08 +01:00
lib Merge branch 'master' into Controls 2015-09-02 08:19:34 +02:00
mape Fix mape build. 2015-08-27 21:57:08 -04:00
netio Remove unused MSVC project files for tstc4netio and netpuncher 2014-05-25 22:47:56 +02:00
netpuncher Remove unused MSVC project files for tstc4netio and netpuncher 2014-05-25 22:47:56 +02:00
network Merge branch 'master' into Controls 2015-06-03 22:32:36 +02:00
object Merge branch 'master' into Controls 2015-09-02 08:19:34 +02:00
platform Merge branch 'master' into Controls 2015-09-02 08:19:34 +02:00
player Add script interface for some EFX sound modifiers. 2015-08-27 21:44:23 -04:00
res Implement background material controls in Windows editor. 2015-08-09 13:36:44 -04:00
script Merge branch 'master' into Controls 2015-09-02 08:19:34 +02:00
zlib Fix possible double close when attempting to open uncompressed files 2012-02-05 20:00:47 +01:00
C4Globals.cpp Fix memory leak caused by circular prop list chains. 2015-08-20 20:19:38 -04:00
C4Include.cpp Update copyright notices 2013-12-23 13:03:19 +01:00
C4Include.h Finish DEBUGREC compile option removal 2014-05-28 03:38:11 +02:00
C4Prototypes.h Remove some redundant #includes 2015-01-25 18:53:48 +01:00
C4Version.h.in Set C4VERSION macros from CMake assembled vars 2015-05-21 23:09:00 +02:00