backup/planetblupi
1
0
Fork 0
mirror of https://github.com/blupi-games/planetblupi synced 2024-12-30 10:15:36 +01:00
Code Issues Projects Releases Activity
861 Commits 12 Branches 33 Tags
Commit Graph

191 Commits

Author SHA1 Message Date
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
Mathieu Schroeter
9efce31d57 Add licenses of new lib (especially for ogg playing) 2017-12-07 17:43:22 +01:00
Mathieu Schroeter
21bd7d3e90 Use ogg music files instead of midi 
It prevents different behaviour between OS.
 2017-12-07 11:01:01 +01:00
Mathieu Schroeter
8f5cfdfaa0 Fix Win32 build by removing WPARAM/LPARAM clash 2017-12-01 13:52:36 +01:00
Mathieu Schroeter
32e734f59d Prevent screen move when we are not playing or building 
- It closes issue #46.
 2017-11-03 08:55:07 +01:00
Mathieu Schroeter
5a3b3ebf87 Improve no music button position, thanks to @JesseRoxII 
- It fixes issue #43.
 2017-11-02 17:47:24 +01:00
Mathieu Schroeter
67c7c4c970 Fix regression when recording or playing a demo 
Only keyboard events must be accepted with demos.
 2017-10-31 18:45:06 +01:00
Mathieu Schroeter
503ed8ce7f Fix uninitialized variable 2017-10-30 18:26:01 +01:00
Mathieu Schroeter
546f5a86ba Add smooth scrolling for the playing and build area 
It fixes the issue #28.
 2017-10-30 18:14:31 +01:00
Mathieu Schroeter
0a17d2d92e Cosmetic: rename coin to corner 2017-10-28 18:37:06 +02:00
Mathieu Schroeter
4db92b4da6 Cosmetic: translate some comments to english 2017-10-25 07:06:14 +02:00
Mathieu Schroeter
af31192f73 Merge branch 'master' into wip/landscape 2017-10-23 19:31:12 +02:00
Mathieu Schroeter
a17a7e1dda Prevent bad values with the language to restore 2017-10-23 19:30:59 +02:00
Mathieu Schroeter
e8f3fc7e37 Initialize the struct 2017-10-23 19:29:23 +02:00
Mathieu Schroeter
d052ab4da3 Merge branch 'master' into wip/landscape 2017-10-23 18:29:40 +02:00
Mathieu Schroeter
6da7be9e78 Cosmetic: apply clang-format 2017-10-23 17:32:18 +02:00
krzys-h
b96741b45f Merge remote-tracking branch 'origin/master' into HEAD 2017-10-22 20:57:31 +02:00
Mathieu Schroeter
04f127af19 Prevent black screen (glitch) when a movie is not found 2017-10-21 23:31:32 +02:00
Mathieu Schroeter
e39c2eaedd Remove obsolete argument 2017-10-21 23:31:20 +02:00
Mathieu Schroeter
b25259df51 Prevent black screen (glitch) when a movie is not found 2017-10-21 16:44:22 +02:00
Mathieu Schroeter
8df65c2a28 Remove obsolete argument 2017-10-21 16:04:26 +02:00
Mathieu Schroeter
cf02f03a6c Use the book background on widescreen 2017-10-21 15:55:29 +02:00
Mathieu Schroeter
108c577b85 Use the back-build image as stretched background for wide screen 
Concerns only screens provided with the map builder.
 2017-10-21 15:31:38 +02:00
Mathieu Schroeter
56af742d0a Merge branch 'master' into wip/landscape 2017-10-21 10:52:54 +02:00
Mathieu Schroeter
a64b03c1da Remove obsolete mask argument of many draw functions 2017-10-18 07:04:35 +02:00
Mathieu Schroeter
9c43bcae44 Merge branch 'master' into wip/landscape 2017-10-18 06:43:56 +02:00
Mathieu Schroeter
9d23c1012c Return in the game when ESC is used in the stop phase 
It prevents to lost the current game just because we use two times the
ESC key. It's better to return in the game when ESCAPE is used from the
STOP phase (game paused).
 2017-10-18 06:43:04 +02:00
Mathieu Schroeter
9b6d571e07 Use expand mode for the build background 2017-10-15 22:13:58 +02:00
Mathieu Schroeter
f7640e92ce WIP: add an expanded mode for the backgrounds 
It's just partially working.
 2017-10-15 11:23:02 +02:00
Mathieu Schroeter
3e5768510e Cosmetics 2017-10-13 18:43:25 +02:00
Mathieu Schroeter
bf493e706d Fix skill level buttons positions 2017-10-13 18:43:13 +02:00