summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | added ui/window.* -- not fully portedMichał Konopacki2012-08-202-133/+155
| | | | | |
| | | * | | Merge remote-tracking branch 'erihel/dev-ui' into dev-uiMichał Konopacki2012-08-2019-1255/+830
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | | | UI portingMichał Konopacki2012-08-204-335/+383
| | | | | | |
| | | * | | | Further improvements in UI portingMichał Konopacki2012-08-1822-803/+891
| | | | | | |
| | * | | | | latest changeserihel2012-08-215-399/+378
| | | |/ / / | | |/| | |
| | * | | | * wrong enum used for text alignmenterihel2012-08-187-47/+25
| | | | | | | | | | | | | | | | | | | | | | | | * wrong event function used
| | * | | | * minor changes to control.cpp to compile it without errorserihel2012-08-183-20/+21
| | | | | |
| | * | | | * list.cpp compileserihel2012-08-176-380/+332
| | | | | |
| | * | | | * ui/label.cpp compileserihel2012-08-171-2/+2
| | | | | |
| | * | | | * ui/key.cpp compileserihel2012-08-177-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | * csoundinterface to ccontrol
| | * | | | * last commit should not include sound changeserihel2012-08-172-6/+6
| | | | | |
| | * | | | * changes to ui classeserihel2012-08-1727-907/+547
| | |/ / /
| | * | | First approach to port 2D UI InterfaceMichał Konopacki2012-08-1519-1825/+1856
| | | | | | | | | | | | | | | | | | | | | | | | | - 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
| * | | | commented new part in cmakelist and reverted stubs in camera.cpp. Will be ↵Zaba9992012-09-102-5/+67
| | | | | | | | | | | | | | | | | | | | commited later after implementation is finished in dev-object branch.
| * | | | Merge with changes from Zaba999 fork.Zaba9992012-09-1072-5531/+8865
| | | | |
| * | | | Commenting out src/object/auto temporarilyPiotr Dziwinski2012-09-091-26/+26
| | | | |
| * | | | [src/object/auto] Folder rewrittenMichał Konopacki2012-09-0953-1167/+1222
| | |_|/ | |/| |
* / | | Fixed old model format bugsPiotr Dziwinski2012-09-091-1/+5
|/ / /
* | | Merge branch 'dev' into dev-graphicsPiotr Dziwinski2012-09-0914-4528/+8201
|\ \ \ | | |/ | |/|
| * | Whitespace fixPiotr Dziwinski2012-08-271-22/+22
| | |
| * | Add translation filesAlexander Monakov2012-08-253-0/+6291
| | |
| * | Move strings out of restext. Add i18n via gettextAlexander Monakov2012-08-254-3525/+842
| | |
| * | Move ResTextType enum to a separate fileAlexander Monakov2012-08-252-109/+120
| | |
| * | Move ObjectType enum to a separate fileAlexander Monakov2012-08-252-245/+263
| | |
| * | Move Error enum to a separate fileAlexander Monakov2012-08-252-133/+151
| | |
| * | Move EventType enum to a separate fileAlexander Monakov2012-08-252-516/+534
| |/
* | Texture format detection; minor fixesPiotr Dziwinski2012-09-095-25/+77
| | | | | | | | | | | | - detection of texture format - fixed depth mask bug - minor refactoring
* | CTerrain refactoring & fixesPiotr Dziwinski2012-09-0810-663/+715
| | | | | | | | | | - refactored CTerrain code - fixed some minor bugs
* | CModelFile fixes; test frameworkPiotr Dziwinski2012-09-084-182/+463
| | | | | | | | | | | | - fixes in CModelFile IO - added Google Test framework for automatic testing - rewrote modelfile_test in the new framework
* | FixPiotr Dziwinski2012-09-031-2/+6
| |
* | FixPiotr Dziwinski2012-09-031-4/+3
| |
* | FixPiotr Dziwinski2012-08-312-12/+1
| |
* | New model file formatPiotr Dziwinski2012-08-3111-350/+1179
| | | | | | | | | | | | | | - added new binary and text formats for models - fixes and improvements in CModelFile - tool for converting model files - minor additions and fixes
* | Fixes in terrain renderingPiotr Dziwinski2012-08-273-14/+31
|/
* Merge branch 'dev-graphics' into devPiotr Dziwinski2012-08-1324-516/+652
|\ | | | | | | Documentation, rendering functions & fixes
| * Improved error messagesPiotr Dziwinski2012-08-137-47/+59
| | | | | | | | Added some logging and improved error messages displayed to user
| * FixPiotr Dziwinski2012-08-131-1/+1
| |
| * Test fixPiotr Dziwinski2012-08-135-16/+17
| |
| * Rendering functions, documentationPiotr Dziwinski2012-08-1312-452/+575
| | | | | | | | | | - rewrote the render functions for CEngine, CCloud and CWater - added documentation
* | Merge pull request #37 from konopackim/devPiotr Dziwiński2012-08-13110-4453/+2232
|\ \ | |/ |/| Fixes and console interpreter
| * Reduced amount of warnings in CBot libraryMichał Konopacki2012-08-1312-152/+157
| | | | | | | | | | Changed most of C-style casting to C++ casting Commented unused variables
| * Changed GivAttrName() to GetAttrName()Michał Konopacki2012-08-1125-1397/+1397
| |
| * CBot console interpreterMichał Konopacki2012-08-0989-2958/+732
| | | | | | | | Based on program found in sources
| * CBotString.cpp Bug resolveMichał Konopacki2012-08-091-1/+1
| |
* | Merge branch 'dev-graphics' into devPiotr Dziwinski2012-08-1218-586/+1745
|\ \ | | | | | | | | | CEngine object handling
| * | Object handling in CEnginePiotr Dziwinski2012-08-1218-586/+1745
| | | | | | | | | | | | | | | | | | - finished rewriting CEngine object, shadow, etc. handling - refactored texture code - added new log levels
* | | * Final changes to plugin interfaceerihel2012-08-129-23/+153
| | | | | | | | | | | | * Added doxygen comments to plugin manager and plugin loader
* | | Merge branch 'dev-opengl' into deverihel2012-08-1265-1400/+8265
|\| |
| * | Fixes & testing in CEnginePiotr Dziwinski2012-08-1210-127/+332
| | | | | | | | | | | | | | | - fixed bugs in settings modes, etc. - some additions and minor refactoring
| * | Documentation updatePiotr Dziwinski2012-08-1146-142/+234
| | | | | | | | | | | | | | | | | | - updated Doxyfile - added/changed file, dir and namespace descriptions - fixed some errors in doxygen tags