Jonathan G Rennison
|
d7b75614bb
|
Merge branch 'master' into jgrpp
# Conflicts:
# media/baseset/CMakeLists.txt
# src/build_vehicle_gui.cpp
# src/console.cpp
# src/debug.cpp
# src/fontcache/freetypefontcache.cpp
# src/network/network.cpp
# src/openttd.cpp
# src/os/macosx/font_osx.cpp
# src/os/windows/font_win32.cpp
# src/settings_gui.cpp
# src/video/sdl2_v.cpp
# src/widgets/settings_widget.h
# src/window_gui.h
|
6 months ago |
Peter Nelson
|
71aaed860b
|
Codechange: Missing some conversions to WidgetID. (#11773)
|
6 months ago |
Jonathan G Rennison
|
97e6f3062e
|
Adding of _t to (u)int types, and WChar to char32_t
See: eaae0bb5e
|
6 months ago |
Jonathan G Rennison
|
d5a7a67b8c
|
Merge branch 'master' into jgrpp
# Conflicts:
# .github/workflows/ci-build.yml
# src/ai/ai_gui.cpp
# src/blitter/32bpp_optimized.cpp
# src/blitter/32bpp_simple.cpp
# src/blitter/32bpp_sse2.cpp
# src/blitter/8bpp_optimized.cpp
# src/blitter/8bpp_simple.cpp
# src/blitter/null.cpp
# src/blitter/null.hpp
# src/company_gui.cpp
# src/game/game_gui.cpp
# src/genworld_gui.cpp
# src/gfx.cpp
# src/gfx_func.h
# src/graph_gui.cpp
# src/industry_gui.cpp
# src/linkgraph/linkgraphjob.cpp
# src/network/network_gui.cpp
# src/newgrf_debug_gui.cpp
# src/openttd.cpp
# src/pathfinder/npf/aystar.h
# src/road_gui.cpp
# src/saveload/order_sl.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/script/api/script_log.cpp
# src/script/api/script_town.cpp
# src/script/script_gui.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_table.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/sortlist_type.h
# src/spritecache.cpp
# src/spriteloader/grf.cpp
# src/spriteloader/grf.hpp
# src/spriteloader/spriteloader.hpp
# src/station_cmd.cpp
# src/station_cmd.h
# src/station_gui.cpp
# src/strings.cpp
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/town_gui.cpp
# src/vehicle_gui.cpp
# src/vehicle_gui_base.h
# src/video/opengl.cpp
# src/video/opengl.h
# src/widgets/dropdown.cpp
# src/widgets/dropdown_type.h
# src/window_gui.h
|
6 months ago |
Peter Nelson
|
dcf730f1f6
|
Codechange: Optionally allow passing state to GUIList sorter function.
GUIList sorter functions can currently only use global state, which makes per-window-instance sorting difficult.
|
7 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
|
12 months ago |
Jonathan G Rennison
|
d09b504bc5
|
Merge branch 'master' into jgrpp
# Conflicts:
# .github/workflows/ci-build.yml
# .github/workflows/release-linux.yml
# .github/workflows/release-macos.yml
# .github/workflows/release-source.yml
# .github/workflows/release.yml
# CMakeLists.txt
# COMPILING.md
# src/ai/ai_core.cpp
# src/ai/ai_gui.cpp
# src/bridge_gui.cpp
# src/company_gui.cpp
# src/console_cmds.cpp
# src/core/CMakeLists.txt
# src/core/smallmap_type.hpp
# src/disaster_vehicle.h
# src/effectvehicle_base.h
# src/fontcache.cpp
# src/game/game_core.cpp
# src/game/game_gui.cpp
# src/gamelog.cpp
# src/gamelog_internal.h
# src/group_gui.cpp
# src/linkgraph/linkgraph.h
# src/misc.cpp
# src/network/core/config.h
# src/network/core/udp.cpp
# src/network/network_chat_gui.cpp
# src/network/network_content_gui.cpp
# src/network/network_gui.cpp
# src/newgrf.cpp
# src/newgrf_gui.cpp
# src/newgrf_profiling.cpp
# src/newgrf_profiling.h
# src/object_gui.cpp
# src/openttd.cpp
# src/openttd.h
# src/order_gui.cpp
# src/os/windows/font_win32.cpp
# src/rail_gui.cpp
# src/road.cpp
# src/road_gui.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.h
# src/script/api/script_controller.cpp
# src/script/api/script_roadtypelist.cpp
# src/script/script_config.cpp
# src/script/script_config.hpp
# src/script/script_instance.cpp
# src/script/script_scanner.cpp
# src/script/squirrel.cpp
# src/script/squirrel_helper.hpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/settings_type.h
# src/table/settings/network_private_settings.ini
# src/timetable_gui.cpp
# src/vehicle.cpp
# src/vehicle_base.h
# src/window_gui.h
|
1 year ago |
PeterN
|
64930c343a
|
Codechange: Pass reference instead of pointer to GUI*Lists. (#10822)
Pointer-avoidance.
|
1 year ago |
Jonathan G Rennison
|
279e9c7ec6
|
TBTR: Tidy up includes
|
1 year ago |
Jonathan G Rennison
|
a9100e93cb
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/group_cmd.cpp
# src/lang/korean.txt
# src/lang/simplified_chinese.txt
# src/script/api/script_rail.cpp
# src/tunnelbridge_cmd.cpp
|
1 year ago |
Rubidium
|
8aeef665c7
|
Fix #10377, Fix 94167df: bad sorting of rail vehicles when primary variant is missing
|
1 year ago |
Jonathan G Rennison
|
64c210f770
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/build_vehicle_gui.cpp
# src/engine.cpp
# src/engine_func.h
# src/group_gui.cpp
# src/lang/english.txt
# src/newgrf.cpp
# src/saveload/oldloader_sl.cpp
# src/timetable_cmd.cpp
# src/timetable_cmd.h
# src/timetable_gui.cpp
|
2 years ago |
peter1138
|
94167dfd34
|
Change: Add variant hierarchy to build vehicle window list.
|
2 years ago |
Jonathan G Rennison
|
0a7a7ebcf0
|
Add build vehicle window sort mode: cargo capacity / running cost
|
2 years ago |
Jonathan G Rennison
|
781fd14205
|
Add sort by vehicle count to vehicle purchase window
|
4 years ago |
S. D. Cloudt
|
13cc8a0cee
|
Cleanup: Removed SVN headers
|
5 years ago |
glx
|
b52561fd38
|
Codechange: use std::sort() in EngList_Sort[Partial]()
|
5 years ago |
alberth
|
a49744b50c
|
(svn r26804) -Feature: Allow hiding of non-interesting engines in the build vehicle GUI.
|
10 years ago |
alberth
|
0e3647d4e3
|
(svn r26799) -Codechange: Export vehicle sorting data and functions.
|
10 years ago |
rubidium
|
e40eb8177a
|
(svn r23735) -Codechange: remove ~50 includes from headers that weren't needed
|
13 years ago |
alberth
|
4af8c2d5e1
|
(svn r23704) -Doc: Doxygen comment fixes and additions.
|
13 years ago |
frosch
|
bbc3409942
|
(svn r23080) -Feature: [NewGRF] Use variable 10 to enable vehicle GRFs to draw different sprites on the map and in various GUIs.
|
13 years ago |
rubidium
|
f94c83a387
|
(svn r18872) -Codechange: introduce PaletteID and use it
|
15 years ago |
rubidium
|
82fc28f77f
|
(svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header
|
15 years ago |
rubidium
|
1c5a92ae98
|
(svn r18121) -Codechange: pass the maximum left/right location to the Draw*Engine functions
|
15 years ago |
rubidium
|
17313b6e3f
|
(svn r17530) -Codechange: use QSortT instead of qsort for sorting EngineIDs
|
15 years ago |
alberth
|
5767972531
|
(svn r17328) -Codechange: Get the vehicle technical data as string rather than having it printed.
|
15 years ago |
alberth
|
1ba000be12
|
(svn r17327) -Codechange: Allow external use of GetEngineCategoryName().
|
15 years ago |
alberth
|
1a15f7e6a7
|
(svn r17325) -Codechange: Un-duplicate engine drawing routines.
|
15 years ago |
rubidium
|
7fbc33dae1
|
(svn r17248) -Fix: add GPL license notice where appropriate
|
15 years ago |
frosch
|
6ebe8d7fc6
|
(svn r16042) -Feature [FS#1941]: Allow filtering of vehicle purchase lists by cargo. Based on patch by sbr.
|
15 years ago |
peter1138
|
f954a93ee0
|
(svn r13314) -Codechange: Switch EngineList from std::vector to GUIList
|
16 years ago |
peter1138
|
f7a9c4f522
|
(svn r13287) -Codechange: move engine list gui code away from engine.cpp (and its headers) to engine_gui.cpp
|
16 years ago |