Jonathan G Rennison
|
ea3b991f72
|
MinGW: Remove direct mingw-std-threads includes
|
6 months ago |
|
Jonathan G Rennison
|
88670a230f
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/articulated_vehicles.cpp
# src/articulated_vehicles.h
# src/base_media_base.h
# src/base_media_func.h
# src/build_vehicle_gui.cpp
# src/dock_gui.cpp
# src/main_gui.cpp
# src/music_gui.cpp
# src/network/network_chat_gui.cpp
# src/network/network_content.cpp
# src/newgrf.cpp
# src/newgrf_roadstop.cpp
# src/os/windows/string_uniscribe.h
# src/os/windows/win32.cpp
# src/rail_gui.cpp
# src/road.cpp
# src/road_gui.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/smallmap_gui.cpp
# src/strings.cpp
# src/terraform_gui.cpp
# src/tests/test_script_admin.cpp
# src/tests/test_window_desc.cpp
# src/timer/timer_game_calendar.h
# src/vehicle.cpp
# src/vehicle_base.h
# src/viewport.cpp
# src/widget_type.h
# src/window.cpp
# src/window_gui.h
|
6 months ago |
|
Jonathan G Rennison
|
154df0bb7d
|
Fix some unused variable warnings when asserts are disabled
|
6 months ago |
|
Jonathan G Rennison
|
c76dc937e3
|
Fix tooltip string parameters, change function signatures to match upstream
|
7 months ago |
Rubidium
|
c6411168d8
|
Cleanup: missing spaces before continuation * in some comments
|
7 months ago |
|
Rubidium
|
37f84b7372
|
Codechange: replace x.size() != 0 with !x.empty()
|
7 months ago |
|
Jonathan G Rennison
|
b70f8020e6
|
Fix right-click viewport scroll after using change viewport buttons
See: #597
|
8 months ago |
|
Jonathan G Rennison
|
e5e1adad8a
|
Fix graphical issues with scrolling viewport overlays
|
9 months ago |
|
Jonathan G Rennison
|
290822d150
|
Update viewport positions in two stages
|
9 months ago |
|
Jonathan G Rennison
|
96ed5b5cad
|
Remove _vp_move_offs global
|
9 months ago |
|
Jonathan G Rennison
|
57e4929137
|
Fix viewport sign invisibility check
|
9 months ago |
|
Jonathan G Rennison
|
68c0fd63dd
|
Avoid window iterations when marking viewports dirty
|
9 months ago |
|
Jonathan G Rennison
|
52e4688851
|
Use Window iterate instead of from front/back when no order required
|
9 months ago |
|
Jonathan G Rennison
|
a18f3274b4
|
Rename close window functions to match upstream
|
9 months ago |
|
Jonathan G Rennison
|
ed1b842ad3
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/console.cpp
# src/console_func.h
# src/network/network_server.cpp
# src/os/unix/unix.cpp
# src/spritecache.cpp
# src/viewport.cpp
|
9 months ago |
|
Jonathan G Rennison
|
c8817d7f4e
|
Merge branch 'master' into jgrpp
# Conflicts:
# os/macosx/notarize.sh
# src/3rdparty/CMakeLists.txt
# src/3rdparty/squirrel/squirrel/sqcompiler.cpp
# src/3rdparty/squirrel/squirrel/sqdebug.cpp
# src/3rdparty/squirrel/squirrel/sqvm.cpp
# src/console_cmds.cpp
# src/core/span_type.hpp
# src/crashlog.cpp
# src/currency.h
# src/date_gui.cpp
# src/driver.cpp
# src/fios.cpp
# src/genworld_gui.cpp
# src/hotkeys.cpp
# src/misc_gui.cpp
# src/music/os2_m.cpp
# src/network/core/os_abstraction.h
# src/network/network_server.cpp
# src/newgrf.cpp
# src/newgrf_config.h
# src/newgrf_text.cpp
# src/openttd.cpp
# src/os/macosx/font_osx.cpp
# src/os/macosx/misc_osx.cpp
# src/os/os2/CMakeLists.txt
# src/os/os2/os2.cpp
# src/os/unix/CMakeLists.txt
# src/os/windows/font_win32.cpp
# src/os/windows/win32_main.cpp
# src/saveload/saveload.cpp
# src/script/api/script_text.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/stdafx.h
# src/strings.cpp
# src/timetable_gui.cpp
# src/town_gui.cpp
# src/train_cmd.cpp
# src/video/dedicated_v.cpp
# src/video/video_driver.cpp
# src/video/win32_v.cpp
# src/viewport.cpp
# src/waypoint_gui.cpp
# src/widgets/dropdown_type.h
# src/window.cpp
# src/window_gui.h
|
9 months ago |
|
Jonathan G Rennison
|
46f5fb9f25
|
Sprite cache: Allow caching only required subset of sprite zoom levels
Enable for blitters based on 32bpp_optimized or SSE
|
9 months ago |
Patric Stout
|
0238a2b567
|
Codechange: use std::variant instead of using bitflags in the value (#11191)
|
10 months ago |
|
Jonathan G Rennison
|
4c88256183
|
De-duplicate string IDs used for viewport town labels
|
10 months ago |
|
Rubidium
|
eaae0bb5e7
|
Codechange: automatic adding of _t to (u)int types, and WChar to char32_t
for i in `find src -type f|grep -v 3rdparty/fmt|grep -v 3rdparty/catch2|grep -v 3rdparty/opengl|grep -v stdafx.h`; do sed 's/uint16& /uint16 \&/g;s/int8\([ >*),;[]\)/int8_t\1/g;s/int16\([ >*),;[]\)/int16_t\1/g;s/int32\([ >*),;[]\)/int32_t\1/g;s/int64\([ >*),;[]\)/int64_t\1/g;s/ uint32(/ uint32_t(/g;s/_uint8_t/_uint8/;s/Uint8_t/Uint8/;s/ft_int64_t/ft_int64/g;s/uint64$/uint64_t/;s/WChar/char32_t/g;s/char32_t char32_t/char32_t WChar/' -i $i; done
|
11 months ago |
|
Jonathan G Rennison
|
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 |
|
Jonathan G Rennison
|
8fea927ed1
|
Add setting for whether to shade height in viewport map mode
See: #550
|
11 months ago |
|
Jonathan G Rennison
|
05be624294
|
Remove gui.viewport_map_scan_surroundings setting, now always enabled
|
11 months ago |
Richard Wheeler
|
3b2934c479
|
Change: Make terraforming point selection sprite visible at >2x zoom out (#11017)
|
11 months ago |
|
Jonathan G Rennison
|
9a5df29648
|
Adjustments for PR #556
Setting text/condition, tooltip condition
|
11 months ago |
|
Rubidium
|
321f01602a
|
Codechange: reduce passing around parameters, but formatting strings earlier
|
11 months ago |
|
Rubidium
|
f48baa7d00
|
Codechange: move sign invisibility check out of loop
|
11 months ago |
|
Rubidium
|
836541b41c
|
Codechange: use SetDParam and CopyOutDParam for tooltips
|
12 months ago |
|
Rubidium
|
ac0c932ce7
|
Codechange: use SetDParam to set measurement tooltip parameters
|
12 months ago |
|
Jonathan G Rennison
|
61e9c3084f
|
Add picker tool to main toolbar help menu
See: #498
Supports:
* Rail types
* Road/tram types
* Objects
* Rail stations/waypoints
* Road stops/waypoints
Add unset hotkey
|
1 year ago |
|
Jonathan G Rennison
|
d7bf6b2c07
|
Feature: Highlight waypoint tiles when adjacent or distant joining
|
1 year ago |
|
Jonathan G Rennison
|
84b53213af
|
Codechange: Refactor viewport catchment overlay change handling
|
1 year ago |
|
Jonathan G Rennison
|
dc32b0533c
|
Viewport: Fix fixed vehicle route overlays not being marked dirty on remove
|
1 year ago |
|
Jonathan G Rennison
|
fd4d4d341d
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/animated_tile.cpp
# src/cargopacket.h
# src/cheat_gui.cpp
# src/company_cmd.cpp
# src/company_gui.cpp
# src/date.cpp
# src/disaster_vehicle.cpp
# src/dock_gui.cpp
# src/economy.cpp
# src/engine.cpp
# src/error_gui.cpp
# src/fontcache/spritefontcache.cpp
# src/game/game_gui.cpp
# src/game/game_text.cpp
# src/gfx.cpp
# src/graph_gui.cpp
# src/highscore_gui.cpp
# src/industry_cmd.cpp
# src/lang/dutch.txt
# src/lang/english_AU.txt
# src/lang/english_US.txt
# src/lang/finnish.txt
# src/lang/french.txt
# src/lang/italian.txt
# src/lang/portuguese.txt
# src/lang/russian.txt
# src/lang/turkish.txt
# src/lang/vietnamese.txt
# src/main_gui.cpp
# src/misc_gui.cpp
# src/network/network_gui.cpp
# src/network/network_server.cpp
# src/newgrf.cpp
# src/newgrf.h
# src/newgrf_generic.cpp
# src/news_gui.cpp
# src/openttd.cpp
# src/os/unix/unix.cpp
# src/os/windows/font_win32.cpp
# src/os/windows/win32.cpp
# src/rail_gui.cpp
# src/road_gui.cpp
# src/saveload/afterload.cpp
# src/saveload/misc_sl.cpp
# src/saveload/oldloader_sl.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/script/script_gui.cpp
# src/settings_table.cpp
# src/signs_gui.cpp
# src/smallmap_gui.cpp
# src/smallmap_gui.h
# src/spritecache.cpp
# src/spritecache.h
# src/spriteloader/grf.cpp
# src/station_cmd.cpp
# src/statusbar_gui.cpp
# src/stdafx.h
# src/strgen/strgen_base.cpp
# src/subsidy.cpp
# src/table/settings/difficulty_settings.ini
# src/texteff.cpp
# src/timetable_cmd.cpp
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/town_gui.cpp
# src/townname.cpp
# src/vehicle.cpp
# src/waypoint_cmd.cpp
# src/widgets/dropdown.cpp
# src/window.cpp
|
1 year ago |
|
Jonathan G Rennison
|
df5ca1d7fb
|
Highlight waypoint tiles when adjacent or distant joining
|
1 year ago |
|
Jonathan G Rennison
|
65159f4b22
|
Refactor viewport catchment overlay change handling
|
1 year ago |
|
Jonathan G Rennison
|
f053082478
|
Viewport map: Use transport colour for road bridge/tunnels and aqueducts
In route mode
|
1 year ago |
|
Jonathan G Rennison
|
d29cec53e0
|
Viewport map: Show bridges and tunnels in rail type colour in routes mode
See: #522
|
1 year ago |
|
Jonathan G Rennison
|
9cb992ab14
|
Viewport map: Adjust vertical alignment of tunnels
|
1 year ago |
|
Rubidium
|
63d9bb93b8
|
Codechange: migrate from C-style GetString to C++-style GetString
|
1 year ago |
Peter Nelson
|
56085be9bd
|
Codechange: Move includes for common STL headers to stdafx.
|
1 year ago |
|
Jonathan G Rennison
|
6d483cc5cc
|
Add toggle to show vehicle route overlay even when window is not focused
|
1 year ago |
|
Jonathan G Rennison
|
4c2244cc21
|
Viewport: Refactor handling of vehicle route overlays
|
1 year ago |
|
Jonathan G Rennison
|
c4571e86c8
|
Allow specifying any palette ID for tile highlight recolouring
|
1 year ago |
|
PeterN
|
e97bf271dc
|
Codechange: Make SpriteType, CargoSortType, SourceType and ScriptType enum classes. (#10663)
This avoids a (soft) namespace conflict between the four ST_* enums.
|
1 year ago |
|
PeterN
|
c1077212d7
|
Codechange: Use a shared_ptr for viewport overlay. (#10586)
|
1 year ago |
|
Jonathan G Rennison
|
fd532fbd6f
|
Avoid integer overflow issues in measurement tooltip
For large distances
Use integer instead of floating point sqrt
|
1 year ago |
|
Jonathan G Rennison
|
3e7a625e0e
|
Fix function locals shadowing parameters
|
1 year ago |
|
Jonathan G Rennison
|
8d6e57799c
|
Fix various possible integer type conversion issues
|
1 year ago |
|
Jonathan G Rennison
|
fef39b5797
|
Use backup/restore wrappers for various _cur_dpi changes
|
1 year ago |