Commit Graph

581 Commits (2173e86025f03cc19af833f99c786391bd32718e)

Author SHA1 Message Date
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
Piotr Dziwinski e25823f984 Checkbox fix; main dialog buttons 2012-09-20 21:47:53 +02:00
Piotr Dziwinski e896b83bcf Whitespace fix 2012-09-20 20:38:14 +02:00
Piotr Dziwinski bd36d76b31 Mouse pos setting, low cpu mode, stats display 2012-09-20 20:37:37 +02:00
Piotr Dziwinski 7b6bbf79c4 Namespace and styling fix 2012-09-19 23:50:28 +02:00
Piotr Dziwinski 7479f486b6 Forgotten fix in dev-graphics 2012-09-19 22:53:06 +02:00
Michał Konopacki 57d33d79ea Changes in Ui, solves part of #47 2012-09-19 22:17:28 +02:00
Piotr Dziwinski 1a79137e90 Mouse wheel fixes 2012-09-19 21:45:41 +02:00
Piotr Dziwinski 10c9d92cd2 Mouse wheel events, motion vectors
- added mouse wheel events
- added motion vectors to CRobotMain
- other minor changes in event.h
2012-09-19 21:23:42 +02:00
Piotr Dziwinski 51884cef8e Input bindings rewrite
- moved input bindings to CRobotMain
- added virtual keymod and joystick button key presses
- fixed putenv error; other minor fixes
2012-09-19 18:32:18 +02:00
Zaba999 4a639cf543 Fixed includes in ui. 2012-09-19 00:04:21 +02:00
Zaba999 7bce8f073c Merge branch 'dev' of https://github.com/adiblol/colobot into dev
Conflicts:
	src/ui/slider.cpp
2012-09-18 22:39:10 +02:00
Zaba999 36ae984ac7 Warnings cleaned, left only those connected to commented out code. 2012-09-18 22:33:28 +02:00
Piotr Dziwinski da5d4edeb3 Fixed invalid text alignment 2012-09-18 17:52:36 +02:00
Zaba999 a397922e8d warnings fight in progress. 2012-09-18 00:01:00 +02:00
Piotr Dziwinski 4b67386a69 Change of background image handling
- removed old 4 quarter backgrounds
- fixes in texture loading
- other minor fixes
2012-09-17 23:41:53 +02:00
Zaba999 844e11db4f changes needeto to cimpile on windows. 2012-09-17 20:47:27 +02:00
Piotr Dziwinski 050f9d2542 Fix max lights error 2012-09-16 20:39:32 +02:00
Piotr Dziwinski 2e21435f43 Some memory leaks fixed 2012-09-16 20:00:25 +02:00
Piotr Dziwinski 6a0d150539 Interface works
- 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
2012-09-16 10:38:08 +02:00
Piotr Dziwinski af9af56bb0 Successful compilation & running
- temporarily mocked CSoundInterface and CPluginInterface
- added CRobotMain to application
- successfully compiles & runs, but doesn't display correctly at the
  moment
2012-09-15 22:19:32 +02:00
Michał Konopacki 2847aad51f Merge branch 'dev' of github.com:adiblol/colobot into dev 2012-09-15 22:07:14 +02:00
Michał Konopacki c439964d28 [src/ui] CStudio compiles 2012-09-15 22:06:10 +02:00