ead18b2af2
Merge branch 'master' into jgrpp
...
# Conflicts:
# CMakeLists.txt
# src/3rdparty/md5/md5.h
# src/3rdparty/squirrel/squirrel/squtils.h
# src/animated_tile.cpp
# src/console_func.h
# src/core/CMakeLists.txt
# src/core/container_func.hpp
# src/core/smallstack_type.hpp
# src/crashlog.cpp
# src/crashlog.h
# src/debug.h
# src/economy.cpp
# src/gamelog.cpp
# src/industry_gui.cpp
# src/lang/catalan.txt
# src/misc_gui.cpp
# src/network/network_content.h
# src/newgrf.cpp
# src/newgrf.h
# src/newgrf_config.cpp
# src/newgrf_config.h
# src/newgrf_gui.cpp
# src/os/unix/font_unix.cpp
# src/os/windows/crashlog_win.cpp
# src/rail_cmd.cpp
# src/saveload/animated_tile_sl.cpp
# src/script/api/script_tilelist.cpp
# src/settings.cpp
# src/settingsgen/settingsgen.cpp
# src/sl/oldloader_sl.cpp
# src/station.cpp
# src/station_cmd.cpp
# src/stdafx.h
# src/strgen/strgen.cpp
# src/strgen/strgen_base.cpp
# src/table/settings/gui_settings.ini
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_base.h
# src/vehicle_cmd.cpp
# src/vehicle_gui_base.h
# src/viewport_sprite_sorter.h
11 months ago
02549c5224
Merge branch 'master' into jgrpp
...
# Conflicts:
# cmake/CompileFlags.cmake
# src/cargomonitor.cpp
# src/core/CMakeLists.txt
# src/economy.cpp
# src/landscape.cpp
# src/linkgraph/flowmapper.cpp
# src/linkgraph/linkgraph_gui.cpp
# src/linkgraph/linkgraphschedule.cpp
# src/misc_gui.cpp
# src/newgrf_generic.cpp
# src/newgrf_storage.cpp
# src/rail_gui.cpp
# src/saveload/afterload.cpp
# src/saveload/station_sl.cpp
# src/script/script_gui.cpp
# src/station_cmd.cpp
# src/station_gui.cpp
# src/string_func.h
# src/terraform_cmd.cpp
12 months ago
3323402aaa
Codechange: rename smallvec_type to container_func and use only when needed
1 year ago
e6740046ee
Codechange: Use range-for iteration.
1 year ago
68ff3fd062
Change: include fmt.h C++ headers in stdafx.h
...
This to prevent compilation issues between runs with and without precompiled
headers. Also remove the headers from the rest of the code base as they are
not needed there anymore, although they do relatively little harm.
1 year ago
7da25820ea
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/widgets/dropdown.cpp
# src/widgets/dropdown_type.h
1 year ago
e5af5907ec
Change: Make all dropdown lists extend width if necessary.
...
This removes the auto_width parameter from ShowDropDown(At).
1 year ago
25ed7c2b53
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/music.cpp
# src/script/api/script_company.cpp
# src/script/api/script_event_types.cpp
# src/script/api/script_group.cpp
# src/script/api/script_object.cpp
# src/script/api/script_road.cpp
1 year ago
e999aa2923
Fix: Don't (briefly) switch from title-only playlist on menu screen.
...
Switching playlist while on the menu screen now only changes the playlist
that will be used when out of the menu screen.
1 year ago
3b90b85439
Change: Allow jukebox lists to fill window width.
1 year ago
0c4e2ce114
Change: Resize jukebox when changing music set.
1 year ago
1ec34acb51
Fix: Truncated music-set song names cause warning log.
...
The music-set does not need to be selected for this to occur.
Resolved by using std::string instead of fixed buffer for song names,
which avoids manual string copying and removes the length limit.
1 year ago
66166bad48
extmidi: Do not continuously retry if execvp fails
...
See: #478
1 year ago
890b2666d3
Change: Use scaled WidgetDimensions.
2 years ago
123983743f
Change: Add optional text labels to slider widget.
2 years ago
1180c95372
Codechange: Add parameters to change range of slider widget.
2 years ago
d35f1d3d06
Codechange: Rename slider widget functions to be less specific.
2 years ago
b6ed595176
Codechange: Prefer suggested widget padding.
2 years ago
6f95e04005
Change: Use Rect helpers for widget drawing.
...
This replaces repetitive and sometimes unwieldy use of constants.
2 years ago
0fae0599b7
Fix: Data race on effect volume setting with mixer thread
2 years ago
0bac74ec2b
Fix #10038 : Missing upper bounds check when loading custom playlists ( #10039 )
2 years ago
8321ef0061
Codechange: Set specific widgets dirty instead of window.
3 years ago
6bca9e090d
Codechange: add SetDParamStr that accepts std::string&
3 years ago
785e42a6f9
Feature: Volume sliders in Game Options window
3 years ago
88c92f7b7c
Codechange: Move volume control slider logic to separate functions
3 years ago
9b800a96ed
Codechange: Remove min/max functions in favour of STL variants ( #8502 )
3 years ago
a49fdb7ebb
Codechange: Store base set related texts in std::strings.
4 years ago
a411ce18c9
Fix: avoid using string pointer after scope end
4 years ago
f02b643a44
Change: Show volume sliders with wedges instead of boxy slider
4 years ago
13cc8a0cee
Cleanup: Removed SVN headers
5 years ago
c7b9987d08
Codechange: Switch DropDownList to directly use std::vector, thus making AutoDeleteSmallVector obsolete.
...
DropDownListItem are strongly managed using std::unique_ptr to ensure leak-free handling. Appropriate use
of move-semantics make intent a lot clearer than parameter comments and allows the compiler to generate
copy-free code for most situations.
5 years ago
317f69c152
Codechange: Use override specifier in Window-derived classes.
5 years ago
6dfe36b5cd
Change: Make volume slider widget capture mouse when clicked.
...
This makes the slider continue to respond even when mouse cursor
is no longer over the widget.
5 years ago
c618a7c093
Fix 6298b96: Changing music set did not save new setting
6 years ago
52ed3bcbaa
Remove: A few bits of dead code
6 years ago
336d6cab68
Fix 6298b96: Playlist window not drawing playlist
...
Copy-paste error in change to remove C++11 usage...
6 years ago
6298b96571
Change: Modernise music control logic implementation ( #6839 )
...
Rewrite of almost the entire music control logic to a more modern style, hopefully also easier to understand. The old playlist handling made it look like arcane magic, which it doesn't have to be.
- Playlists are now stored in std::vector of objects instead of arrays of bytes with magic sentinel values, that need to be rotated around all the time. Position in playlist is stored as a simple index.
- The theme song is now reserved for the title screen, it doesn't play on any of the standard playlists, but is still available for use on custom playlists.
- When the player enters/leaves the game from the main menu, the music always restarts.
- Playback state (playing or not) is kept even if music becomes unavailable due to an empty playlist (or an empty music set), so it can restart immediately if music becomes available again.
- The shuffle algorithm was changed to a standard Fisher-Yates.
- Possibly better behavior when editing a custom playlist while it's playing.
- Custom playlists should be compatible.
- Framework for supporting custom playlists with songs from multiple music sets.
6 years ago
a1b7812c7e
Change: Improved looping of title song
6 years ago
f946b3da56
Codechange: Pass a MusicSongInfo struct instead of bare filename to music drivers.
...
Preparation for later extending the info passed to music drivers.
6 years ago
19f5a6cbb0
Feature #6090 : Change music set during gameplay
6 years ago
430e20f7e4
Fix: Clipping issues with volume sliders in Music GUI
...
Tested with various languages and GUI font sizes, should look good everywhere.
Also clamps near-end values to minimum and maximum so 0 and 127 are possible to achieve even on small GUI sizes (like the default.)
6 years ago
bb809e35ce
Change: Less intrusive "no music" message from Music window
6 years ago
e172794947
Change: Disable music control buttons when there is no music
6 years ago
76cccc64c9
Codechange: Music GUI comments and function naming
6 years ago
771dcf3b7b
(svn r27003) -Cleanup: fix the use of spaces and asterices "around" some comments
10 years ago
4438821b80
(svn r26809) -Fix: do not dereference the -1 index of the file names array of music files. It definitely breaks on m68k, and might cause failures on other platforms as well
10 years ago
b476086c39
(svn r26538) -Codechange: remove double accounting of the drivers
10 years ago
21f991e235
(svn r26489) -Codechange: properly account for the end of buffers in the file io code instead of assuming MAX_PATH is okay
10 years ago
0463dbdc9e
(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values
10 years ago
247feca247
(svn r25776) -Add [FS#5743]: Sticky and shade buttons for jukebox window (retro)
11 years ago
Jonathan G Rennison
Rubidium
Peter Nelson
Niels Martin Hansen
Charles Pigott
Michael Lutz
Milek7
S. D. Cloudt
planetmaker