af9af56bb0
Successful compilation & running
...
- temporarily mocked CSoundInterface and CPluginInterface
- added CRobotMain to application
- successfully compiles & runs, but doesn't display correctly at the
moment
2012-09-15 22:19:32 +02:00
2847aad51f
Merge branch 'dev' of github.com:adiblol/colobot into dev
2012-09-15 22:07:14 +02:00
c439964d28
[src/ui] CStudio compiles
2012-09-15 22:06:10 +02:00
8ad15c0ef7
CMainDialog rewrite
...
- rewritten CMainDialog and updated CRobotMain
2012-09-15 21:47:19 +02:00
ad6bc13dc2
Merge dev-common and various fixes to achieve compilation
...
- merged changes from dev-common
- fixed many compilation errors (CBrain, UI, ...)
- temporarily commented out some problematic code (e.g. input bindings)
- (partially) fixed #include styling
- everything compiles except for CRobotMain, CMainDialog and CStudio
2012-09-15 18:50:51 +02:00
95d2f8da2c
Merge branch 'dev-object' into dev
...
Conflicts:
src/object/robotmain.cpp
src/object/robotmain.h
2012-09-15 16:54:35 +02:00
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
a1400f496b
CRobotMain rewrite
...
- rewritten CRobotMain
- won't compile yet because of dependencies to CMainDialog
2012-09-15 15:33:08 +02:00
94e7fd9203
Locale settings and translation fixes
...
- added locale setting
- removed unused translations
- updated .po files
2012-09-13 23:28:06 +02:00
8b9954fff4
brain.* mainmovie.* : Partially rewritten
...
The remaining part will be revised and rewritten after merge with dev and dev-ui branches
2012-09-13 22:14:40 +02:00
87c87c2c06
Image pixel read/write
2012-09-13 20:40:07 +02:00
9bfdcacc52
Fixes in [object/auto]
2012-09-13 18:28:50 +02:00
e9fcec9de5
Merge pull request #45 from Erihel/dev-ui
...
Changes from dev-ui in erihel's fork
2012-09-13 09:09:41 -07:00
8f285465e8
[object/motion] Folder compiles
2012-09-13 17:40:39 +02:00
34d7dcf3be
Simulation timestamps and input bindings
...
- added new simulation time calculations in CApplication
- added simulation frame updates
- rewritten old input binding code and input state tracking
2012-09-12 23:43:04 +02:00
8b223eb096
all tasks compile.
2012-09-12 22:34:40 +02:00
44e4bcef45
Merge branch 'dev-object' of github.com:adiblol/colobot into dev-object
2012-09-11 23:29:00 +02:00
064fedb814
commented part of tasks that does not compile.
2012-09-11 23:14:55 +02:00
1bb1eb7b87
half of task compile.
2012-09-11 23:11:34 +02:00
68d9c61e97
[src/object] motion.* motionant.* motionbee.* should compile
2012-09-11 22:45:48 +02:00
6c21dceb35
Tests rewrite and Doxygen in src/math
...
- rewritten tests to use new framework
- updated/reformatted Doxygen
- removed legacy conversions
2012-09-11 21:14:32 +02:00
01cc0fbc49
* latest changes
...
* all files except studio, map and maindialog should compile
* did some code cleanup
2012-09-11 12:49:41 +02:00
e57be247c2
commented new part in cmakelist and reverted stubs in camera.cpp. Will be commited later after implementation is finished in dev-object branch.
2012-09-10 23:39:22 +02:00
479a67a731
Merge with changes from Zaba999 fork.
2012-09-10 23:29:38 +02:00
901f10b2ba
Fixed old model format bugs
2012-09-09 23:34:52 +02:00
cf2295d08d
Commenting out src/object/auto temporarily
2012-09-09 17:58:09 +02:00
efe4f0badd
Refactoring in src/common
...
- refactored CInstanceManager and some headers
- removed old headers
2012-09-09 17:51:10 +02:00
6892d37a4f
[src/object/auto] Folder rewritten
2012-09-09 14:28:19 +02:00
b3d5491af4
Merge branch 'dev' into dev-graphics
2012-09-09 13:05:41 +02:00
c6673b9aee
Texture format detection; minor fixes
...
- detection of texture format
- fixed depth mask bug
- minor refactoring
2012-09-09 12:56:09 +02:00
c2c1294ec9
CTerrain refactoring & fixes
...
- refactored CTerrain code
- fixed some minor bugs
2012-09-08 23:44:14 +02:00
480b57a086
Fix in texture handling in Blender script
2012-09-08 16:39:08 +02:00
31c29ea482
CModelFile fixes; test framework
...
- fixes in CModelFile IO
- added Google Test framework for automatic testing
- rewrote modelfile_test in the new framework
2012-09-08 03:05:12 +02:00
0b1e6949b0
Import/export script for Blender
...
- rewrote old export script
- added import and texture support
2012-09-05 21:08:44 +02:00
dbeb9af455
Blender script to export models
2012-09-03 22:38:43 +02:00
08f1b68ffd
Fix
2012-09-03 22:37:28 +02:00
09fd0e205e
Fix
2012-09-03 19:21:37 +02:00
5903e400d4
Merge branch 'dev' of https://github.com/adiblol/colobot into dev-ui
...
Conflicts:
src/common/restext.cpp
src/common/restext.h
2012-09-03 18:26:51 +02:00
6ba0f42f22
latest changes; few more classes should compile now
2012-08-31 22:28:07 +02:00
01fd19d2cd
Fix
2012-08-31 21:51:28 +02:00
e94e26ae1e
New model file format
...
- added new binary and text formats for models
- fixes and improvements in CModelFile
- tool for converting model files
- minor additions and fixes
2012-08-31 20:55:16 +02:00
7f277c9ab9
Whitespace fix
2012-08-27 01:05:59 +02:00
3e52ae4ca9
Fixes in terrain rendering
2012-08-27 01:02:25 +02:00
06f52867b6
Merge pull request #42 from amonakov/dev
...
Slim down restext.cpp, make it gettext-ready
2012-08-25 11:25:12 -07:00
896291b769
Add translation files
2012-08-25 14:37:51 +04:00
9b4628fd02
Move strings out of restext. Add i18n via gettext
2012-08-25 14:37:51 +04:00
5ff4ce146a
Move ResTextType enum to a separate file
2012-08-25 13:51:17 +04:00
f5a8a92050
Move ObjectType enum to a separate file
2012-08-25 13:47:48 +04:00
43f7b384e9
Move Error enum to a separate file
2012-08-25 13:46:49 +04:00
5b2bc48986
Move EventType enum to a separate file
2012-08-25 13:45:40 +04:00
Piotr Dziwinski