summaryrefslogtreecommitdiffstats
path: root/src/app
Commit message (Collapse)AuthorAgeFilesLines
...
| * Merge branch 'dev' into dev-use-installed-i18nDidier Raboud2012-12-161-1/+2
| |\ | | | | | | | | | | | | Conflicts: src/common/config.h.cmake
| | * Set a default datadir, in sync with the data installation path.Didier Raboud2012-12-161-1/+2
| | |
| * | Use default installation paths for i18n.Didier Raboud2012-12-161-3/+1
| |/ | | | | | | | | | | This finishes the work started in 19b75e174338f8e7be7486a7445d1e90e9795077 by actually using the translation where they are installed.
| * Merge branch 'master' into devPiotr Dziwinski2012-12-151-3/+9
| |\
| | * Inherit translation setting from environment.Didier Raboud2012-12-141-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | This ensures that users with a correctly-defined locale don't need to explicitely set the locale. - By dropping the setlocale content, it fixes the loading of translations. - Add a Debug log message to check what is put in the environment.
* | | Engine optimization - rewritten model managementPiotr Dziwinski2012-12-262-10/+19
| | | | | | | | | | | | | | | | | | | | | | | | - new class CModelManager - rewritten engine object structure in CEngine - created shared model data instead of separate objects per each model instance - minor refactoring
* | | Static objects using OpenGL VBOs and display listsPiotr Dziwinski2012-12-142-0/+11
| | |
* | | Performance countersPiotr Dziwinski2012-10-252-0/+117
| | |
* | | Main loop enhancementPiotr Dziwinski2012-10-252-15/+16
|/ / | | | | | | Frame updates were posted one frame behind in event queue
* | Restext rewrite to runtime initialized arraysPiotr Dziwinski2012-10-171-0/+2
| |
* | Doxygen/comment fixes and some #include refactoringPiotr Dziwinski2012-10-172-4/+4
| |
* | Changing and saving input bindingsPiotr Dziwinski2012-10-071-1/+1
|/
* Merge branch 'dev' into dev-graphicsPiotr Dziwinski2012-10-021-5/+5
|\
| * Further work on saving profile and directory listing.Zaba9992012-10-021-5/+5
| |
* | Fixed bugs in texture coloringPiotr Dziwinski2012-09-301-2/+2
| |
* | Font coloring; fix for resize hackPiotr Dziwinski2012-09-301-6/+7
| | | | | | | | | | | | - added font coloring and changed default color to black - fixed resize hack incorrectly changing video config, but font resizing will not work for now
* | Dirty hack to allow window resizing or even full screen.adiblol2012-09-301-0/+7
|/ | | | | Currently makes text buggy! (full screen must be initiated by window manager, for example Alt+F11 in Fluxbox)
* Merge branch 'dev' into dev-graphicsPiotr Dziwinski2012-09-291-10/+10
|\
| * Work in progress on opening files, and listing dirsZaba9992012-09-261-10/+10
| | | | | | | | | | Fixed includes profile changed from SimpleIni to boost::ptree -> not finished yet
* | Some fixes and optimizationsPiotr Dziwinski2012-09-291-5/+7
| | | | | | | | | | | | | | | | - 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
* | Updated docs and some Doxygen fixesPiotr Dziwinski2012-09-272-2/+2
|/
* Removed metafile editor and loaderPiotr Dziwinski2012-09-221-1/+0
|
* Various fixesPiotr Dziwinski2012-09-221-0/+34
| | | | | | | | - 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-222-5/+49
| | | | | - changed access to paths in data directory in CApplication - models now load from data directory
* Event fixes & refactoringPiotr Dziwinski2012-09-222-94/+70
| | | | | | - added new state tracking to Event - removed old fields from Event - fixed some issues with Events and fps counter
* * Fixed audio problemserihel2012-09-222-4/+36
| | | | | | * Added colobot.ini to CApp in Create function * Fixes to plugin manager * Fixed CProfile segfault
* Mouse pos setting, low cpu mode, stats displayPiotr Dziwinski2012-09-202-38/+78
|
* Mouse wheel events, motion vectorsPiotr Dziwinski2012-09-192-22/+35
| | | | | | - added mouse wheel events - added motion vectors to CRobotMain - other minor changes in event.h
* Input bindings rewritePiotr Dziwinski2012-09-192-172/+115
| | | | | | - 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-192-1/+7
|
* Merge branch 'dev' of https://github.com/adiblol/colobot into devZaba9992012-09-183-10/+28
|\ | | | | | | | | Conflicts: src/ui/slider.cpp
| * Change of background image handlingPiotr Dziwinski2012-09-173-10/+28
| | | | | | | | | | | | - removed old 4 quarter backgrounds - fixes in texture loading - other minor fixes
* | warnings fight in progress.Zaba9992012-09-182-8/+8
|/
* Some memory leaks fixedPiotr Dziwinski2012-09-161-0/+1
|
* Interface worksPiotr Dziwinski2012-09-161-2/+4
| | | | | | - removed mock of CInterface and fixed event passing to CRobotMain - changed texture names from tga and bmp to png - UI now works but interaction is still broken
* Successful compilation & runningPiotr Dziwinski2012-09-152-12/+13
| | | | | | | - temporarily mocked CSoundInterface and CPluginInterface - added CRobotMain to application - successfully compiles & runs, but doesn't display correctly at the moment
* Locale settings and translation fixesPiotr Dziwinski2012-09-131-10/+92
| | | | | | - added locale setting - removed unused translations - updated .po files
* Simulation timestamps and input bindingsPiotr Dziwinski2012-09-122-41/+452
| | | | | | - added new simulation time calculations in CApplication - added simulation frame updates - rewritten old input binding code and input state tracking
* Refactoring in src/commonPiotr Dziwinski2012-09-092-36/+56
| | | | | - refactored CInstanceManager and some headers - removed old headers
* New model file formatPiotr Dziwinski2012-08-311-2/+27
| | | | | | | - added new binary and text formats for models - fixes and improvements in CModelFile - tool for converting model files - minor additions and fixes
* Improved error messagesPiotr Dziwinski2012-08-133-27/+49
| | | | Added some logging and improved error messages displayed to user
* Fixes & testing in CEnginePiotr Dziwinski2012-08-122-5/+17
| | | | | - fixed bugs in settings modes, etc. - some additions and minor refactoring
* Documentation updatePiotr Dziwinski2012-08-117-17/+36
| | | | | | - updated Doxyfile - added/changed file, dir and namespace descriptions - fixed some errors in doxygen tags
* Render mode setting, refactoringPiotr Dziwinski2012-08-112-4/+4
| | | | | | - finished SetState in CEngine - refactored Size and IntSize back to Point and IntPoint - other minor changes in CEngine
* Partial CEngine implementationPiotr Dziwinski2012-08-102-18/+5
| | | | | - added rewritten implementation for basic modesetting in CEngine - started rewriting proper rendering and object handling in CEngine
* Basic font renderingPiotr Dziwinski2012-08-032-42/+18
| | | | | - added basic font rendering - minor refactoring & fixes
* Switched to new style castsPiotr Dziwinski2012-07-301-8/+8
| | | | | | - rewrote old C-style casts to new ..._cast<> - corrected some dangerous casts - added -Wold-style-cast to compile flags
* Video mode changingPiotr Dziwinski2012-07-292-191/+340
| | | | | | - added video mode querying & changing - added joystick querying & changing - cleaned up CApplication interface
* Updated Doxygen main pagePiotr Dziwinski2012-07-271-8/+14
|
* Change of paths in src/graphicsPiotr Dziwinski2012-07-261-2/+2
| | | | | - moved abstract core to src/graphics/core - moved proper graphics engine to src/graphics/engine