Commit Graph

605 Commits (c190c3efaec57dcb550a57a56538010ff5e2b532)

Author SHA1 Message Date
Piotr Dziwinski c6673b9aee Texture format detection; minor fixes
- detection of texture format
- fixed depth mask bug
- minor refactoring
2012-09-09 12:56:09 +02:00
Piotr Dziwinski c2c1294ec9 CTerrain refactoring & fixes
- refactored CTerrain code
- fixed some minor bugs
2012-09-08 23:44:14 +02:00
Piotr Dziwinski 480b57a086 Fix in texture handling in Blender script 2012-09-08 16:39:08 +02:00
Piotr Dziwinski 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
Piotr Dziwinski 0b1e6949b0 Import/export script for Blender
- rewrote old export script
- added import and texture support
2012-09-05 21:08:44 +02:00
Piotr Dziwinski dbeb9af455 Blender script to export models 2012-09-03 22:38:43 +02:00
Piotr Dziwinski 08f1b68ffd Fix 2012-09-03 22:37:28 +02:00
Piotr Dziwinski 09fd0e205e Fix 2012-09-03 19:21:37 +02:00
erihel 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
erihel 6ba0f42f22 latest changes; few more classes should compile now 2012-08-31 22:28:07 +02:00
Piotr Dziwinski 01fd19d2cd Fix 2012-08-31 21:51:28 +02:00
Piotr Dziwinski 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
Piotr Dziwinski 7f277c9ab9 Whitespace fix 2012-08-27 01:05:59 +02:00
Piotr Dziwinski 3e52ae4ca9 Fixes in terrain rendering 2012-08-27 01:02:25 +02:00
Piotr Dziwiński 06f52867b6 Merge pull request #42 from amonakov/dev
Slim down restext.cpp, make it gettext-ready
2012-08-25 11:25:12 -07:00
Alexander Monakov 896291b769 Add translation files 2012-08-25 14:37:51 +04:00
Alexander Monakov 9b4628fd02 Move strings out of restext. Add i18n via gettext 2012-08-25 14:37:51 +04:00
Alexander Monakov 5ff4ce146a Move ResTextType enum to a separate file 2012-08-25 13:51:17 +04:00
Alexander Monakov f5a8a92050 Move ObjectType enum to a separate file 2012-08-25 13:47:48 +04:00
Alexander Monakov 43f7b384e9 Move Error enum to a separate file 2012-08-25 13:46:49 +04:00
Alexander Monakov 5b2bc48986 Move EventType enum to a separate file 2012-08-25 13:45:40 +04:00
erihel 5408fe9252 * added nullptr
* changed Ret to Get function names
* minor changes
2012-08-21 21:38:13 +02:00
erihel 4faa1b9c44 merged changes from michkon 2012-08-21 20:55:03 +02:00
erihel 75a76e8252 latest changes 2012-08-21 20:53:39 +02:00
Michał Konopacki 1997682808 added ui/shortcut.* 2012-08-21 15:23:59 +02:00
Michał Konopacki 60950ce66b Typo fix 2012-08-20 21:45:17 +02:00
Michał Konopacki af45bc399f added ui/scroll.* 2012-08-20 21:42:07 +02:00
Michał Konopacki 59ec83c409 added ui/slider.* 2012-08-20 21:35:11 +02:00
Michał Konopacki 02dc368a38 added ui/target.* 2012-08-20 21:31:16 +02:00
Michał Konopacki bd9c581ced added ui/window.* -- not fully ported 2012-08-20 21:22:24 +02:00
Michał Konopacki 7a4ec2adc4 Merge remote-tracking branch 'erihel/dev-ui' into dev-ui
Conflicts:
	src/ui/button.h
	src/ui/color.h
	src/ui/compass.h
	src/ui/control.h
	src/ui/displayinfo.h
	src/ui/displaytext.h
	src/ui/edit.h
	src/ui/editvalue.h
	src/ui/gauge.h
	src/ui/group.h
	src/ui/image.h
	src/ui/slider.h
2012-08-20 15:12:26 +02:00
Michał Konopacki 8666d35f7c UI porting 2012-08-20 14:05:36 +02:00
Michał Konopacki 574c07e388 Further improvements in UI porting 2012-08-18 22:56:42 +02:00
erihel 8d4a3ed579 * wrong enum used for text alignment
* wrong event function used
2012-08-18 21:04:51 +02:00
erihel 48ad79a03c * minor changes to control.cpp to compile it without errors 2012-08-18 11:30:29 +02:00
erihel c02ac93379 * list.cpp compiles 2012-08-17 23:56:29 +02:00
erihel a00032d075 * ui/label.cpp compiles 2012-08-17 23:05:59 +02:00
erihel ea6269c411 * ui/key.cpp compiles
* csoundinterface to ccontrol
2012-08-17 23:03:52 +02:00
erihel 6ff8706d04 * last commit should not include sound changes 2012-08-17 22:49:16 +02:00
erihel c2464d4c71 * changes to ui classes 2012-08-17 22:43:07 +02:00
Michał Konopacki 10b2c562fb First approach to port 2D UI Interface
- changes in src/ui ; be CAREFUL, not every file is changed in a proper way -> bugs
- necessary changes in object/robotmain.h and common/misc.h/.cpp in order to compile
2012-08-15 01:48:49 +02:00
Michał Konopacki e942400c8b Merge remote-tracking branch 'upstream/dev-ui' into dev-ui 2012-08-13 23:46:47 +02:00
Piotr Dziwinski 8b2bca72dd Merge branch 'dev-graphics' into dev
Documentation, rendering functions & fixes
2012-08-13 23:13:10 +02:00
Piotr Dziwinski 5b45911856 Improved error messages
Added some logging and improved error messages displayed to user
2012-08-13 23:09:30 +02:00
Michał Konopacki 9ee1d2e172 Merge remote-tracking branch 'upstream/dev-graphics' into dev-ui 2012-08-13 21:23:20 +02:00
Piotr Dziwinski a2dd39960b Fix 2012-08-13 18:17:54 +02:00
Piotr Dziwinski b68dfcd155 Test fix 2012-08-13 18:03:12 +02:00
Piotr Dziwiński dc3cadd309 Merge pull request #37 from konopackim/dev
Fixes and console interpreter
2012-08-13 08:46:03 -07:00
Michał Konopacki e154e654f1 Reduced amount of warnings in CBot library
Changed most of C-style casting to C++ casting
Commented unused variables
2012-08-13 01:45:35 +02:00
Piotr Dziwinski 712154bc4f Rendering functions, documentation
- rewrote the render functions for CEngine, CCloud and CWater
- added documentation
2012-08-13 00:14:42 +02:00