summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev-ui' into devMichał Konopacki2012-09-1545-1907/+1752
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/CMakeLists.txt src/common/misc.cpp src/common/misc.h src/object/robotmain.cpp src/object/robotmain.h src/script/cbottoken.cpp src/script/cbottoken.h src/ui/button.cpp src/ui/button.h src/ui/check.cpp src/ui/check.h src/ui/color.cpp src/ui/color.h src/ui/compass.cpp src/ui/compass.h src/ui/control.cpp src/ui/control.h src/ui/displayinfo.cpp src/ui/displayinfo.h src/ui/displaytext.cpp src/ui/displaytext.h src/ui/edit.cpp src/ui/edit.h src/ui/gauge.cpp src/ui/gauge.h src/ui/interface.cpp src/ui/interface.h src/ui/key.cpp src/ui/map.h src/ui/shortcut.h src/ui/slider.h src/ui/target.cpp src/ui/target.h src/ui/window.cpp src/ui/window.h
| * Merge pull request #45 from Erihel/dev-uiPiotr Dziwiński2012-09-1372-9214/+12518
| |\ | | | | | | Changes from dev-ui in erihel's fork
| | * * latest changeserihel2012-09-1124-491/+453
| | | | | | | | | | | | | | | * all files except studio, map and maindialog should compile * did some code cleanup
| | * Merge branch 'dev' of https://github.com/adiblol/colobot into dev-uierihel2012-09-0314-4534/+8206
| | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: src/common/restext.cpp src/common/restext.h
| | * | latest changes; few more classes should compile nowerihel2012-08-3120-541/+446
| | | |
| | * | * added nullptrerihel2012-08-216-513/+503
| | | | | | | | | | | | | | | | | | | | * changed Ret to Get function names * minor changes
| | * | merged changes from michkonerihel2012-08-2134-1358/+1542
| | |\ \
| | | * | added ui/shortcut.*Michał Konopacki2012-08-212-31/+40
| | | | |
| | | * | Typo fixMichał Konopacki2012-08-201-1/+1
| | | | |
| | | * | added ui/scroll.*Michał Konopacki2012-08-202-34/+46
| | | | |
| | | * | added ui/slider.*Michał Konopacki2012-08-202-9/+14
| | | | |
| | | * | added ui/target.*Michał Konopacki2012-08-202-32/+38
| | | | |
| | | * | 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
| | * | Merge remote-tracking branch 'upstream/dev-ui' into dev-uiMichał Konopacki2012-08-137-47/+59
| | |\ \ | | |/ / | |/| |
| | * | Merge remote-tracking branch 'upstream/dev-graphics' into dev-uiMichał Konopacki2012-08-1318-469/+593
| | |\ \
* | | | | 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
| | | | |
* | | | | Merge branch 'dev' into dev-graphicsPiotr Dziwinski2012-09-0914-4528/+8201
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Whitespace fixPiotr Dziwinski2012-08-271-22/+22
| | | | |
| * | | | Merge pull request #42 from amonakov/devPiotr Dziwiński2012-08-2514-4528/+8201
| |\ \ \ \ | | |/ / / | |/| | | Slim down restext.cpp, make it gettext-ready
| | * | | 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
* | | | Fix in texture handling in Blender scriptPiotr Dziwinski2012-09-081-18/+36
| | | |
* | | | CModelFile fixes; test frameworkPiotr Dziwinski2012-09-0844-183/+31125
| | | | | | | | | | | | | | | | | | | | | | | | - fixes in CModelFile IO - added Google Test framework for automatic testing - rewrote modelfile_test in the new framework
* | | | Import/export script for BlenderPiotr Dziwinski2012-09-052-132/+524
| | | | | | | | | | | | | | | | | | | | - rewrote old export script - added import and texture support
* | | | Blender script to export modelsPiotr Dziwinski2012-09-031-0/+132
| | | |
* | | | 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
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-24 16:40:27 +0000