colobot

History

Michał Konopacki d439f4fa93 Merge branch 'dev-ui' into dev Conflicts: src/CMakeLists.txt src/common/misc.cpp src/common/misc.h src/object/robotmain.cpp src/object/robotmain.h src/script/cbottoken.cpp src/script/cbottoken.h src/ui/button.cpp src/ui/button.h src/ui/check.cpp src/ui/check.h src/ui/color.cpp src/ui/color.h src/ui/compass.cpp src/ui/compass.h src/ui/control.cpp src/ui/control.h src/ui/displayinfo.cpp src/ui/displayinfo.h src/ui/displaytext.cpp src/ui/displaytext.h src/ui/edit.cpp src/ui/edit.h src/ui/gauge.cpp src/ui/gauge.h src/ui/interface.cpp src/ui/interface.h src/ui/key.cpp src/ui/map.h src/ui/shortcut.h src/ui/slider.h src/ui/target.cpp src/ui/target.h src/ui/window.cpp src/ui/window.h		2012-09-15 16:35:48 +02:00
..
auto	[src/object/auto] Folder rewritten	2012-09-09 14:28:19 +02:00
motion	Merge with changes from Zaba999 fork.	2012-09-10 23:29:38 +02:00
task	Merge with changes from Zaba999 fork.	2012-09-10 23:29:38 +02:00
README.txt	Documentation update	2012-08-11 18:39:16 +02:00
brain.cpp	Merge with changes from Zaba999 fork.	2012-09-10 23:29:38 +02:00
brain.h	Merge with changes from Zaba999 fork.	2012-09-10 23:29:38 +02:00
mainmovie.cpp	Whitespace and language change	2012-06-26 22:23:05 +02:00
mainmovie.h	Merge with changes from Zaba999 fork.	2012-09-10 23:29:38 +02:00
object.cpp	Merge with changes from Zaba999 fork.	2012-09-10 23:29:38 +02:00
object.h	Merge with changes from Zaba999 fork.	2012-09-10 23:29:38 +02:00
object_ids.h	Move ObjectType enum to a separate file	2012-08-25 13:47:48 +04:00
robotmain.cpp	Merge branch 'dev-ui' into dev	2012-09-15 16:35:48 +02:00
robotmain.h	Merge branch 'dev-ui' into dev	2012-09-15 16:35:48 +02:00

README.txt

/**
 * \dir object
 * \brief Game engine
 *
 * Contains the main class of game engine - CRobotMain and the various in-game objects:
 * CObject and related auto, motion and task subclasses.
 */