summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * * 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
| |
* | UI portingMichał Konopacki2012-08-204-335/+383
| |
* | Further improvements in UI portingMichał Konopacki2012-08-1822-803/+891
|/
* 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 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
* | | Merge remote-tracking branch 'upstream/dev-graphics' into dev-uiMichał Konopacki2012-08-1318-469/+593
|\ \ \ | |/ / |/| / | |/
| * 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
* | | Compile fixPiotr Dziwinski2012-08-121-1/+1
| | |
* | | Merge pull request #36 from Erihel/devPiotr Dziwiński2012-08-12115-2342/+18090
|\ \ \ | |_|/ |/| | Merge of new features: plugins and INI profile, changes from dev-graphics
| * | * 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-1267-2233/+9103
| |\|
| | * Fixes & testing in CEnginePiotr Dziwinski2012-08-1210-127/+332
| | | | | | | | | | | | | | | - fixed bugs in settings modes, etc. - some additions and minor refactoring
| | * Documentation updatePiotr Dziwinski2012-08-1147-975/+1071
| | | | | | | | | | | | | | | | | | - updated Doxyfile - added/changed file, dir and namespace descriptions - fixed some errors in doxygen tags
| | * Render mode setting, refactoringPiotr Dziwinski2012-08-1111-430/+291
| | | | | | | | | | | | | | | | | | - finished SetState in CEngine - refactored Size and IntSize back to Point and IntPoint - other minor changes in CEngine
| | * Partial CEngine implementationPiotr Dziwinski2012-08-106-425/+2326
| | | | | | | | | | | | | | | - added rewritten implementation for basic modesetting in CEngine - started rewriting proper rendering and object handling in CEngine
| | * Graphics stubsPiotr Dziwinski2012-08-0916-275/+989
| | | | | | | | | | | | | | | | | | | | | - 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
| | * CPlanet implementationPiotr Dziwinski2012-08-092-27/+209
| | | | | | | | | | | | Added rewritten CPlanet implementation
| | * CWater and CCloud basic implementationPiotr Dziwinski2012-08-084-75/+1043
| | | | | | | | | | | | | | | Added rewritten implementation for CWater and CCloud Won't link yet because of missing functions
| | * CTerrain implementationPiotr Dziwinski2012-08-087-104/+1988
| | | | | | | | | | | | | | | | | | Added rewritten CTerrain implementation Compiles OK, but functions are missing from other classes Also needs testing
| | * Font renderingPiotr Dziwinski2012-08-067-149/+501
| | | | | | | | | | | | - implemented rest of CText interface excluding some minor features
| | * Basic font renderingPiotr Dziwinski2012-08-0316-189/+896
| | | | | | | | | | | | | | | - added basic font rendering - minor refactoring & fixes
| * | * New CPluginManager class for managing plugins based on colobot.inierihel2012-08-1227-37/+358
| | | | | | | | | | | | | | | * Moved sound plugin into sound dir * Minor changes in logger and profile
| * | * changed 0, NULL to nullptrerihel2012-08-0930-78/+7051
| | | | | | | | | | | | | | | | | | | | | * 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
| * | Changes after mergeerihel2012-08-095-16/+16
| | |
| * | Merge branch 'dev' of https://github.com/adiblol/colobot into deverihel2012-08-09236-23184/+32370
| |\ \ | |/ / |/| | | | | | | | Conflicts: src/sound/sound.h
* | | Whitespace fixPiotr Dziwinski2012-08-0814-6607/+6607
| | |
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-10 05:57:25 +0000