Michał Konopacki
8f285465e8
[object/motion] Folder compiles
2012-09-13 17:40:39 +02:00
Zaba999
8b223eb096
all tasks compile.
2012-09-12 22:34:40 +02:00
Michał Konopacki
44e4bcef45
Merge branch 'dev-object' of github.com:adiblol/colobot into dev-object
2012-09-11 23:29:00 +02:00
Zaba999
064fedb814
commented part of tasks that does not compile.
2012-09-11 23:14:55 +02:00
Zaba999
1bb1eb7b87
half of task compile.
2012-09-11 23:11:34 +02:00
Michał Konopacki
68d9c61e97
[src/object] motion.* motionant.* motionbee.* should compile
2012-09-11 22:45:48 +02:00
Zaba999
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
Zaba999
479a67a731
Merge with changes from Zaba999 fork.
2012-09-10 23:29:38 +02:00
Piotr Dziwinski
cf2295d08d
Commenting out src/object/auto temporarily
2012-09-09 17:58:09 +02:00
Michał Konopacki
6892d37a4f
[src/object/auto] Folder rewritten
2012-09-09 14:28:19 +02:00
Piotr Dziwinski
b3d5491af4
Merge branch 'dev' into dev-graphics
2012-09-09 13:05:41 +02:00
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
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
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
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
Piotr Dziwinski
146ad47e4a
Merge branch 'dev-graphics' into dev
...
CEngine object handling
2012-08-12 19:30:31 +02:00
Piotr Dziwinski
45a5e1e865
Object handling in CEngine
...
- finished rewriting CEngine object, shadow, etc. handling
- refactored texture code
- added new log levels
2012-08-12 19:28:22 +02:00
Piotr Dziwinski
6ab1746ec9
Compile fix
2012-08-12 19:22:43 +02:00
Piotr Dziwiński
50deedb6cb
Merge pull request #36 from Erihel/dev
...
Merge of new features: plugins and INI profile, changes from dev-graphics
2012-08-12 10:15:19 -07:00
erihel
62b545128f
* Final changes to plugin interface
...
* Added doxygen comments to plugin manager and plugin loader
2012-08-12 18:37:11 +02:00
erihel
f01296690e
Merge branch 'dev-opengl' into dev
2012-08-12 17:09:11 +02:00
erihel
5e271e550d
* New CPluginManager class for managing plugins based on colobot.ini
...
* Moved sound plugin into sound dir
* Minor changes in logger and profile
2012-08-12 15:00:37 +02:00
Piotr Dziwinski
b4b74c30e9
Fixes & testing in CEngine
...
- fixed bugs in settings modes, etc.
- some additions and minor refactoring
2012-08-12 10:45:04 +02:00
Michał Konopacki
a9186d1960
Changed GivAttrName() to GetAttrName()
2012-08-11 20:59:35 +02:00
Piotr Dziwinski
1996507fd3
Documentation update
...
- updated Doxyfile
- added/changed file, dir and namespace descriptions
- fixed some errors in doxygen tags
2012-08-11 18:39:16 +02:00
Piotr Dziwinski
7f80ca2971
Render mode setting, refactoring
...
- finished SetState in CEngine
- refactored Size and IntSize back to Point and IntPoint
- other minor changes in CEngine
2012-08-11 17:17:04 +02:00
Piotr Dziwinski
63257034c9
Partial CEngine implementation
...
- added rewritten implementation for basic modesetting in CEngine
- started rewriting proper rendering and object handling in CEngine
2012-08-10 23:31:42 +02:00
erihel
9946459c0c
* changed 0, NULL to nullptr
...
* changed profile.cpp to use SimpleIni to load config files
* added new CProfile singleton class for loading config
* added SimpleIni to lib/ dir
* added config loading tests
2012-08-09 23:04:29 +02:00