1997682808
added ui/shortcut.*
2012-08-21 15:23:59 +02:00
60950ce66b
Typo fix
2012-08-20 21:45:17 +02:00
af45bc399f
added ui/scroll.*
2012-08-20 21:42:07 +02:00
59ec83c409
added ui/slider.*
2012-08-20 21:35:11 +02:00
02dc368a38
added ui/target.*
2012-08-20 21:31:16 +02:00
bd9c581ced
added ui/window.* -- not fully ported
2012-08-20 21:22:24 +02:00
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
8666d35f7c
UI porting
2012-08-20 14:05:36 +02:00
574c07e388
Further improvements in UI porting
2012-08-18 22:56:42 +02:00
8d4a3ed579
* wrong enum used for text alignment
...
* wrong event function used
2012-08-18 21:04:51 +02:00
48ad79a03c
* minor changes to control.cpp to compile it without errors
2012-08-18 11:30:29 +02:00
c02ac93379
* list.cpp compiles
2012-08-17 23:56:29 +02:00
a00032d075
* ui/label.cpp compiles
2012-08-17 23:05:59 +02:00
ea6269c411
* ui/key.cpp compiles
...
* csoundinterface to ccontrol
2012-08-17 23:03:52 +02:00
6ff8706d04
* last commit should not include sound changes
2012-08-17 22:49:16 +02:00
c2464d4c71
* changes to ui classes
2012-08-17 22:43:07 +02:00
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
e942400c8b
Merge remote-tracking branch 'upstream/dev-ui' into dev-ui
2012-08-13 23:46:47 +02:00
8b2bca72dd
Merge branch 'dev-graphics' into dev
...
Documentation, rendering functions & fixes
2012-08-13 23:13:10 +02:00
5b45911856
Improved error messages
...
Added some logging and improved error messages displayed to user
2012-08-13 23:09:30 +02:00
9ee1d2e172
Merge remote-tracking branch 'upstream/dev-graphics' into dev-ui
2012-08-13 21:23:20 +02:00
a2dd39960b
Fix
2012-08-13 18:17:54 +02:00
b68dfcd155
Test fix
2012-08-13 18:03:12 +02:00
dc3cadd309
Merge pull request #37 from konopackim/dev
...
Fixes and console interpreter
2012-08-13 08:46:03 -07:00
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
712154bc4f
Rendering functions, documentation
...
- rewrote the render functions for CEngine, CCloud and CWater
- added documentation
2012-08-13 00:14:42 +02:00
146ad47e4a
Merge branch 'dev-graphics' into dev
...
CEngine object handling
2012-08-12 19:30:31 +02:00
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
6ab1746ec9
Compile fix
2012-08-12 19:22:43 +02:00
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
62b545128f
* Final changes to plugin interface
...
* Added doxygen comments to plugin manager and plugin loader
2012-08-12 18:37:11 +02:00
f01296690e
Merge branch 'dev-opengl' into dev
2012-08-12 17:09:11 +02:00
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
b4b74c30e9
Fixes & testing in CEngine
...
- fixed bugs in settings modes, etc.
- some additions and minor refactoring
2012-08-12 10:45:04 +02:00
a9186d1960
Changed GivAttrName() to GetAttrName()
2012-08-11 20:59:35 +02:00
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
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
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
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
c3ab23ac9d
Graphics stubs
...
- added stubs for functions in CLightning, CParticle and CPyro
- cleaned object.h and physics.h headers
- created temporary stubs to compile CCamera
- other necessary changes to compile successfully
2012-08-09 22:50:04 +02:00
acff306cc1
CPlanet implementation
...
Added rewritten CPlanet implementation
2012-08-09 22:49:13 +02:00
7b03a6a2ac
CBot console interpreter
...
Based on program found in sources
2012-08-09 22:13:10 +02:00
ef7e297efe
CBotString.cpp Bug resolve
2012-08-09 22:05:42 +02:00
f1d1cdceee
Changes after merge
2012-08-09 21:21:14 +02:00
611680a72e
Merge branch 'dev' of https://github.com/adiblol/colobot into dev
...
Conflicts:
src/sound/sound.h
2012-08-09 20:20:47 +02:00
c1936514c0
CWater and CCloud basic implementation
...
Added rewritten implementation for CWater and CCloud
Won't link yet because of missing functions
2012-08-08 23:51:19 +02:00
bc24b9f9e5
Whitespace fix
2012-08-08 22:35:17 +02:00
beca66071c
Merge pull request #35 from konopackim/dev
...
Comment translation and cleanups
2012-08-08 13:31:33 -07:00
878eec8eea
CTerrain implementation
...
Added rewritten CTerrain implementation
Compiles OK, but functions are missing from other classes
Also needs testing
2012-08-08 21:32:44 +02:00
a760e8a749
Cleanups
2012-08-08 02:23:38 +02:00
Michał Konopacki