Commit Graph

391 Commits (07541d0bbb03e8b3f3871e9ea8fe19e925e22a66)

Author SHA1 Message Date
krzys-h 83599238d1 Added workaround for argv encoding on Windows
First part of fixing #414
2015-03-22 13:11:00 +01:00
krzys-h bb16c6d97c Fixed updating C locale after exception in C++ locale, should finish fixing #445 2015-03-21 20:14:41 +01:00
krzys-h 9c20f275a0 Fixed MXE builds after 87cf056158
On MXE, setlocale is a macro...
2015-03-21 17:34:18 +01:00
krzys-h 87cf056158 Modified locale setting code
I'm doing my best to fix #445. At least shouldn't crash anymore.
Needs more testing.
2015-03-21 17:12:05 +01:00
krzys-h f43acaa943 Store resolution as value instead of id on the list, closes #417
Also fixed a bug where after starting the game for the first time the "Apply changes" button would behave like you selected highest resolution possible (while the game is running at 800x600)
2015-03-19 19:46:37 +01:00
krzys-h e179847358 Fixed remapping virtual keys, closes #415 2015-03-18 21:29:33 +01:00
krzys-h 8f78dc81e7 Whoops, the file didn't save 2015-03-18 21:12:49 +01:00
krzys-h 92ea770121 Better fix for numerical enter (issue #427)
Should now work everywhere, not only in the editor.
2015-03-18 21:10:47 +01:00
krzys-h f54b46b61d CPathManager
* Moved path management from CApplication to CPathManager
* Moved %lvl% replacements from CParserParam to CPathManager
* Added %lvl% support in produce(), closes #426
2015-03-08 15:22:21 +01:00
krzys-h 0231c2359a Fixed #425 2015-01-08 19:01:56 +01:00
krzys-h 986cf98aaf CController - entry point into CRobotMain and CMainDialog 2014-12-22 10:36:36 +01:00
krzys-h 4fef3af9ef Moved all CObject management from CInstanceManager to CObjectManager 2014-12-21 19:04:31 +01:00
krzys-h fb07691790 New speed keybindings 2014-12-14 17:05:28 +01:00
krzys-h be0f4c2ffe Refactored keybindings UI and added some keybindings 2014-12-14 16:54:32 +01:00
krzys-h 5948a9e9d8 Show game version in logs, closes #413 2014-12-11 19:59:24 +01:00
krzys-h eec6041104 Refactoring of input and input bindings, CInput class 2014-12-11 19:14:33 +01:00
krzys-h 3dade17f89 Level saving through CLevelParser 2014-11-10 14:27:42 +01:00
krzys-h 750f0f0810 COLOBOT: Gold Edition -> Colobot: Gold Edition 2014-11-01 19:46:06 +01:00
krzys-h f8841f96f2 Added -headless
For automated stuff on devices without GPU
2014-10-31 20:40:13 +01:00
krzys-h 487e43ff4e Changing resolution from commandline
Conflicts:
	src/app/app.cpp
2014-10-31 20:40:09 +01:00
krzys-h c1f931c8ee Added some debug stuff, possible fix for #348 and #335 2014-10-30 22:18:33 +01:00
krzys-h 26376c652d Nothing else works, so restart the game on resolution change
Fixes #339 for now, but we'll need alternative solution later
2014-10-25 18:34:29 +02:00
CoLoRaptor 1ab5746ca7 Disabled active window resizing that crashes in some software/hardware configurations 2014-10-21 22:22:32 +02:00
krzys-h 97b7c0cab1 Fixed map turning gray after resizing window 2014-10-20 21:54:52 +02:00
krzys-h 0245fdc6c3 Merge branch 'dev-physfs' into dev
Conflicts:
	src/app/app.cpp
2014-10-19 16:18:36 +02:00
krzys-h d7ef0a1a5f Implemented "Apply changes" button (issue #141) 2014-10-19 15:45:59 +02:00
krzys-h 7af92cc4ce Added portable build flag 2014-10-18 20:00:30 +02:00
krzys-h f65b00089a Merge branch 'dev' into dev-physfs
Conflicts:
	data
2014-10-14 15:42:19 +02:00
krzys-h 9fd6cf5449 Changed all occurences of PPC in the code to TerranovaTeam 2014-10-14 15:26:18 +02:00
Piotr Dziwinski 5274acd624 Merge with dev 2014-10-07 22:15:40 +02:00
krzys-h c2b8787453 On development builds store savegame data in current directory 2014-09-29 21:39:21 +02:00
Piotr Dziwinski 9f2d544b27 Fix zenity version checking problems 2014-09-21 21:28:59 +02:00
Piotr Dziwinski 6a1ceba8c0 Some cleaning up 2014-09-21 12:29:06 +02:00
krzys-h f0b38721e0 Loading all mods found in "mods" directory 2014-09-21 12:29:01 +02:00
Piotr Dziwinski e4d52d9afb CProfile refactoring 2014-08-12 21:24:33 +02:00
Piotr Dziwinski 9de086390b Remove some more delete checks (#318) 2014-08-10 17:51:47 +02:00
krzys-h 0b2f25a6e3 Restored -datadir and -langdir arguments, added -savedir
Also, fixed some crashes when unable to open file
2014-08-06 12:27:17 +02:00
krzys-h 9a3cd67c3b Saving colobot.ini through physfs 2014-07-24 23:38:13 +02:00
krzys-h 17041e718b Added -mod commandline argument to add additional locations to physfs 2014-07-24 22:46:47 +02:00
krzys-h 092e7cc68d Fixed tests 2014-06-26 22:14:30 +02:00
krzys-h fd8ea13cbb Fixed not destroying CGameData
This also fixed failing assertion in tests
2014-06-26 21:38:02 +02:00
Mohamed Waheed f5ba2a27d4 fixed savefile screenshot loading bug 2014-06-24 20:31:17 +03:00
Krzysztof Dermont 754154341d More work on PhysFS support
* added output stream
* fixed music loading
2014-06-22 15:01:06 +02:00
Krzysztof Dermont 2260f6bf4f Big part of PhysFS support
* removed -mod argument
* removed -datadir argument
* removed -lang argument
* removed some dead ui code
* added resource manager and file loaders (stream and SDL)
* changed interface textures location to match new directory structure
* removed CGameData for mod support
* added PhysFS support
2014-06-20 23:51:28 +02:00
Piotr Dziwinski ba62e6f8be Remove dead code 2014-06-01 13:02:08 +02:00
krzys-h f0d97bfdb9 Better datadir mod support 2014-05-18 12:12:47 +02:00
MrSimbax a61da7404b Added fall damage
+ changed window title
2014-03-08 22:36:35 +01:00
krzys-h bb2a9bcfd3 Added option to set pause audio in Scene 2014-02-21 14:19:58 +01:00
Piotr Dziwinski 70b18cc4c0 Move engine frame update after game state update
This should finally fix #225
2014-01-18 21:35:32 +01:00
krzys-h 130c4fd941 Fixed log level in 8d30791595 2014-01-01 16:46:28 +01:00
krzys-h 8d30791595 Ability to set language via ini file
If language autodetection doesn't work, someone might want to manually force the game to use correct language without using -language parameter every time
2013-12-31 17:20:03 +01:00
krzys-h 999490e88b Code for changing music in pause mode
As requested by @Emxx52. Only code for now, we don't have the music yet. Temporairly in developements builds music will change to Prototype (in CBot editor) and Constructive Destruction (in SatCom)
2013-12-31 16:58:21 +01:00
krzys-h 4a237f5925 CPauseManager 2013-12-31 13:24:09 +01:00
krzys-h 246b7e107e Removed prototypes support 2013-12-27 20:36:11 +01:00
krzys-h 01cbc4177e Whoops 2013-12-26 22:14:53 +01:00
krzys-h 0f57809f51 Added scene test mode
... and fixed a "small" bug in previous commit ;)
2013-12-26 22:13:04 +01:00
erihel fe3f9ea38c Sound support changes
* removed 2d sound
* fixed listener orientation (propably issue #235)
* removed unused code and minor refactoring
2013-12-19 22:46:29 +01:00
Didier 'OdyX' Raboud 114cbec8a9 Never cache Data, Sound and Music paths
Let them always be either auto-detected, defined on the command-line
or written in the configuration file
2013-12-09 17:39:39 +01:00
Piotr Dziwinski fdd7c22591 Updated README and INSTALL files 2013-11-26 00:38:32 +01:00
Didier 'OdyX' Raboud aeefdbd1be On MacOSX, define the LangPath as being i18n in the Resources path of the bundle 2013-11-13 09:35:32 +01:00
Didier 'OdyX' Raboud b32f87bac7 Abstract the definition of LangPath to CSystemUtils 2013-11-13 09:35:32 +01:00
Didier 'OdyX' Raboud 93727a3fdf On MacOSX, don't cache the Data, Sound and Music paths
As users can potentially move the bundle around, it doesn't make sense to cache these

(It would probably make sense to drop this caching on all architectures, but it's only on MacOSX where it hurts most)
2013-11-13 09:35:32 +01:00
Didier 'OdyX' Raboud e78d2cce18 On MacOSX, define the DataPath as being the Resources path in the bundle 2013-11-13 09:35:32 +01:00
Didier 'OdyX' Raboud 17ad3e5a90 Abstract the definition of DataPath to CSystemUtils 2013-11-13 09:35:31 +01:00
Didier 'OdyX' Raboud 8f7f56f1ea On Mac OS X, write colobot.ini and savegames to Application Support directories 2013-11-13 09:35:31 +01:00
Didier 'OdyX' Raboud 8b65e9b56f Add russian language support 2013-11-07 14:44:12 +01:00
Didier 'OdyX' Raboud 9e9a9937ba Revert "Include SDL.h in main.cpp to make sure the main loop is SDL's main loop"
This was the wrong fix for the problem.

This reverts commit f31a570d96.
2013-10-29 14:43:29 +01:00
Didier 'OdyX' Raboud f31a570d96 Include SDL.h in main.cpp to make sure the main loop is SDL's main loop
This allows the MacOSX program to start.
2013-10-26 13:19:13 +02:00
Didier 'OdyX' Raboud 97baf7242e Fix system_other implementation by adding an Init() and fixing the wrong const 2013-10-24 21:12:52 +02:00
krzys-h 39866db502 Fixed @Emxx52 's fail :P
Merge branch 'master' into dev
Conflicts:
	src/app/app.cpp
2013-09-08 17:55:48 +02:00
Emxx52 2891c2ea4c Added '-game' launch option 2013-09-08 17:05:11 +02:00
erihel b5e87aa91f Datadir in command line didn't work with config.
Values from config file overwrote datadir
2013-07-16 16:00:06 +02:00
Piotr Dziwinski 3e989c96df Fixed auto-detecting locale on Windows
* localename library is now used to determine the actual locale used
 * added patched version of FindGettext.cmake to fix
   installation path of translation files
2013-06-24 14:16:39 +02:00
krzys-h 868b592706 Added -proto to options[] 2013-06-17 16:26:25 +02:00
Piotr Dziwinski 7874aca10c Enhanced logging, option to auto-start mission
* added logging of application events
 * changed debug mode flag to independent debug modes
 * added option to auto-start mission (load a mission immediately
   after startup)
 * removed "enum value out of range" prints
 * some refactoring
2013-06-16 21:54:36 +02:00
Piotr Dziwinski 7cf8811888 Fix for #195
* loading time now is not counted in elapsed time
2013-06-13 17:25:58 +02:00
Piotr Dziwinski 8765d58b02 Fixed code formatting
* moved braces to new lines
 * fixed some function/variable names
 * fixed whitespace issues
2013-05-27 10:19:16 +02:00
Piotr Dziwinski 8f6fd2a131 Changes in texture code & refactoring
* refactored and altered slightly the texture pack code
 * added flushing of texture cache
 * some refactoring and const-correctness in CApplication methods
2013-05-26 14:50:23 +02:00
Piotr Dziwinski ff101c6973 Fix for #213
Was caused by invalid options for getopt
2013-05-26 10:24:35 +02:00
krzys-h 04f747b00b Added simple texturepack support (#208) 2013-05-12 14:55:41 +02:00
Piotr Dziwinski cc8ed2979b Fixed deleting of CObjectManager
* fix in CApplication destructor
 * re-enabled unit tests
2013-05-11 21:22:03 +02:00
krzys-h 6333d2d38e Removed most of "No such node" messages 2013-05-04 11:56:03 +02:00
krzys-h c3e95d40a2 Added relative install paths for MXE build 2013-05-03 22:23:36 +02:00
krzys-h 64ebda0ab9 Added creating ini file with default values 2013-05-03 21:35:33 +02:00
erihel af24aba899 * Key repeating in edit fields 2013-04-18 21:02:25 +02:00
krzys-h 9485e1a95f Improved log levels 2013-04-01 12:58:55 +02:00
krzys-h a6d68d58e5 And it compiled and worked? o.O 2013-03-31 10:26:37 +02:00
krzys-h 90301e24c0 Added field "item" to class "object" in CBot 2013-03-31 10:21:22 +02:00
krzys-h 8777c126de Added SatCom translations 2013-03-29 10:03:35 +01:00
krzys-h b284fd74f3 Changes to fix multilanguage on Windows
Issue #118
2013-03-28 15:59:13 +01:00
krzys-h 3402219438 Changed savegame & profile dir on Windows 2013-03-27 20:24:05 +01:00
Didier Raboud 4c1a7057bb Add Linux-specific savegame and profile settings according to the XDG Base Directory Specification
http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
2013-03-27 10:29:58 +01:00
Didier Raboud 991dbd1e37 Add profile and savegame fetchers in SystemUtils
This breaks the tests compilation. :/
2013-03-27 10:20:06 +01:00
Piotr Dziwinski 195d6cded0 Fixed timer functions on win32
* changed win32 implementation to QueryPerformaceTimer system function
 * refactored system utils code
 * proper tests for time utils and update event creation in application
 * should fix issue #134
2013-03-24 12:00:12 +01:00
Piotr Dziwinski 4a30800cf1 Fixes for compiling on MSYS
* fixed SDL_main() and putenv() issues
 * disabled desktop subdir for MSYS
 * disabled building CBot_console for now
2013-03-22 19:17:08 +01:00
Piotr Dziwinski 3bb83e5595 Changed Linux time function
With CLOCK_MONOTONIC_RAW, the timer should never go back in time.
2013-03-19 23:08:39 +01:00
Piotr Dziwinski 025bedecfb Refactored platform-specific code
Moved functions from .h to .cpp files
2013-03-19 23:07:39 +01:00
Piotr Dziwinski bc859c4c59 VBO override option; argv parsing using getopt
* added -vbo option to override autodetection of OpenGL VBO extension
 * refactored argument parsing to use getopt()
 * fixed failing UTs
2013-03-10 15:44:21 +01:00
Piotr Dziwiński 001d37b257 CInstanceManager refactoring
* removed classes managed by CInstanceManager
   except for CObject, CPyro, CBrain and CPhysics
   because of dependencies
 * refactored instance searching to use existing singleton instances of
   CApplication, CEngine and CRobotMain and calling their getter
   functions
2013-02-17 12:11:56 +01:00
erihel 58f35e44ae * Removed alut
* Using libsndfile to load sounds and music
* Added support for playing music files
2013-01-14 22:55:16 +01:00
Piotr Dziwinski 5a6b3f005a Merge dev and dev-graphics 2013-01-07 19:43:04 +01:00
Piotr Dziwinski edb1c0cbd6 GLEW fix for some graphics drivers 2013-01-06 23:13:05 +01:00
Marcin Zawadzki ff5c890854 Small fix in detecting language. Fixes needed to compile code using clang 2013-01-05 23:03:26 +01:00
Piotr Dziwinski 8818a8e5db Corrected OpenGL extension detection
- corrected multitexture and VBO detection
- GLEW is now a required library
- minor CMakeLists refactoring
2013-01-05 23:03:06 +01:00
Piotr Dziwinski d1942e1216 Correct font scaling with resolution 2013-01-04 00:29:19 +01:00
Piotr Dziwinski 89a3f586a2 Merge branch 'dev' into dev-graphics 2013-01-04 00:05:28 +01:00
Piotr Dziwiński e625665f02 Merge pull request #108 from OdyX/dev-central-cmake-version
Create a central version
2012-12-29 02:44:03 -08:00
Didier Raboud 1b4208cdc5 Implement language Char for level files
This currently lacks fallback to an existing entry for non-translated entries
2012-12-28 23:06:12 +01:00
Didier Raboud f4c6f49b2f Move language initialisation in SetLanguage 2012-12-28 22:31:47 +01:00
Piotr Dziwinski 4cbb63f5b7 Fixed path for loading sounds 2012-12-28 12:06:37 +01:00
Didier Raboud e62996858b Create a central version
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
2012-12-27 17:12:42 +01:00
Didier Raboud 0d825ed613 Fix locale's loading
- Always inherit LC_ALL from environment;
- Enforce environment only if the runtime options require it;
2012-12-27 16:13:26 +01:00
Piotr Dziwinski 5574eccebd Engine optimization - rewritten model management
- new class CModelManager
 - rewritten engine object structure in CEngine
 - created shared model data instead of separate objects per each
   model instance
 - minor refactoring
2012-12-26 20:58:02 +01:00
erihel c793d2d4c6 * Changed Ret to Get methods in sound module
* Added video settings to profile
* Resolution change is now posibble but restart is required
2012-12-25 21:36:50 +01:00
erihel 1fa5f7a96f * Changed log level in sound module
* Fixed warnings in sound module
* Fixed problem with map loading when locale with different number separator
2012-12-25 17:46:48 +01:00
erihel 6d607e3ae8 latest changes 2012-12-21 17:31:55 +01:00
erihel f0e76ad446 sound fix 2012-12-20 21:57:57 +01:00
Piotr Dziwinski f77734e01c Installation path fixes and CMakeLists refactoring
make && make install should now give a working installation.
2012-12-20 00:23:12 +01:00
Didier Raboud 4827440e73 Merge branch 'dev' into dev-use-installed-i18n
Conflicts:
	src/common/config.h.cmake
2012-12-16 22:26:29 +01:00
Didier Raboud a266692615 Use default installation paths for i18n.
This finishes the work started in
19b75e1743 by actually using the
translation where they are installed.
2012-12-16 21:56:55 +01:00
Didier Raboud c190c3efae Set a default datadir, in sync with the data installation path. 2012-12-16 21:53:48 +01:00
Piotr Dziwinski 72ce040054 Merge branch 'master' into dev 2012-12-15 20:23:58 +01:00
Piotr Dziwinski 4811defca2 Static objects using OpenGL VBOs and display lists 2012-12-14 21:30:35 +01:00
Didier Raboud 6946155a56 Inherit translation setting from environment.
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.
2012-12-14 15:17:23 +01:00
Piotr Dziwinski 3ce488307f Performance counters 2012-10-25 23:29:49 +02:00
Piotr Dziwinski 3845efbbff Main loop enhancement
Frame updates were posted one frame behind in event queue
2012-10-25 20:27:40 +02:00
Piotr Dziwinski 0305e0ba17 Restext rewrite to runtime initialized arrays 2012-10-17 23:16:19 +02:00
Piotr Dziwinski f6e27099b2 Doxygen/comment fixes and some #include refactoring 2012-10-17 21:55:45 +02:00
Piotr Dziwinski 97f44035f1 Changing and saving input bindings 2012-10-07 00:46:46 +02:00
Piotr Dziwinski 3f7f013168 Merge branch 'dev' into dev-graphics 2012-10-02 22:17:30 +02:00
Zaba999 4b7ca3f262 Further work on saving profile and directory listing. 2012-10-02 21:44:14 +02:00
Piotr Dziwinski 85d253b094 Fixed bugs in texture coloring 2012-09-30 11:26:59 +02:00
Piotr Dziwinski 8ea4736a46 Font coloring; fix for resize hack
- added font coloring and changed default color to black
- fixed resize hack incorrectly changing video config,
  but font resizing will not work for now
2012-09-30 10:56:35 +02:00
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
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
Piotr Dziwinski a394c9efec Updated docs and some Doxygen fixes 2012-09-27 20:43:20 +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 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
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 bd36d76b31 Mouse pos setting, low cpu mode, stats display 2012-09-20 20:37:37 +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 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
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
Piotr Dziwinski 94e7fd9203 Locale settings and translation fixes
- added locale setting
- removed unused translations
- updated .po files
2012-09-13 23:28:06 +02:00
Piotr Dziwinski 34d7dcf3be Simulation timestamps and input bindings
- added new simulation time calculations in CApplication
- added simulation frame updates
- rewritten old input binding code and input state tracking
2012-09-12 23:43:04 +02:00
Piotr Dziwinski efe4f0badd Refactoring in src/common
- refactored CInstanceManager and some headers
- removed old headers
2012-09-09 17:51:10 +02:00
Piotr Dziwinski e94e26ae1e New model file format
- added new binary and text formats for models
- fixes and improvements in CModelFile
- tool for converting model files
- minor additions and fixes
2012-08-31 20:55:16 +02:00
Piotr Dziwinski 5b45911856 Improved error messages
Added some logging and improved error messages displayed to user
2012-08-13 23:09:30 +02:00
Piotr Dziwinski b4b74c30e9 Fixes & testing in CEngine
- fixed bugs in settings modes, etc.
- some additions and minor refactoring
2012-08-12 10:45:04 +02:00
Piotr Dziwinski 1996507fd3 Documentation update
- updated Doxyfile
- added/changed file, dir and namespace descriptions
- fixed some errors in doxygen tags
2012-08-11 18:39:16 +02:00
Piotr Dziwinski 7f80ca2971 Render mode setting, refactoring
- finished SetState in CEngine
- refactored Size and IntSize back to Point and IntPoint
- other minor changes in CEngine
2012-08-11 17:17:04 +02:00
Piotr Dziwinski 63257034c9 Partial CEngine implementation
- added rewritten implementation for basic modesetting in CEngine
- started rewriting proper rendering and object handling in CEngine
2012-08-10 23:31:42 +02:00
Piotr Dziwinski 61bfb22f27 Basic font rendering
- added basic font rendering
- minor refactoring & fixes
2012-08-03 23:23:13 +02:00
Piotr Dziwinski 5e637ca028 Switched to new style casts
- rewrote old C-style casts to new ..._cast<>
- corrected some dangerous casts
- added -Wold-style-cast to compile flags
2012-07-30 22:59:18 +02:00
Piotr Dziwinski 7c5a3514dd Video mode changing
- added video mode querying & changing
- added joystick querying & changing
- cleaned up CApplication interface
2012-07-29 15:09:53 +02:00
Piotr Dziwinski db0b880674 Updated Doxygen main page 2012-07-27 18:50:29 +02:00
Piotr Dziwinski 4ddcd9f810 Change of paths in src/graphics
- moved abstract core to src/graphics/core
- moved proper graphics engine to src/graphics/engine
2012-07-26 22:26:19 +02:00
Piotr Dziwinski 42963b341f Refactoring of texture code
- refactored texture structs & functions
- added note about OpenGL extensions
- removed device.cpp as unnecessary
- minor changes in CEngine
2012-07-25 00:27:01 +02:00
Piotr Dziwinski 9d59204531 Cursor drawing
- fixed cursor drawing in CEngine
- changed event loop to generate more events
2012-07-23 21:41:27 +02:00
Piotr Dziwinski 8797569d33 Texture & mouse functions; refactoring & fixes
- cleaned up and added documentation to engine.h
- refactored CEngine interface and associated structs
- added mouse handling functions in CApplication & CEngine
- fixed bugs in projection matrix setting
- changed texture loading & handling
- added const-values in CDevice & CGLDevice
- changed event management in CApplication
- other minor changes & bugfixes
2012-07-22 22:05:12 +02:00
Piotr Dziwinski 54f4da8792 Fix in model loading; simple model viewer
- fixed model loading code
- added simple model viewer (model_test) in src/graphics/opengl/test
- added system time stamp code
- split the code in app/system modules to separate headers
- added debug messages in model loading
- minor fixes in OpenGL engine
2012-07-15 19:17:49 +02:00
Piotr Dziwinski eca6d26459 Minor changes
- moved mainpage src/doc/docmain.doc.txt to src/app/main.cpp
- removed old modfile modules from src/common
- removed Snd namespace in engine.h
2012-07-11 20:56:09 +02:00
Piotr Dziwinski af3057df7e Merged changes from dev
Resolved conflicts & added fixes.
2012-07-04 19:56:22 +02:00
Piotr Dziwinski d9c5a439d0 CGLDevice implementation
- extended Gfx::CDevice interface
  - written OpenGL implementation in Gfx::CGLDevice
  - rewrote color and light module
  - added Gfx::VertexCol
  - added array casts to Math::Vector, Math::Matrix and Gfx::Color
2012-07-01 22:59:22 +02:00
Piotr Dziwinski 9bd4ec03b2 CDevice interface and stub of implementation
- added CDevice abstract interface
- began implementation of CGLDevice
- added stub for Texture struct
- created CGLDeviceConfig
- changed particule -> particle & other minor changes
2012-07-01 01:37:30 +02:00
Piotr Dziwinski 00c737b880 Joystick polling with timer
- added joystick polling through timer
- updated documentation on CApplication class
2012-06-30 12:26:40 +02:00
Piotr Dziwinski 9a268f5538 Switched back to old standard; addded -Wall
- removed -std=c++11
- added -Wall and removed most reported warnings
2012-06-30 10:16:52 +02:00
Piotr Dziwinski e37019943c Event handling, CApplication and switch to c++-11
- added/changed event structs and event queue in common/event.h
 - added event handling and some minor functions in CApplication
 - switched to --std=c++11 because of union in Event struct
2012-06-30 00:12:04 +02:00
Piotr Dziwinski c2a7375788 Removed trailing whitespace 2012-06-26 23:01:17 +02:00
Piotr Dziwinski cf312c0b87 Fixed brief Doxygen description 2012-06-26 22:50:55 +02:00
Piotr Dziwinski ebed57aa22 Whitespace and language change
- changed tabs to spaces and DOS line endings to Unix
  (except in CBot and metafile)
- changed language to English
- fixed #include <d3d.h> in d3dengine.h
2012-06-26 22:23:05 +02:00
Piotr Dziwinski b08a63790c SDL project
- added (very basic) SDL template in CApplication and CEngine
- split project into two targets: colobot_old (dependent on DirectX and WinAPI)
  and colobot_new (dependent on SDL and OpenGL)
- moved sound.h/cpp to old/ and created new template in Snd namespace
- added platform-independent dialog boxes in app/system.h/cpp
2012-06-25 19:59:17 +02:00
Piotr Dziwinski 3478978c21 CApplication and Gfx::CEngine interfaces & other
- added CApplication and Gfx::CEngine interfaces
- added Gfx::Material struct
- added Math::IntPoint struct
- added template for Gfx::CDevice class
- added templates for Gfx::CGLDevice and Gfx::CGLEngine classes
2012-06-24 15:41:56 +02:00
Piotr Dziwinski 8bb223e679 Templates for new implementation
- added template of classes/structs for new implementation
- changed #include paths
- updated README files
2012-06-22 16:31:55 +02:00
Piotr Dziwinski 4531ac88d3 Moved old implementations to src/old 2012-06-22 15:54:16 +02:00
Piotr Dziwinski 9f784e81f8 Switched to new implementation of the rest of math module
- changed structs from D3DVECTOR to Math::Vector
  and from D3DMATRIX to Math::Matrix
- changed functions to new Math namespace functions
- moved mainmovie module from graphics to object
- added Get and Set to Math::Matrix
2012-06-19 20:11:47 +02:00
Piotr Dziwinski b735913deb FPOINT -> Math::Point & other math functions
- changed FPOINT to Math::Point and some functions
  from math module to the new implementation
- moved old function and FPOINT struct declarations to math3d.cpp
- removed some unused functions in math module
- fixed some #include dependencies
- moved #define STRICT and #define D3D_OVERLOADS to compile options
2012-06-13 22:48:35 +02:00
Piotr Dziwinski a8665d2042 Changed #defined constants to consts; typedef struct -> struct 2012-06-11 17:28:27 +02:00
Piotr Dziwinski 697fbdabf1 BOOL -> bool; additional fixes in constructors/destructors 2012-06-10 15:28:12 +02:00
Piotr Dziwinski 680af17819 Fixed include paths and CMakeLists.txt
Additionally, changed #ifndef to #pragma once everywhere
2012-06-10 00:18:08 +02:00
Piotr Dziwinski 449cc186d5 Source files split into modules 2012-04-28 17:53:17 +02:00