Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | * Removed alut | erihel | 2013-01-14 | 1 | -2/+9 |
| | | | | | * Using libsndfile to load sounds and music * Added support for playing music files | ||||
* | Merge dev and dev-graphics | Piotr Dziwinski | 2013-01-07 | 1 | -2/+11 |
|\ | |||||
| * | Small fix in detecting language. Fixes needed to compile code using clang | Marcin Zawadzki | 2013-01-05 | 1 | -2/+11 |
| | | |||||
* | | GLEW fix for some graphics drivers | Piotr Dziwinski | 2013-01-06 | 1 | -2/+0 |
| | | |||||
* | | Corrected OpenGL extension detection | Piotr Dziwinski | 2013-01-05 | 1 | -1/+0 |
| | | | | | | | | | | | | - corrected multitexture and VBO detection - GLEW is now a required library - minor CMakeLists refactoring | ||||
* | | Correct font scaling with resolution | Piotr Dziwinski | 2013-01-04 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'dev' into dev-graphics | Piotr Dziwinski | 2013-01-04 | 2 | -79/+144 |
|\| | |||||
| * | Merge pull request #108 from OdyX/dev-central-cmake-version | Piotr DziwiĆski | 2012-12-29 | 1 | -1/+1 |
| |\ | | | | | | | Create a central version | ||||
| | * | Create a central version | Didier Raboud | 2012-12-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it 0.1.0~pre-alpha for now. - Add it to runtime program - Add it to -help option - Add it to manpage - Update translations | ||||
| * | | Implement language Char for level files | Didier Raboud | 2012-12-28 | 2 | -1/+45 |
| | | | | | | | | | | | | This currently lacks fallback to an existing entry for non-translated entries | ||||
| * | | Move language initialisation in SetLanguage | Didier Raboud | 2012-12-28 | 1 | -42/+48 |
| | | | |||||
| * | | Fixed path for loading sounds | Piotr Dziwinski | 2012-12-28 | 2 | -18/+23 |
| |/ | |||||
| * | Fix locale's loading | Didier Raboud | 2012-12-27 | 1 | -5/+8 |
| | | | | | | | | | | - Always inherit LC_ALL from environment; - Enforce environment only if the runtime options require it; | ||||
| * | * Changed Ret to Get methods in sound module | erihel | 2012-12-25 | 1 | -6/+15 |
| | | | | | | | | | | * Added video settings to profile * Resolution change is now posibble but restart is required | ||||
| * | * Changed log level in sound module | erihel | 2012-12-25 | 1 | -1/+1 |
| | | | | | | | | | | * Fixed warnings in sound module * Fixed problem with map loading when locale with different number separator | ||||
| * | latest changes | erihel | 2012-12-21 | 1 | -6/+11 |
| | | |||||
| * | sound fix | erihel | 2012-12-20 | 2 | -9/+2 |
| | | |||||
| * | Installation path fixes and CMakeLists refactoring | Piotr Dziwinski | 2012-12-20 | 1 | -10/+6 |
| | | | | | | | | make && make install should now give a working installation. | ||||
| * | Merge branch 'dev' into dev-use-installed-i18n | Didier Raboud | 2012-12-16 | 1 | -1/+2 |
| |\ | | | | | | | | | | | | | Conflicts: src/common/config.h.cmake | ||||
| | * | Set a default datadir, in sync with the data installation path. | Didier Raboud | 2012-12-16 | 1 | -1/+2 |
| | | | |||||
| * | | Use default installation paths for i18n. | Didier Raboud | 2012-12-16 | 1 | -3/+1 |
| |/ | | | | | | | | | | | This finishes the work started in 19b75e174338f8e7be7486a7445d1e90e9795077 by actually using the translation where they are installed. | ||||
| * | Merge branch 'master' into dev | Piotr Dziwinski | 2012-12-15 | 1 | -3/+9 |
| |\ | |||||
| | * | Inherit translation setting from environment. | Didier Raboud | 2012-12-14 | 1 | -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 management | Piotr Dziwinski | 2012-12-26 | 2 | -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 lists | Piotr Dziwinski | 2012-12-14 | 2 | -0/+11 |
| | | | |||||
* | | | Performance counters | Piotr Dziwinski | 2012-10-25 | 2 | -0/+117 |
| | | | |||||
* | | | Main loop enhancement | Piotr Dziwinski | 2012-10-25 | 2 | -15/+16 |
|/ / | | | | | | | Frame updates were posted one frame behind in event queue | ||||
* | | Restext rewrite to runtime initialized arrays | Piotr Dziwinski | 2012-10-17 | 1 | -0/+2 |
| | | |||||
* | | Doxygen/comment fixes and some #include refactoring | Piotr Dziwinski | 2012-10-17 | 2 | -4/+4 |
| | | |||||
* | | Changing and saving input bindings | Piotr Dziwinski | 2012-10-07 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'dev' into dev-graphics | Piotr Dziwinski | 2012-10-02 | 1 | -5/+5 |
|\ | |||||
| * | Further work on saving profile and directory listing. | Zaba999 | 2012-10-02 | 1 | -5/+5 |
| | | |||||
* | | Fixed bugs in texture coloring | Piotr Dziwinski | 2012-09-30 | 1 | -2/+2 |
| | | |||||
* | | Font coloring; fix for resize hack | Piotr Dziwinski | 2012-09-30 | 1 | -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. | adiblol | 2012-09-30 | 1 | -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-graphics | Piotr Dziwinski | 2012-09-29 | 1 | -10/+10 |
|\ | |||||
| * | Work in progress on opening files, and listing dirs | Zaba999 | 2012-09-26 | 1 | -10/+10 |
| | | | | | | | | | | Fixed includes profile changed from SimpleIni to boost::ptree -> not finished yet | ||||
* | | Some fixes and optimizations | Piotr Dziwinski | 2012-09-29 | 1 | -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 fixes | Piotr Dziwinski | 2012-09-27 | 2 | -2/+2 |
|/ | |||||
* | Removed metafile editor and loader | Piotr Dziwinski | 2012-09-22 | 1 | -1/+0 |
| | |||||
* | Various fixes | Piotr Dziwinski | 2012-09-22 | 1 | -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 paths | Piotr Dziwinski | 2012-09-22 | 2 | -5/+49 |
| | | | | | - changed access to paths in data directory in CApplication - models now load from data directory | ||||
* | Event fixes & refactoring | Piotr Dziwinski | 2012-09-22 | 2 | -94/+70 |
| | | | | | | - added new state tracking to Event - removed old fields from Event - fixed some issues with Events and fps counter | ||||
* | * Fixed audio problems | erihel | 2012-09-22 | 2 | -4/+36 |
| | | | | | | * Added colobot.ini to CApp in Create function * Fixes to plugin manager * Fixed CProfile segfault | ||||
* | Mouse pos setting, low cpu mode, stats display | Piotr Dziwinski | 2012-09-20 | 2 | -38/+78 |
| | |||||
* | Mouse wheel events, motion vectors | Piotr Dziwinski | 2012-09-19 | 2 | -22/+35 |
| | | | | | | - added mouse wheel events - added motion vectors to CRobotMain - other minor changes in event.h | ||||
* | Input bindings rewrite | Piotr Dziwinski | 2012-09-19 | 2 | -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. | Zaba999 | 2012-09-19 | 2 | -1/+7 |
| | |||||
* | Merge branch 'dev' of https://github.com/adiblol/colobot into dev | Zaba999 | 2012-09-18 | 3 | -10/+28 |
|\ | | | | | | | | | Conflicts: src/ui/slider.cpp | ||||
| * | Change of background image handling | Piotr Dziwinski | 2012-09-17 | 3 | -10/+28 |
| | | | | | | | | | | | | - removed old 4 quarter backgrounds - fixes in texture loading - other minor fixes |