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
0919796df7
Transation of comments complete
2012-08-08 02:01:06 +02:00
0844a0f7bd
Further CBot translations
2012-08-07 15:46:04 +02:00
a1c83c7d0a
CBot library comments further translations
2012-08-07 12:46:19 +02:00
f7e78b21e9
Font rendering
...
- implemented rest of CText interface excluding some minor features
2012-08-06 20:20:50 +02:00
61bfb22f27
Basic font rendering
...
- added basic font rendering
- minor refactoring & fixes
2012-08-03 23:23:13 +02:00
bf3f9e1860
Commentary translation
2012-08-03 00:50:25 +02:00
d00a283519
Comments translation
2012-08-02 19:41:13 +02:00
5e637ca028
Switched to new style casts
...
- rewrote old C-style casts to new ..._cast<>
- corrected some dangerous casts
- added -Wold-style-cast to compile flags
2012-07-30 22:59:18 +02:00
d8a0c8d32e
Lines and line strip primitives
...
Will probably be useful
2012-07-30 22:32:28 +02:00
220ff9fe52
CCamera rewrite
...
Rewritten old code; doesn't compile yet because changes in other
modules are needed.
2012-07-29 18:42:56 +02:00
7c5a3514dd
Video mode changing
...
- added video mode querying & changing
- added joystick querying & changing
- cleaned up CApplication interface
2012-07-29 15:09:53 +02:00
72c0188ec3
GLEW
...
Added GLEW for loading OpenGL extensions
2012-07-28 23:36:12 +02:00
da63248bb9
Updated readme files; added license
...
- updated info in README and HOWTO files
- added file with full license
2012-07-27 20:21:02 +02:00
db0b880674
Updated Doxygen main page
2012-07-27 18:50:29 +02:00
851300d61d
Whitespace fix
2012-07-27 18:44:43 +02:00
ab8e55a651
Merge branch 'dev' into dev-opengl
...
Pulled changes & resolved conflicts
2012-07-27 18:09:50 +02:00
4ddcd9f810
Change of paths in src/graphics
...
- moved abstract core to src/graphics/core
- moved proper graphics engine to src/graphics/engine
2012-07-26 22:26:19 +02:00
045f17a274
Dynamic light manager
...
- rewrote old CLight as CLightManager
2012-07-26 21:35:04 +02:00
d1fe0d2dcc
Lighting
...
- fixed problems with lighting
- added light_test
2012-07-26 19:05:09 +02:00
6b846aa629
Compile fixes
...
Fixed some compiling issues
2012-07-26 00:18:02 +02:00
92bcec10c5
Merge pull request #33 from Zaba999/dev
...
Changes in CBot
2012-07-25 15:09:09 -07:00
bc1c9b5284
Fixed bug in texturing
2012-07-25 20:27:13 +02:00
9cd28e26e9
Fix in CMakeLists.txt
2012-07-25 00:28:56 +02:00
42963b341f
Refactoring of texture code
...
- refactored texture structs & functions
- added note about OpenGL extensions
- removed device.cpp as unnecessary
- minor changes in CEngine
2012-07-25 00:27:01 +02:00
9d59204531
Cursor drawing
...
- fixed cursor drawing in CEngine
- changed event loop to generate more events
2012-07-23 21:41:27 +02:00
8797569d33
Texture & mouse functions; refactoring & fixes
...
- cleaned up and added documentation to engine.h
- refactored CEngine interface and associated structs
- added mouse handling functions in CApplication & CEngine
- fixed bugs in projection matrix setting
- changed texture loading & handling
- added const-values in CDevice & CGLDevice
- changed event management in CApplication
- other minor changes & bugfixes
2012-07-22 22:05:12 +02:00
Piotr Dziwinski