Jonathan G Rennison
|
18a42664fc
|
Merge branch 'master' into jgrpp
Remove 'byte' typedef
|
1 week ago |
|
Jonathan G Rennison
|
28e74005d0
|
Remove various uses of lengthof on std::array
|
1 month ago |
Patric Stout
|
a3cfd23cf9
|
Codechange: rename byte to uint8_t (#12308)
|
2 months ago |
|
Jonathan G Rennison
|
fe730bce31
|
Merge branch 'master' into jgrpp
# Conflicts:
# .github/workflows/ci-build.yml
# .github/workflows/codeql.yml
# .github/workflows/release-linux.yml
# .github/workflows/release-macos.yml
# .github/workflows/release-windows.yml
# src/map.cpp
# src/music/midifile.hpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/pathfinder/yapf/yapf_rail.cpp
# src/pbs.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.h
# src/saveload/vehicle_sl.cpp
# src/script/api/script_text.cpp
# src/ship_cmd.cpp
# src/train_cmd.cpp
# src/vehicle.cpp
# src/vehicle_base.h
# src/vehicle_func.h
# src/vehicle_gui.cpp
# src/vehicle_gui_base.h
# src/viewport.cpp
# src/waypoint_cmd.cpp
|
2 months ago |
Rubidium
|
27eadc13ec
|
Codechange: rename TILE_ADD(XY) to TileAdd(XY)
|
2 months ago |
|
Jonathan G Rennison
|
7ce06e22b8
|
Split date types into calendar and economy dates
See: 735abfe1
|
3 months ago |
|
Jonathan G Rennison
|
cfebbfac8c
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/autoreplace_cmd.cpp
# src/company_base.h
# src/company_gui.cpp
# src/cpu.cpp
# src/debug.h
# src/group.h
# src/group_cmd.cpp
# src/house.h
# src/industry.h
# src/newgrf_house.cpp
# src/news_type.h
# src/openttd.cpp
# src/saveload/company_sl.cpp
# src/settings_type.h
# src/sl/oldloader_sl.cpp
# src/story.cpp
# src/table/town_land.h
# src/viewport.cpp
|
3 months ago |
|
Jonathan G Rennison
|
5404be172c
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/core/bitmath_func.cpp
# src/core/bitmath_func.hpp
# src/core/geometry_type.hpp
# src/game/game_text.hpp
# src/graph_gui.cpp
# src/pathfinder/npf/npf.cpp
# src/script/api/script_text.cpp
# src/spritecache.cpp
# src/track_func.h
|
4 months ago |
Peter Nelson
|
c0ab436077
|
Codechange: Store Colours in Colours type. (#11625)
This reduces casts, some magic numbers, and introduces a bit of type-safety.
|
4 months ago |
|
Jonathan G Rennison
|
3050620189
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/autoreplace_cmd.cpp
# src/build_vehicle_gui.cpp
# src/cargotype.cpp
# src/economy.cpp
# src/engine_gui.cpp
# src/industry_cmd.cpp
# src/industry_gui.cpp
# src/linkgraph/linkgraph_gui.h
# src/linkgraph/refresh.cpp
# src/linkgraph/refresh.h
# src/newgrf.cpp
# src/newgrf_airporttiles.h
# src/newgrf_roadstop.cpp
# src/newgrf_station.cpp
# src/newgrf_station.h
# src/order_base.h
# src/order_cmd.cpp
# src/order_func.h
# src/order_gui.cpp
# src/pathfinder/pathfinder_type.h
# src/saveload/afterload.cpp
# src/subsidy_base.h
# src/vehicle_cmd.cpp
# src/vehicle_gui.cpp
# src/vehicle_gui_base.h
|
4 months ago |
|
Jonathan G Rennison
|
97e6f3062e
|
Adding of _t to (u)int types, and WChar to char32_t
See: eaae0bb5e
|
4 months ago |
|
Peter Nelson
|
ab535c0a86
|
Codechange: Add base() method to StrongType to allow access to the base type without casting. (#11445)
This removes the ability to explicitly cast to the base type, but the requirement
to use .base() means the conversion is still explicit.
|
6 months ago |
frosch
|
b6c8f301be
|
Codechange: Silence warnings about intentionally unused parameters.
|
8 months ago |
|
PeterN
|
89b84222d3
|
Fix: NewGRF house class mappings were not reset between games. (#11279)
(cherry picked from commit 6643c010bd)
|
8 months ago |
|
PeterN
|
6643c010bd
|
Fix: NewGRF house class mappings were not reset between games. (#11279)
|
8 months ago |
|
Patric Stout
|
299570b2c1
|
Codechange: make TimerGameCalendar Date and Year types strongly typed (#10761)
|
9 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
|
10 months ago |
|
Jonathan G Rennison
|
3a47b421b0
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/company_cmd.cpp
# src/core/overflowsafe_type.hpp
# src/economy.cpp
# src/engine_base.h
# src/ground_vehicle.cpp
# src/group_gui.cpp
# src/industry_cmd.cpp
# src/industry_gui.cpp
# src/newgrf_commons.cpp
# src/newgrf_engine.cpp
# src/newgrf_industries.cpp
# src/newgrf_object.cpp
# src/newgrf_roadstop.cpp
# src/newgrf_station.cpp
# src/rail_gui.cpp
# src/road_cmd.h
# src/road_gui.cpp
# src/saveload/afterload.cpp
# src/script/api/script_log.cpp
# src/script/api/script_log.hpp
# src/settings_gui.cpp
# src/settingsgen/settingsgen.cpp
# src/station_cmd.cpp
# src/station_cmd.h
# src/station_gui.cpp
# src/strgen/strgen.cpp
# src/string_func.h
# src/string_type.h
# src/table/settings/network_private_settings.ini
# src/tests/math_func.cpp
# src/textfile_gui.cpp
# src/timetable_gui.cpp
# src/town_cmd.cpp
# src/vehicle.cpp
# src/waypoint_cmd.cpp
# src/waypoint_cmd.h
# src/widgets/dropdown.cpp
|
12 months ago |
|
Peter Nelson
|
76516d7f70
|
Codechange: Use IsValidCargoID/IsValidCargoType.
IsValidCargoType() is used only for unmapped IDs.
|
1 year ago |
|
Rubidium
|
fb856e16c1
|
Codechange: replace some min/clamp constructs to ClampTo
|
1 year ago |
|
Jonathan G Rennison
|
ce9480ee20
|
Truncate house variable 47 TileX part if too large
|
1 year ago |
|
Jonathan G Rennison
|
4c1406a4b5
|
Add: NewGRF road stops
|
1 year ago |
|
Rubidium
|
de6bc8e692
|
Codechange: move TILE_MASK to Map::WrapToMap
|
1 year ago |
|
Jonathan G Rennison
|
3d7e5d5369
|
Avoid unnecessary viewport redraws for unused tile loop house triggers
|
2 years ago |
|
Jonathan G Rennison
|
8eb86fa6c7
|
GRF: Use access mask when evaluating get nearby tile information variable
|
2 years ago |
|
Jonathan G Rennison
|
23c472d2a0
|
Add support for road stop animation, availability callback
Add animation, callback mask, general flags properties
Add animation frame variables
|
2 years ago |
|
Jonathan G Rennison
|
33dc6c9688
|
Add NewGRF VarAction2 variable remapping infrastructure
|
2 years ago |
|
rubidium42
|
55a11710a6
|
Codechange: convert printf DEBUG statements to fmt Debug statements
|
3 years ago |
|
Jonathan G Rennison
|
2ad446369d
|
Cache animated tile speed, use btree map for animated tiles
|
4 years ago |
|
Jonathan G Rennison
|
352b361e1b
|
Viewport: Replace viewport mark dirty if zoom level below with flags param
Fix missing flags for tracerestrict and effect vehicles
|
4 years ago |
|
Jonathan G Rennison
|
810bfd276e
|
Add several NewGRF variables to vehicle image callback whitelist
Add vehicle flags to control cached image invalidation
Various refactorings
|
4 years ago |
|
Jonathan G Rennison
|
43c538fa7d
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/town_cmd.cpp
|
4 years ago |
Yexo
|
a82572d0f5
|
Codechange: remove has_newhouses global
|
4 years ago |
|
Jonathan G Rennison
|
f8d6e781ba
|
Merge branch 'master' into jgrpp
# Conflicts:
# projects/openttd_vs140.vcxproj.filters
# projects/openttd_vs141.vcxproj.filters
# projects/openttd_vs142.vcxproj.filters
# src/base_consist.h
# src/company_base.h
# src/newgrf_config.cpp
# src/newgrf_config.h
# src/openttd.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/saveload/station_sl.cpp
# src/settings.cpp
# src/signs_base.h
# src/string.cpp
# src/string_func.h
# src/table/misc_settings.ini
# src/table/settings.h.preamble
# src/town_cmd.cpp
# src/vehicle.cpp
# src/vehicle_cmd.cpp
# src/video/cocoa/cocoa_v.mm
# src/video/null_v.cpp
|
4 years ago |
|
Jonathan G Rennison
|
b9eaef9fe1
|
Fix 81a67b5b: Fix fake house case not being handled in GetHouseCallback
|
4 years ago |
|
Jonathan G Rennison
|
81a67b5b24
|
Remove fake/real indirection in HouseResolverObject
|
4 years ago |
|
Jonathan G Rennison
|
81a1094cc8
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/console_cmds.cpp
# src/date.cpp
# src/economy.cpp
# src/misc.cpp
# src/newgrf_house.cpp
|
4 years ago |
Niels Martin Hansen
|
c8779fb311
|
Feature: NewGRF callback profiling (#7868)
Adds a console command newgrf_profile to collect some profiling data about NewGRF action 2 callbacks and produce a CSV file.
|
4 years ago |
|
Jonathan G Rennison
|
7960db35f2
|
Merge branch 'master' into jgrpp
# Conflicts:
# config.lib
# projects/openttd_vs140.vcxproj
# projects/openttd_vs140.vcxproj.filters
# projects/openttd_vs141.vcxproj
# projects/openttd_vs141.vcxproj.filters
# projects/openttd_vs142.vcxproj
# projects/openttd_vs142.vcxproj.filters
# src/aircraft_cmd.cpp
# src/base_station_base.h
# src/core/pool_type.hpp
# src/disaster_vehicle.cpp
# src/economy.cpp
# src/engine.cpp
# src/group.h
# src/group_cmd.cpp
# src/group_gui.cpp
# src/lang/english.txt
# src/lang/german.txt
# src/linkgraph/linkgraph_gui.cpp
# src/network/network_command.cpp
# src/network/network_server.cpp
# src/openttd.cpp
# src/order_cmd.cpp
# src/road_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/cargopacket_sl.cpp
# src/saveload/linkgraph_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/station_sl.cpp
# src/saveload/town_sl.cpp
# src/saveload/vehicle_sl.cpp
# src/screenshot.cpp
# src/screenshot.h
# src/settings_gui.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/station.cpp
# src/station_cmd.cpp
# src/table/settings.ini
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/train.h
# src/train_cmd.cpp
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_base.h
# src/vehiclelist.cpp
# src/window_type.h
|
4 years ago |
glx
|
ee7a8eebca
|
Codechange: Replace FOR_ALL_TOWNS with range-based for loops
|
4 years ago |
|
Jonathan G Rennison
|
cbdd9f84d8
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/console_gui.cpp
# src/lang/korean.txt
# src/video/sdl2_v.cpp
# src/video/sdl2_v.h
# src/window.cpp
# src/window_gui.h
|
5 years ago |
S. D. Cloudt
|
13cc8a0cee
|
Cleanup: Removed SVN headers
|
5 years ago |
|
Jonathan G Rennison
|
5155afee9b
|
Ensure nearby stations list updated in CBID_HOUSE_DESTRUCTION callback
|
5 years ago |
|
Jonathan G Rennison
|
674732cd68
|
Merge: Codechange: Use null pointer literal instead of the NULL macro
|
5 years ago |
Henry Wilson
|
7c8e7c6b6e
|
Codechange: Use null pointer literal instead of the NULL macro
|
5 years ago |
|
Jonathan G Rennison
|
5e6d283463
|
Merge branch 'master' into jgrpp
Remove the viewport sign cache as this is now superseded by the kd tree
implementation
# Conflicts:
# src/crashlog.cpp
# src/lang/english.txt
# src/misc.cpp
# src/pathfinder/follow_track.hpp
# src/pbs.cpp
# src/rail_cmd.cpp
# src/saveload/vehicle_sl.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/ship_cmd.cpp
# src/station.cpp
# src/station_base.h
# src/station_cmd.cpp
# src/table/settings.ini
# src/thread/thread_morphos.cpp
# src/town_cmd.cpp
# src/train_cmd.cpp
# src/viewport.cpp
# src/waypoint.cpp
|
5 years ago |
|
peter1138
|
ed6084523d
|
Codechange: Convert StationList from SmallVector to std::set.
|
5 years ago |
|
Jonathan G Rennison
|
9e1e074c2b
|
Update existing assertions to log tile information where suitable
|
6 years ago |
|
Jonathan G Rennison
|
56be293107
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/blitter/32bpp_anim.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_anim_sse2.cpp
# src/blitter/32bpp_base.cpp
# src/blitter/32bpp_base.hpp
# src/ground_vehicle.cpp
# src/linkgraph/linkgraph_gui.h
# src/main_gui.cpp
# src/newgrf_house.cpp
# src/newgrf_house.h
# src/town_cmd.cpp
# src/vehicle_base.h
# src/viewport_gui.cppp
|
6 years ago |
PeterN
|
4cebebcf68
|
Change: Add CargoTypes type for cargo masks. (#6790)
|
6 years ago |