summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Refactoring: changed UNIT to g_unit in CRobotMain classadiblol2012-10-051-9/+9
|
* Merge branch 'dev' into dev-graphicsPiotr Dziwinski2012-10-025-297/+166
|\
| * Further work on saving profile and directory listing.Zaba9992012-10-025-297/+166
| |
* | Merge remote-tracking branch 'origin/dev' into dev-graphicsadiblol2012-09-301-0/+1
|\|
| * Fixed not working message(...) CBot functionadiblol2012-09-301-0/+1
| |
* | Merge remote-tracking branch 'origin/dev' into dev-graphicsadiblol2012-09-301-2/+2
|\|
| * Fixed segfault when using empty strings with CBotString::operator+adiblol2012-09-301-2/+2
| |
* | Fixed bugs in texture coloringPiotr Dziwinski2012-09-303-23/+24
| |
* | Font coloring; fix for resize hackPiotr Dziwinski2012-09-308-67/+82
| | | | | | | | | | | | - added font coloring and changed default color to black - fixed resize hack incorrectly changing video config, but font resizing will not work for now
* | Merge remote-tracking branch 'origin/dev' into dev-graphicsadiblol2012-09-301-543/+536
|\|
| * Merge branch 'dev' of github.com:colobot/colobot into devadiblol2012-09-301-543/+536
| |\
| | * Merge branch 'dev' of https://github.com/colobot/colobot into devZaba9992012-09-2944-499/+647
| | |\
| | * | #48 Adding new users works.Zaba9992012-09-291-543/+536
| | | |
* | | | Dirty hack to allow window resizing or even full screen.adiblol2012-09-305-1/+21
|/ / / | | | | | | | | | | | | Currently makes text buggy! (full screen must be initiated by window manager, for example Alt+F11 in Fluxbox)
* | | Fixed invradar cheat code.adiblol2012-09-304-16/+40
| | | | | | | | | | | | | | | Replaced CRobotMain::GetCheatRadar with CRobotMain::GetRadar. Changed logger level of "invalid m_motion" messages.
* | | Map texture paintingPiotr Dziwinski2012-09-305-39/+66
| | |
* | | Texture coloringPiotr Dziwinski2012-09-293-23/+169
| | |
* | | Merge branch 'dev-graphics' of github.com:colobot/colobot into dev-graphicsadiblol2012-09-296-59/+11
|\ \ \ | |_|/ |/| |
| * | Fix for transparent objects and fadeoutsPiotr Dziwinski2012-09-296-59/+11
| | |
* | | Fixed CEdit delete[] issuesPiotr Dziwinski2012-09-291-6/+6
| | |
* | | CBotVar SetVal() fixPiotr Dziwinski2012-09-291-1/+1
| | |
* | | Enabled CBot (experimental)Piotr Dziwinski2012-09-291-14/+17
|/ /
* | Fixed texture regressionPiotr Dziwinski2012-09-296-80/+21
| | | | | | | | | | There was a bug in texture modesetting but only visible after certain mode changes.
* | Fixed object selection by clickingPiotr Dziwinski2012-09-291-2/+2
| |
* | Fixed CEdit cursorPiotr Dziwinski2012-09-291-8/+8
| |
* | 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