summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* MXE support and CMake files refactoringPiotr Dziwinski2012-09-293-48/+31
| | | | | | - added support for cross-compiling with MXE (http://mxe.cc/) - refactored CMake files, adding some options and moving definitions to more suitable places
* Merge branch 'dev' into dev-graphicsPiotr Dziwinski2012-09-2922-229/+351
|\
| * Small fix in profile + profile_test rewritten to gtest.Zaba9992012-09-285-39/+49
| |
| * Merge branch 'master' of https://github.com/colobot/colobot into devunknown2012-09-2817-189/+301
| |\
| | * Profile rewritten to boost. Read/write to ini should work.Zaba9992012-09-273-23/+26
| | | | | | | | | | | | Load/Save should work.
| | * Merge branch 'master' of git://github.com/colobot/colobotZaba9992012-09-266-67/+65
| | |\
| | * | Work in progress on opening files, and listing dirsZaba9992012-09-2617-187/+296
| | | | | | | | | | | | | | | | | | | | Fixed includes profile changed from SimpleIni to boost::ptree -> not finished yet
| * | | * Fixed Issue #54: flags don't show in 3D viewerihel2012-09-281-1/+1
| | | |
* | | | Some fixes and optimizationsPiotr Dziwinski2012-09-2910-138/+211
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fixed 2nd texture setting - added padding to some structs for faster access - changed rendering primitives to glDrawArrays() - optimized texture modesetting calls - fixed some valgrind errors
* | | | Merge remote-tracking branch 'origin/dev' into dev-graphicsadiblol2012-09-274-69/+96
|\| | |
| * | | * Ingame help should now display correctlyerihel2012-09-274-69/+96
| | | |
* | | | Completely fixed light issuesPiotr Dziwinski2012-09-274-32/+52
| | | | | | | | | | | | | | | | Directional and spot lights are now set properly
* | | | Updated docs and some Doxygen fixesPiotr Dziwinski2012-09-2718-50/+55
| | | |
* | | | Fixed blinking light problemPiotr Dziwinski2012-09-273-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | - temporarily commented out misbehaving code in CPhysics - some fixes in CLightManager - minor refactoring in CRobotMain
* | | | Lighting fix (experimental)Piotr Dziwinski2012-09-269-90/+156
| | | | | | | | | | | | | | | | | | | | - changed fixed light allocation to prioritized per-use basis - minor refactoring in CPlanet and CWater
* | | | Refactored resource and relief loadingPiotr Dziwinski2012-09-264-51/+106
|/ / / | | | | | | | | | | | | - now loading can be from any image format - added IntColor struct for precise pixel operations
* | | Fixed CEdit text input and drawing issuesPiotr Dziwinski2012-09-261-12/+12
| | |
* | | Merge master & devPiotr Dziwinski2012-09-266-70/+65
|\ \ \ | | |/ | |/|
| * | Fog color fix; refactoringPiotr Dziwinski2012-09-266-70/+65
| | | | | | | | | | | | | | | | | | - fixed fog color setting - removed unused glSecondaryColor and altered struct VertexCol - minor refactoring in CText
| * | made graphics/engine/text cleaner, I hopeMichał Zieliński2012-09-242-32/+35
| |/
* | made graphics/engine/text cleaner, I hopeMichał Zieliński2012-09-252-32/+35
| |
* | * Building should work now without 'ground not flat' messageerihel2012-09-252-7/+7
|/
* Removed metafile editor and loaderPiotr Dziwinski2012-09-224-490/+0
|
* Various fixesPiotr Dziwinski2012-09-228-51/+132
| | | | | | | | - disabled UserDir() in path lookup - fixed crashes on loading missions in CObject - fixed texture bug in CTerrain - changed mouse move event handling to avoid flooding event queue - enabled all missions for testing
* Data dir pathsPiotr Dziwinski2012-09-2222-506/+601
| | | | | - changed access to paths in data directory in CApplication - models now load from data directory
* * Removed some warningserihel2012-09-222-2/+2
|
* Event fixes & refactoringPiotr Dziwinski2012-09-2228-293/+272
| | | | | | - added new state tracking to Event - removed old fields from Event - fixed some issues with Events and fps counter
* * Fixed audio problemserihel2012-09-229-70/+106
| | | | | | * Added colobot.ini to CApp in Create function * Fixes to plugin manager * Fixed CProfile segfault
* Alpha operation fixPiotr Dziwinski2012-09-211-1/+1
|
* robotmain, restext and engine fixesPiotr Dziwinski2012-09-217-355/+118
|
* changed paths for models and levels. Now it's possible to load level. Merged ↵Zaba9992012-09-2054-3394/+3580
|\ | | | | | | with latest trunk
| * Checkbox fix; main dialog buttonsPiotr Dziwinski2012-09-202-89/+10
| |
| * Whitespace fixPiotr Dziwinski2012-09-206-938/+938
| |
| * Mouse pos setting, low cpu mode, stats displayPiotr Dziwinski2012-09-206-171/+252
| |
| * Namespace and styling fixPiotr Dziwinski2012-09-1943-2223/+2403
| |
| * Forgotten fix in dev-graphicsPiotr Dziwinski2012-09-19229-16024/+15065
| |\
| * | Fixed old model format bugsPiotr Dziwinski2012-09-091-1/+5
| | |
* | | changed paths for models and levels. Now it's possible to load level.Zaba9992012-09-2014-453/+467
| |/ |/|
* | Changes in Ui, solves part of #47Michał Konopacki2012-09-1917-77/+77
| |
* | Mouse wheel fixesPiotr Dziwinski2012-09-195-28/+28
| |
* | Mouse wheel events, motion vectorsPiotr Dziwinski2012-09-1911-105/+293
| | | | | | | | | | | | - added mouse wheel events - added motion vectors to CRobotMain - other minor changes in event.h
* | Input bindings rewritePiotr Dziwinski2012-09-1915-348/+397
| | | | | | | | | | | | - moved input bindings to CRobotMain - added virtual keymod and joystick button key presses - fixed putenv error; other minor fixes
* | Fixed includes in ui.Zaba9992012-09-1928-149/+149
| |
* | Merge branch 'dev' of https://github.com/adiblol/colobot into devZaba9992012-09-1815-200/+141
|\ \ | | | | | | | | | | | | Conflicts: src/ui/slider.cpp
| * | Fixed invalid text alignmentPiotr Dziwinski2012-09-187-19/+19
| | |
| * | Change of background image handlingPiotr Dziwinski2012-09-178-182/+123
| | | | | | | | | | | | | | | | | | - removed old 4 quarter backgrounds - fixes in texture loading - other minor fixes
* | | Warnings cleaned, left only those connected to commented out code.Zaba9992012-09-1819-313/+291
| | |
* | | warnings fight in progress.Zaba9992012-09-1826-184/+167
|/ /
* | changes needeto to cimpile on windows.Zaba9992012-09-1710-38/+41
| |
* | Fix max lights errorPiotr Dziwinski2012-09-161-2/+4
| |