Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | Merge branch 'dev' of https://github.com/colobot/colobot into dev | Zaba999 | 2012-09-29 | 44 | -499/+647 | |
| | |\ | ||||||
| | * | | #48 Adding new users works. | Zaba999 | 2012-09-29 | 1 | -543/+536 | |
| | | | | ||||||
* | | | | Dirty hack to allow window resizing or even full screen. | adiblol | 2012-09-30 | 5 | -1/+21 | |
|/ / / | | | | | | | | | | | | | Currently makes text buggy! (full screen must be initiated by window manager, for example Alt+F11 in Fluxbox) | |||||
* | | | Fixed invradar cheat code. | adiblol | 2012-09-30 | 4 | -16/+40 | |
| | | | | | | | | | | | | | | | Replaced CRobotMain::GetCheatRadar with CRobotMain::GetRadar. Changed logger level of "invalid m_motion" messages. | |||||
* | | | Map texture painting | Piotr Dziwinski | 2012-09-30 | 5 | -39/+66 | |
| | | | ||||||
* | | | Texture coloring | Piotr Dziwinski | 2012-09-29 | 3 | -23/+169 | |
| | | | ||||||
* | | | Merge branch 'dev-graphics' of github.com:colobot/colobot into dev-graphics | adiblol | 2012-09-29 | 6 | -59/+11 | |
|\ \ \ | |_|/ |/| | | ||||||
| * | | Fix for transparent objects and fadeouts | Piotr Dziwinski | 2012-09-29 | 6 | -59/+11 | |
| | | | ||||||
* | | | Fixed CEdit delete[] issues | Piotr Dziwinski | 2012-09-29 | 1 | -6/+6 | |
| | | | ||||||
* | | | CBotVar SetVal() fix | Piotr Dziwinski | 2012-09-29 | 1 | -1/+1 | |
| | | | ||||||
* | | | Enabled CBot (experimental) | Piotr Dziwinski | 2012-09-29 | 1 | -14/+17 | |
|/ / | ||||||
* | | Fixed texture regression | Piotr Dziwinski | 2012-09-29 | 6 | -80/+21 | |
| | | | | | | | | | | There was a bug in texture modesetting but only visible after certain mode changes. | |||||
* | | Fixed object selection by clicking | Piotr Dziwinski | 2012-09-29 | 1 | -2/+2 | |
| | | ||||||
* | | Fixed CEdit cursor | Piotr Dziwinski | 2012-09-29 | 1 | -8/+8 | |
| | | ||||||
* | | MXE support and CMake files refactoring | Piotr Dziwinski | 2012-09-29 | 3 | -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-graphics | Piotr Dziwinski | 2012-09-29 | 22 | -229/+351 | |
|\| | ||||||
| * | Small fix in profile + profile_test rewritten to gtest. | Zaba999 | 2012-09-28 | 5 | -39/+49 | |
| | | ||||||
| * | Merge branch 'master' of https://github.com/colobot/colobot into dev | unknown | 2012-09-28 | 17 | -189/+301 | |
| |\ | ||||||
| | * | Profile rewritten to boost. Read/write to ini should work. | Zaba999 | 2012-09-27 | 3 | -23/+26 | |
| | | | | | | | | | | | | Load/Save should work. | |||||
| | * | Merge branch 'master' of git://github.com/colobot/colobot | Zaba999 | 2012-09-26 | 6 | -67/+65 | |
| | |\ | ||||||
| | * | | Work in progress on opening files, and listing dirs | Zaba999 | 2012-09-26 | 17 | -187/+296 | |
| | | | | | | | | | | | | | | | | | | | | Fixed includes profile changed from SimpleIni to boost::ptree -> not finished yet | |||||
| * | | | * Fixed Issue #54: flags don't show in 3D view | erihel | 2012-09-28 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Some fixes and optimizations | Piotr Dziwinski | 2012-09-29 | 10 | -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-graphics | adiblol | 2012-09-27 | 4 | -69/+96 | |
|\| | | | ||||||
| * | | | * Ingame help should now display correctly | erihel | 2012-09-27 | 4 | -69/+96 | |
| | | | | ||||||
* | | | | Completely fixed light issues | Piotr Dziwinski | 2012-09-27 | 4 | -32/+52 | |
| | | | | | | | | | | | | | | | | Directional and spot lights are now set properly | |||||
* | | | | Updated docs and some Doxygen fixes | Piotr Dziwinski | 2012-09-27 | 18 | -50/+55 | |
| | | | | ||||||
* | | | | Fixed blinking light problem | Piotr Dziwinski | 2012-09-27 | 3 | -11/+13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | - temporarily commented out misbehaving code in CPhysics - some fixes in CLightManager - minor refactoring in CRobotMain | |||||
* | | | | Lighting fix (experimental) | Piotr Dziwinski | 2012-09-26 | 9 | -90/+156 | |
| | | | | | | | | | | | | | | | | | | | | - changed fixed light allocation to prioritized per-use basis - minor refactoring in CPlanet and CWater | |||||
* | | | | Refactored resource and relief loading | Piotr Dziwinski | 2012-09-26 | 4 | -51/+106 | |
|/ / / | | | | | | | | | | | | | - now loading can be from any image format - added IntColor struct for precise pixel operations | |||||
* | | | Fixed CEdit text input and drawing issues | Piotr Dziwinski | 2012-09-26 | 1 | -12/+12 | |
| | | | ||||||
* | | | Merge master & dev | Piotr Dziwinski | 2012-09-26 | 6 | -70/+65 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | Fog color fix; refactoring | Piotr Dziwinski | 2012-09-26 | 6 | -70/+65 | |
| | | | | | | | | | | | | | | | | | | - fixed fog color setting - removed unused glSecondaryColor and altered struct VertexCol - minor refactoring in CText | |||||
| * | | made graphics/engine/text cleaner, I hope | Michał Zieliński | 2012-09-24 | 2 | -32/+35 | |
| |/ | ||||||
* | | made graphics/engine/text cleaner, I hope | Michał Zieliński | 2012-09-25 | 2 | -32/+35 | |
| | | ||||||
* | | * Building should work now without 'ground not flat' message | erihel | 2012-09-25 | 2 | -7/+7 | |
|/ | ||||||
* | Removed metafile editor and loader | Piotr Dziwinski | 2012-09-22 | 4 | -490/+0 | |
| | ||||||
* | Various fixes | Piotr Dziwinski | 2012-09-22 | 8 | -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 paths | Piotr Dziwinski | 2012-09-22 | 22 | -506/+601 | |
| | | | | | - changed access to paths in data directory in CApplication - models now load from data directory | |||||
* | * Removed some warnings | erihel | 2012-09-22 | 2 | -2/+2 | |
| | ||||||
* | Event fixes & refactoring | Piotr Dziwinski | 2012-09-22 | 28 | -293/+272 | |
| | | | | | | - 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 | 9 | -70/+106 | |
| | | | | | | * Added colobot.ini to CApp in Create function * Fixes to plugin manager * Fixed CProfile segfault | |||||
* | Alpha operation fix | Piotr Dziwinski | 2012-09-21 | 1 | -1/+1 | |
| | ||||||
* | robotmain, restext and engine fixes | Piotr Dziwinski | 2012-09-21 | 7 | -355/+118 | |
| | ||||||
* | changed paths for models and levels. Now it's possible to load level. Merged ↵ | Zaba999 | 2012-09-20 | 54 | -3394/+3580 | |
|\ | | | | | | | with latest trunk | |||||
| * | Checkbox fix; main dialog buttons | Piotr Dziwinski | 2012-09-20 | 2 | -89/+10 | |
| | | ||||||
| * | Whitespace fix | Piotr Dziwinski | 2012-09-20 | 6 | -938/+938 | |
| | | ||||||
| * | Mouse pos setting, low cpu mode, stats display | Piotr Dziwinski | 2012-09-20 | 6 | -171/+252 | |
| | | ||||||
| * | Namespace and styling fix | Piotr Dziwinski | 2012-09-19 | 43 | -2223/+2403 | |
| | | ||||||
| * | Forgotten fix in dev-graphics | Piotr Dziwinski | 2012-09-19 | 229 | -16024/+15065 | |
| |\ |