Mathieu Schroeter
5993c8f402
Change texts and fix translations
2018-06-30 15:37:36 +02:00
Mathieu Schroeter
c1b336ab86
Cosmetic
2018-06-29 00:27:19 +02:00
Mathieu Schroeter
278e52db45
Fix warning (bad assignment)
2018-06-29 00:27:08 +02:00
Mathieu Schroeter
7032a42f43
Fix text for switching of mode in fullscreen
2018-06-29 00:26:32 +02:00
Mathieu Schroeter
6bf6b3de07
Restart the game when the display mode has changed
2018-06-28 23:55:08 +02:00
Mathieu Schroeter
05dd698578
Add a --legacy option for starting the game in 640x480 mode
2018-06-28 23:54:30 +02:00
Mathieu Schroeter
988962d74a
Retrieve the right ratio accordingly to the current display
...
It's no longer forced to 16:9.
2018-06-27 17:31:59 +02:00
Mathieu Schroeter
e70873a7b8
Make like previous commit but with the recording
2018-06-26 23:16:03 +02:00
Mathieu Schroeter
881a0137b4
Disable smooth scroll with demos
...
It prevents lag and bad shift with mouse clicks.
2018-06-26 23:14:29 +02:00
Mathieu Schroeter
438c01181e
Reduce glitches when chagin the window mode/size
2018-06-26 19:05:01 +02:00
Mathieu Schroeter
fc977d926e
Force the display 0 on windows only with the native 640x480 resolution
2018-06-26 18:47:15 +02:00
Mathieu Schroeter
ab39906c5e
Merge branch 'master' into wip/landscape
2018-06-26 18:30:59 +02:00
Mathieu Schroeter
315b18e8eb
Use the progress function only where necessary
...
And prefer static on the way.
2018-06-26 18:17:25 +02:00
Mathieu Schroeter
3ebe028640
Fix mouse pos when zoom=2 > fullscreen
2018-06-25 22:53:10 +02:00
Mathieu Schroeter
375388b22f
Fix mouse position when changing zoom and fullscreen
2018-06-25 22:17:39 +02:00
Mathieu Schroeter
c79961e803
Merge branch 'wip/fullscreen' into wip/landscape
2018-06-13 23:42:55 +02:00
Mathieu Schroeter
b3c6b53693
WIP: add impl. of fullscreen desktop
...
It's possible to switch between both mode (fullscreen 640x480 and
fullscreen desktop). The zoom option is used for this switch in
fullscreen. The textes must be adapted in this case.
2018-06-13 23:16:59 +02:00
Mathieu Schroeter
967819a5b8
Add a method for testing if a demo is playing
2018-06-13 23:11:29 +02:00
Mathieu Schroeter
84a671a763
Merge branch 'master' into wip/landscape
2018-06-11 23:22:37 +02:00
Mathieu Schroeter
b116a98d4e
Revert "Do not change the bordered style on Windows"
...
It's not a problem...
This reverts commit 2d80222257f5745fd86d61e1800cdc08e1b7d8b8.
2018-05-31 22:47:57 +02:00
Mathieu Schroeter
3aba743cd4
Reload the textures when the renderer is asking for
...
It seems that it fixes textures lose completly.
2018-05-31 22:46:03 +02:00
Mathieu Schroeter
2d80222257
Do not change the bordered style on Windows
...
It's useless and it seems that the textures reload doesn't work
everytime in this case.
2018-05-31 22:28:51 +02:00
Mathieu Schroeter
0654c3939a
Force main display (0) for fullscreen mode
...
It seems that it doesn't work fine to set the fullscreen mode on the
second display (at least with NVidia) and Windows.
2018-05-31 22:27:34 +02:00
Mathieu Schroeter
cd7fbf1fb7
Merge branch 'master' into wip/landscape
2018-05-30 06:58:27 +02:00
Mathieu Schroeter
43ba6df7af
Fix mostly the fullscreen switching with more than 1 display
...
It concerns the issue #59 .
It's not perfect but it works much better (at leats on Linux). The idea
is to move the window to the top left corner of the current display.
2018-05-29 18:06:04 +02:00
Mathieu Schroeter
96cbf54167
Do not move the window when switching with fullscreen mode
2018-05-29 17:42:05 +02:00
Mathieu Schroeter
340e7becac
Center the window on the right display with zoom switching
2018-05-29 17:38:51 +02:00
Mathieu Schroeter
e2ac1d96c5
Does not check for world files with private missions
2018-03-16 11:49:23 +01:00
Mathieu Schroeter
ef362c8b37
Fix the last win screen with private missions
...
It returns to the main screen when the last mission is finished.
It fixes issue #56 .
2018-03-16 11:46:31 +01:00
Mathieu Schroeter
537c077146
Use a define for the max private missions number
2018-03-16 11:46:23 +01:00
Mathieu Schroeter
148e09c7e2
Fix music choice text position
2018-02-19 18:19:56 +01:00
Mathieu Schroeter
e88e58863b
Merge branch 'master' into wip/landscape
2018-02-19 18:13:21 +01:00
Mathieu Schroeter
e7dd0ec7c7
Ensure that it's not possible to put fire on all objects
...
Only burnable objects can have a fire.
Note that it's possible to re-enable the previous feature with the
--restore-bugs argument.
- It fixes issue #54 .
2018-02-18 23:33:30 +01:00
Mathieu Schroeter
1093c048ac
Update some copyright dates
2018-02-14 06:36:22 +01:00
Mathieu Schroeter
403b5dbb3d
Use the right mouse click (when building) for deleting
...
- It fixes issue #55 .
2018-02-14 06:16:45 +01:00
Mathieu Schroeter
0bc1d00074
Cosmetic
2018-02-13 23:44:08 +01:00
Mathieu Schroeter
0239d1e4ee
Ensure that gettext strings are always regenerated
...
- It fixes issue #52 .
2018-02-13 23:38:23 +01:00
Mathieu Schroeter
c6d109f87d
Revert "Return the music format finally retrieved by GetMusicLocation"
...
This reverts commit 7097c6708dc4e00d2aa86e95cea279cdfe20a432.
2018-01-31 23:57:49 +01:00
Mathieu Schroeter
fbfadb1eef
Enable only music choices accordingly to the available formats
...
It fixes OdyX need #47 .
2018-01-31 07:32:33 +01:00
Mathieu Schroeter
e52704d937
Revert "Add an argument to look for music only in the base location"
...
This reverts commit ce0fe82a02c0334a068bd2b78fa1f92e81680806.
It's not very useful..
2018-01-31 07:20:36 +01:00
Mathieu Schroeter
ce0fe82a02
Add an argument to look for music only in the base location
2018-01-31 07:10:32 +01:00
Mathieu Schroeter
7097c6708d
Return the music format finally retrieved by GetMusicLocation
...
It means that it's possible that this function returns something
different of the restoreMusic settings. It's the case when the prefered
format is not available in the directories.
2018-01-31 06:59:02 +01:00
Mathieu Schroeter
daa3dbf22b
Move the code to retrieve the music in a dedicated method
2018-01-31 06:50:56 +01:00
Mathieu Schroeter
82cbcc3611
Change and add missing fr translations
2017-12-14 23:17:24 +01:00
Mathieu Schroeter
dc8f6319f0
Cosmetic: rename windowScale to zoom
2017-12-14 23:10:24 +01:00
Mathieu Schroeter
1db67ed200
Save the window zoom and fullscreen settings in the user preferences
2017-12-14 23:07:17 +01:00
Mathieu Schroeter
da3d683bf7
Add a global settings entry for switching between ogg and midi music
2017-12-12 23:48:21 +01:00
Mathieu Schroeter
67ea4d0c2e
Look music for user dir, fallback to the game dir
...
Then it's possible to overload the original musicis by providing yours in
the user directory (in music subdir).
2017-12-11 18:42:49 +01:00
Mathieu Schroeter
d2bfd12934
Restore midi playback support and add --restore-midi cli argument
...
- It closes issue #49 .
2017-12-10 15:34:47 +01:00
Mathieu Schroeter
a058da17a3
Move the function to test if a file exists in misc
2017-12-10 15:29:11 +01:00
