Commit Graph

1203 Commits (8433feb8bb2589d496ad6accd58d42ac86974144)

Author SHA1 Message Date
adiblol 923616ccac Dirty hack to allow window resizing or even full screen.
Currently makes text buggy!
(full screen must be initiated by window manager, for example Alt+F11 in Fluxbox)
2012-09-30 03:18:11 +02:00
adiblol dd8c2d8d92 Merge branch 'dev' of github.com:colobot/colobot into dev 2012-09-30 02:23:49 +02:00
adiblol c36d0c8ed2 Fixed invradar cheat code.
Replaced CRobotMain::GetCheatRadar with CRobotMain::GetRadar.
Changed logger level of "invalid m_motion" messages.
2012-09-30 01:51:37 +02:00
Piotr Dziwinski b46dc3850f Map texture painting 2012-09-30 00:23:26 +02:00
Zaba999 95e1d101c8 Merge branch 'dev' of https://github.com/colobot/colobot into dev 2012-09-29 23:53:57 +02:00
Zaba999 aa9df8b1f0 #48 Adding new users works. 2012-09-29 23:52:30 +02:00
Piotr Dziwinski a8554cfae3 Texture coloring 2012-09-29 23:37:38 +02:00
adiblol 4f097c10b3 Merge branch 'dev-graphics' of github.com:colobot/colobot into dev-graphics 2012-09-29 22:49:31 +02:00
Piotr Dziwinski 4193f8a3a9 Fix for transparent objects and fadeouts 2012-09-29 22:44:05 +02:00
Piotr Dziwinski c8f39a4c96 Fixed CEdit delete[] issues 2012-09-29 22:04:39 +02:00
Piotr Dziwinski 86109a8c1e CBotVar SetVal() fix 2012-09-29 21:46:34 +02:00
Piotr Dziwinski caf8e08a8d Enabled CBot (experimental) 2012-09-29 20:27:23 +02:00
Piotr Dziwinski 5a751d9c0d Fixed texture regression
There was a bug in texture modesetting but only visible after certain
mode changes.
2012-09-29 19:35:14 +02:00
Piotr Dziwinski 1fa7053ac0 Fixed object selection by clicking 2012-09-29 19:29:51 +02:00
Piotr Dziwinski a38d60d191 Fixed CEdit cursor 2012-09-29 19:29:17 +02:00
Piotr Dziwinski e7e8954384 MXE support and CMake files refactoring
- added support for cross-compiling with MXE (http://mxe.cc/)
 - refactored CMake files, adding some options and moving definitions
   to more suitable places
2012-09-29 17:19:23 +02:00
Piotr Dziwinski e9660c47c6 Merge branch 'dev' into dev-graphics 2012-09-29 12:19:00 +02:00
Piotr Dziwinski 677ce3960c Some fixes and optimizations
- 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
2012-09-29 10:40:11 +02:00
Zaba999 df4e3dfb6e Small fix in profile + profile_test rewritten to gtest. 2012-09-28 21:03:28 +02:00
unknown 38ebf4c398 Merge branch 'master' of https://github.com/colobot/colobot into dev 2012-09-28 20:17:56 +02:00
erihel 099f6c4f0b * Fixed Issue #54: flags don't show in 3D view 2012-09-28 00:05:49 +02:00
adiblol 77952a85e6 Merge remote-tracking branch 'origin/dev' into dev-graphics 2012-09-27 23:55:13 +02:00
erihel 9f4c1454dc * Ingame help should now display correctly 2012-09-27 23:42:52 +02:00
Piotr Dziwinski 6d0ed0d26a Completely fixed light issues
Directional and spot lights are now set properly
2012-09-27 23:18:12 +02:00
Piotr Dziwinski a394c9efec Updated docs and some Doxygen fixes 2012-09-27 20:43:20 +02:00
Piotr Dziwinski 2ef1c8b6f8 Fixed blinking light problem
- temporarily commented out misbehaving code in CPhysics
- some fixes in CLightManager
- minor refactoring in CRobotMain
2012-09-27 20:36:52 +02:00
Zaba999 cc9a507054 Profile rewritten to boost. Read/write to ini should work.
Load/Save should work.
2012-09-27 00:30:47 +02:00
Piotr Dziwinski 80d3a9bff1 Lighting fix (experimental)
- changed fixed light allocation to prioritized per-use basis
- minor refactoring in CPlanet and CWater
2012-09-26 23:18:57 +02:00
Zaba999 400869ff86 Merge branch 'master' of git://github.com/colobot/colobot 2012-09-26 22:59:37 +02:00
Zaba999 f6638a173e Work in progress on opening files, and listing dirs
Fixed includes
profile changed from SimpleIni to boost::ptree -> not finished yet
2012-09-26 22:57:43 +02:00
Piotr Dziwinski 2fa4d7b0db Refactored resource and relief loading
- now loading can be from any image format
- added IntColor struct for precise pixel operations
2012-09-26 19:18:33 +02:00
Piotr Dziwinski 00acce25d1 Fixed CEdit text input and drawing issues 2012-09-26 17:45:15 +02:00
Piotr Dziwinski 6bdc1e8ac1 Merge master & dev 2012-09-26 16:40:27 +02:00
Piotr Dziwinski 45fd8aad33 Fog color fix; refactoring
- fixed fog color setting
- removed unused glSecondaryColor and altered struct VertexCol
- minor refactoring in CText
2012-09-26 16:31:04 +02:00
Michał Zieliński dad42df4c7 made graphics/engine/text cleaner, I hope 2012-09-25 18:44:43 +02:00
erihel 2db419a1e0 * Building should work now without 'ground not flat' message 2012-09-25 18:26:16 +02:00
Michał Zieliński b06544871a made graphics/engine/text cleaner, I hope 2012-09-24 23:55:52 +02:00
Piotr Dziwinski 4e4046f843 HOWTO update 2012-09-23 11:41:59 +02:00
Piotr Dziwinski 05f7f0cdb2 Fixes in README 2012-09-23 10:03:00 +02:00
Piotr Dziwinski 0282a8a9c1 Updated README file 2012-09-23 00:48:53 +02:00
Piotr Dziwinski 6cce7ec6fd Removed metafile editor and loader 2012-09-22 21:07:23 +02:00
Piotr Dziwinski b1edcc822f Various fixes
- 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
2012-09-22 17:36:10 +02:00
Piotr Dziwinski fd09071c29 Data dir paths
- changed access to paths in data directory in CApplication
- models now load from data directory
2012-09-22 14:40:13 +02:00
erihel 37e7c73f43 * Removed some warnings 2012-09-22 11:48:41 +02:00
Piotr Dziwinski 0ff419560d Event fixes & refactoring
- added new state tracking to Event
- removed old fields from Event
- fixed some issues with Events and fps counter
2012-09-22 00:38:17 +02:00
erihel 15ff1d512b * Fixed audio problems
* Added colobot.ini to CApp in Create function
* Fixes to plugin manager
* Fixed CProfile segfault
2012-09-22 00:11:16 +02:00
Piotr Dziwinski f5bc8e12d4 Alpha operation fix 2012-09-21 00:14:26 +02:00
Piotr Dziwinski 60c37aac3a robotmain, restext and engine fixes 2012-09-21 00:01:03 +02:00
Zaba999 34a11021da changed paths for models and levels. Now it's possible to load level. Merged with latest trunk 2012-09-20 23:04:37 +02:00
Zaba999 191fdc614e changed paths for models and levels. Now it's possible to load level. 2012-09-20 22:58:00 +02:00