64fef98bd7
Merge branch 'dev-0.1.8' into dev
2016-03-29 16:16:20 +02:00
32d1994c98
Added VSync setting and corrected default framebuffer MSAA setting
2016-03-29 13:38:53 +02:00
6585ee9ae8
Refactor some references to CRobotMain from CEngine
2016-03-26 18:55:39 +01:00
640c0297ef
Replaced CConfigFile::GetInstancePointer() with GetConfigFile()
2016-03-26 18:34:26 +01:00
3eadb0c6f7
Added experimental MSAA for default framebuffer
...
To enable, add MSAA=4 to [Experimental] in colobot.ini and disable standard MSAA
2016-03-14 20:14:16 +01:00
438bc477d1
Removed low CPU mode
2016-03-13 14:52:07 +01:00
d39604cb0e
Small change in context profile selection and more info about graphics devices in help switch
2016-02-27 15:25:23 +01:00
8414ae794d
Corrected a mistake in -glprofile argument parsing
2016-02-17 23:04:34 +01:00
999b2b85a4
Prevent possible crashes related to not releasing pause
2016-02-16 12:26:52 +01:00
cc973dab6f
Added settings and command line switches to request OpenGL context version and profile
2016-02-15 23:08:56 +01:00
254891d8f1
Save log to file, closes #696
2016-02-13 20:32:26 +01:00
8fb13816bf
One more code style fix
2016-02-13 14:15:11 +01:00
977607a934
Updated license headers
2016-02-13 14:11:30 +01:00
55412842df
Fixed some code style warnings
2016-02-13 13:46:56 +01:00
8a0cda1c2a
Fix issue #648
...
Should be proper fix
2016-02-10 17:06:02 +01:00
e0fcaf3a64
Disable logging to file
...
This causes the log to not be displayed in console, and the commit that was supposed to fix that was reverted because it fails to compile on our build server for some reason
2016-01-30 16:51:12 +01:00
76c43cddb2
Rename CSoundInterface::AddMusicFiles to CacheCommonMusic
2016-01-24 21:31:45 +01:00
5f01153c5f
Fixed joystick switch crash; small bugfix to joystick UI
2016-01-24 20:48:07 +01:00
40352be5cc
Add language switcher to the settings UI, closes #506
2016-01-24 16:03:24 +01:00
2e17712b5d
Added official build info in crash screen
2015-12-19 22:10:15 +01:00
e20f5f6983
Allow on-crash save during in-simulation config, closes #685
2015-12-19 22:06:16 +01:00
aa2e14219e
Added warnings and error messages to graphics devices regarding unsupported OpenGL version
2015-12-18 21:04:16 +01:00
d11ebc891c
Bring to zero some types of issues reported by colobot-lint
2015-10-04 00:09:10 +02:00
3815ef0bd6
Refactored CPauseManager (again)
2015-10-01 18:55:41 +02:00
6e1504d7a5
Further cleanup USE_SDL_MAIN
2015-09-29 22:39:34 +02:00
61a3ba2800
Fix undefined function colobot-lint issues
2015-09-29 21:44:24 +02:00
7a6e669a37
Show detailed error info when opening haptic device fails
2015-09-27 18:54:02 +02:00
66ce745be0
Introduce forward declarations as suggested by colobot-lint
2015-09-27 16:28:14 +02:00
6a6025f557
Implemented force feedback
2015-09-27 00:34:03 +02:00
fd07589ebb
Separated config.h and version.h
...
This prevents unnecessary recompilation of some files when version number changes
2015-09-26 21:12:12 +02:00
4dc7a301eb
Always reverse forward/backward and up/down axes on a joypad
2015-09-26 21:03:17 +02:00
07df35ca01
Refactored mouse wheel
2015-09-25 22:54:48 +02:00
a0034f8000
Finalized SDL2 migration
2015-09-25 21:26:49 +02:00
e965414d34
Rewritten text input to SDL2
2015-09-25 19:49:50 +02:00
7839dce624
Fixed duplicate resolutions appearing on the list
2015-09-25 11:16:09 +02:00
dfa06dafcf
Refactored window resize
2015-09-25 11:11:35 +02:00
53e4470dbf
Started SDL2 migration
2015-09-24 21:09:46 +02:00
e956311626
Moved free camera controls to numpad; added 'camtype %d', 'camspeed %f', 'freecam'
2015-09-04 19:04:42 +02:00
d97042e252
Fixed possible problems if another crash occurs while saving crash state
2015-09-01 16:17:23 +02:00
e015d9f1c3
Don't allow saving if crashed during loading
2015-09-01 16:15:59 +02:00
c3d7876a5c
Made CPauseManager not a singleton
2015-08-31 22:05:21 +02:00
75d18ced05
Fixed #596
2015-08-31 21:57:46 +02:00
ff17961584
Refactored CPauseManager
2015-08-31 21:47:55 +02:00
1519145c4c
Added information when no exception object is returned from std::current_exception
2015-08-25 14:01:10 +02:00
551710646b
Revert "Fix reporting unhandled exceptions in MSVC"
...
This reverts commit 4d3a0b6602
2015-08-25 13:32:58 +02:00
8ff6fadb75
Unlocked free window resolution change
2015-08-24 19:56:50 +02:00
d9b680bdcf
Removed Windows restart on resolution change workaround
2015-08-24 19:47:48 +02:00
b93f610930
Fix license header in all files
2015-08-22 16:40:02 +02:00
9d6543a947
Close game window on error (mentioned in #570 )
...
Otherwise, the error doesn't show up and the game appears to freeze in fullscreen mode
2015-08-19 11:14:25 +02:00
a63a959dbe
Apply clang-modernize -use-nullptr
2015-08-17 22:40:52 +02:00
ba3284b8b8
Apply clang-modernize -add-override
2015-08-17 22:12:09 +02:00
7e028977bd
Implemented emergency save on crash, closes #572
2015-08-17 20:56:42 +02:00
2289d69735
Replace NULL -> nullptr
2015-08-16 12:43:42 +02:00
4d3a0b6602
Fix reporting unhandled exceptions in MSVC
...
For some reason set_terminate() doesn't work with MSVC2013
2015-08-16 00:48:15 +02:00
0c670e7699
Don't demangle the exception class name on MSVC
2015-08-16 00:44:36 +02:00
f21025b526
User-friendly abort error messages
2015-08-16 00:44:36 +02:00
d703eb7165
Compile fixes for MSVC2013
2015-08-16 00:39:08 +02:00
9a15db1bea
Split global.h
2015-08-15 14:02:07 +02:00
02b76e5aba
Workaround for too fast calling of m_app->Render
2015-08-14 00:10:07 +02:00
26e4ec0ae2
Add more missing includes and forward declarations
2015-08-13 22:49:05 +02:00
ff957afefc
Moved files not directly related to CObject into src/level/ directory
2015-08-13 11:47:32 +02:00
8ad3b4e552
Fix Clang compilation
2015-08-10 22:40:37 +02:00
4964e35625
Fixed gun targetting with mouse
2015-08-09 23:04:24 +02:00
6b4610e808
Improved stats display
2015-08-09 15:20:38 +02:00
30589f3e79
Fixed -runscene
2015-08-07 22:37:56 +02:00
57469533b6
Implemented loading progress bar
2015-08-07 20:48:55 +02:00
f90bb63520
Hide some things in save screenshots
...
Save indicator, mouse cursor, CDisplayText and interface particles
2015-08-07 15:59:05 +02:00
e9e1c8d4dd
Add proper initializations and remove manual memory management in app classes
2015-08-07 10:16:46 +02:00
f95980456a
Replace anonymous union in Event with pointer to appropriate struct
2015-08-06 19:11:50 +02:00
2b4210dcbc
Separated CMainUserInterface from CMainDialog
2015-08-06 12:59:09 +02:00
596bb49de0
Normalize static variables and functions
...
* get rid of some of them
* put the rest into anonymous namespaces
2015-08-06 10:12:20 +02:00
bdeeaf690b
Get rid of memsets
2015-08-06 09:37:25 +02:00
18f9bfb575
Make saving screenshot thread- and exception-safe
...
* introduce ResourceOwningThread wrapper for safely passing resources
to new threads
* make CEventQueue thread-safe
* start screenshot saving thread using ResourceOwningThread
* change direct call at end of writing screenshot to thread-safe
event communication
2015-08-04 20:37:15 +02:00
ea7bfdefda
Moved scene to load out of CMainDialog
2015-08-04 10:56:49 +02:00
11b0398c03
Include refactoring
...
* reordered includes according to correct style
* removed some unnecessary includes
2015-08-02 17:49:07 +02:00
7d8b56d9ab
More style fixes
2015-08-02 12:06:14 +02:00
3b585d9f51
Some style and whitespace fixes
2015-08-02 11:36:36 +02:00
59d5545eca
Fixed code pause editor bug ( #527 )
2015-07-22 18:01:24 +02:00
083f216529
Team object recoloring ( #514 )
2015-07-22 12:45:50 +02:00
a2f1aa195b
Combined all level list phases into one, removed PHASE_TERM
2015-07-19 23:07:57 +02:00
02c24fbf27
CProfile -> CConfigFile
2015-07-19 16:05:09 +02:00
86f473ac16
Finished support for up to 999 chapters and levels
2015-07-18 19:48:25 +02:00
ea9361fbb4
LevelCategory enum
2015-07-18 19:45:40 +02:00
59a68892c6
Game displays an error message and uses default graphics device when unknown device is selected with -graphics switch
2015-07-18 12:03:33 +02:00
25eaf8f72f
Add MakeUniqueArray for array types
2015-07-17 20:57:12 +02:00
a872ea128b
Add MakeUnique template to avoid use of naked new
2015-07-17 20:06:59 +02:00
2c0baeec35
Fixed potential error in locale logging
...
setlocale() result is valid only until next call to setlocale()
2015-07-17 19:55:02 +02:00
c8f6e8124e
Replaced CLogger::GetInstancePointer() calls with GetLogger()
2015-07-16 22:12:44 +02:00
e8582d214c
CStaticObject subclass using new model framework
...
* added reading/writing working version of new model format V3
* added CStaticObject with minial interface intended for
non-interactive static objects like trees
* converted first model, tree0, to new format
2015-07-11 19:52:38 +02:00
24db675d3f
Added x6 speed option
2015-07-10 20:17:00 +02:00
d3c3a51ede
Don't open joystick if it's not enabled in ChangeJoystick
2015-07-10 10:28:04 +02:00
20a367783b
Added joystick settings in colobot.ini
2015-07-10 10:25:31 +02:00
7e41e9fe23
Refactored keybindings storage
2015-07-10 10:11:40 +02:00
5a68558f4c
Implemented basic joystick selection
...
You can select joystick in the config file, there is still no GUI. By default, the first available joystick is used.
issue #171
2015-07-10 00:05:43 +02:00
93e950584a
Refactor model-related code
...
* refactored model loading code based on code from dev-models
* support new model format V2 (without LOD levels)
* removed LOD levels support in CEngine and from model files
* preparations for new model format V3:
- support for multiple meshes in one model file
- support for saving crash spheres and shadow spots
- removed all direct dependencies on CEngine enum values
- quantized model rendering states to new flags and enums
2015-07-09 21:37:04 +02:00
ac291f5bea
Fix for issue #488
2015-06-28 21:05:12 +02:00
2509f99776
Fixed program arguments not being parsed on restart ( #483 )
2015-06-26 18:51:39 +02:00
88ec9aaae3
Drop GCC 4.6 support
2015-06-26 00:24:32 +02:00
7e21d3bd79
Get rid of some more manual memory management
2015-06-26 00:24:05 +02:00
8806d1708d
Proper CAuto, CBrain, CMotion, CPhysics, CPyro lifetime management
...
* change manual memory manament to std::unique_ptr
* create CPyroManager
* finally get rid of CInstanceManager
2015-06-22 21:58:58 +02:00
krzys-h