Jonathan G Rennison
|
8581808952
|
Merge tag '14.0-beta2' into jgrpp
# Conflicts:
# CMakeLists.txt
# src/cargotype.cpp
# src/console_cmds.cpp
# src/graph_gui.cpp
# src/industry_cmd.cpp
# src/industrytype.h
# src/misc_gui.cpp
# src/network/network_client.cpp
# src/newgrf.cpp
# src/newgrf_town.cpp
# src/object_cmd.cpp
# src/openttd.cpp
# src/pathfinder/water_regions.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/table/build_industry.h
# src/table/engines.h
# src/vehicle.cpp
# src/vehicle_cmd.cpp
# src/vehicle_gui.cpp
|
3 months ago |
|
Jonathan G Rennison
|
fdd666f66a
|
Merge tag '14.0-beta1' into jgrpp
# Conflicts:
# src/3rdparty/squirrel/squirrel/sqcompiler.cpp
# src/aircraft.h
# src/animated_tile.h
# src/base_consist.h
# src/cargotype.h
# src/company_gui.cpp
# src/console_cmds.cpp
# src/core/overflowsafe_type.hpp
# src/engine_gui.cpp
# src/industry_gui.cpp
# src/lang/english.txt
# src/music/extmidi.cpp
# src/network/core/network_game_info.cpp
# src/network/network_server.cpp
# src/newgrf.cpp
# src/newgrf_industries.cpp
# src/order_base.h
# src/order_cmd.cpp
# src/order_gui.cpp
# src/order_type.h
# src/os/macosx/misc_osx.cpp
# src/os/windows/crashlog_win.cpp
# src/rail_gui.cpp
# src/rail_gui.h
# src/roadveh.h
# src/roadveh_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/company_sl.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/saveload/saveload_error.hpp
# src/script/api/script_town.cpp
# src/settingsgen/settingsgen.cpp
# src/ship.h
# src/ship_cmd.cpp
# src/smallmap_gui.cpp
# src/spritecache.cpp
# src/stdafx.h
# src/strgen/strgen.cpp
# src/strgen/strgen.h
# src/table/settings/script_settings.ini
# src/timetable_cmd.cpp
# src/timetable_gui.cpp
# src/town.h
# src/town_cmd.cpp
# src/town_cmd.h
# src/town_gui.cpp
# src/train.h
# src/train_cmd.cpp
# src/tree_cmd.cpp
# src/vehicle.cpp
# src/vehicle_base.h
# src/vehicle_cmd.cpp
# src/vehicle_gui.cpp
# src/vehiclelist.cpp
# src/waypoint_base.h
# src/widget.cpp
|
3 months ago |
Peter Nelson
|
2fd9096070
|
Change: Decouple and remove landscape-dependent cargo types. (#11719)
Cargo types of default engines, industries and houses are now specified in terms of label.
|
3 months ago |
|
Peter Nelson
|
60dcf3b5e2
|
Codechange: Rename TownEffect to TownAcceptanceEffect.
This makes it clearer that TownEffect only affects acceptance behaviour.
|
3 months ago |
|
Jonathan G Rennison
|
97e6f3062e
|
Adding of _t to (u)int types, and WChar to char32_t
See: eaae0bb5e
|
4 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
|
5 months ago |
SamuXarick
|
fddcaef74a
|
Codechange: Use town zone constants instead of magic numbers
|
5 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 |
Tyler Trahan
|
fca2b37726
|
Codechange: Move Ticks into their own class
|
8 months ago |
Patric Stout
|
07730584d7
|
Codechange: make explicit when a TileIndex is cast to its basetype (#11190)
This prevents people accidentially assigning a TileIndex to a Date
or any other type they shouldn't.
|
9 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
|
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
|
11 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
|
e6740046ee
|
Codechange: Use range-for iteration.
|
1 year ago |
|
Rubidium
|
19ec4e8beb
|
Codechange: replace ClampToI32/U16 with ClampTo<int32_t/uint16_t>
|
1 year ago |
|
Jonathan G Rennison
|
64925aedf8
|
Add town variable for town tile X and Y coordinates
|
1 year ago |
|
Jonathan G Rennison
|
9fd01d57cc
|
Rename town zone extended variable identifiers
|
1 year ago |
|
Jonathan G Rennison
|
ae99f667b0
|
NewGRF: Add generic town callback to set town zone radii
|
1 year ago |
|
Jonathan G Rennison
|
93c34775e4
|
NewGRF: Add town variables for uncapped house count, population and zone radii
Add feature name
|
1 year 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
|
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
|
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
|
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
|
ad1c402ad8
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/debug.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/settings_type.h
# src/town_cmd.cpp
# src/window.cpp
|
6 years ago |
Pavel Stupnikov
|
fef8b831a9
|
Change: Switch town growth rate and counter to actual game ticks (#6763)
|
6 years ago |
|
Jonathan G Rennison
|
385a2552e9
|
Merge branch 'enhanced_viewport_overlay' into jgrpp
|
6 years ago |
|
frosch
|
d9d669dcf8
|
(svn r27984) -Codechange: Make ScopeResolver constructors/destructors inlineable. Speedup sprite resolving by about 8 percent.
|
6 years ago |
|
frosch
|
29dca1be3b
|
(svn r27984) -Codechange: Make ScopeResolver constructors/destructors inlineable. Speedup sprite resolving by about 8 percent.
|
6 years ago |
patch-import
|
19dcbb1cb9
|
Import Picking and placing single houses in scenario editor patch
Minor whitespace fixes
http://www.tt-forums.net/viewtopic.php?f=33&t=68894&view=unread#p1099696
|
9 years ago |
|
rubidium
|
2be4215f43
|
(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 |
|
rubidium
|
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 |
|
frosch
|
74916a103e
|
(svn r26175) -Add: Log in desync output when persistent storage is discarded.
|
11 years ago |
|
frosch
|
49852e3dac
|
(svn r26175) -Add: Log in desync output when persistent storage is discarded.
|
11 years ago |
|
frosch
|
6c63c98d7f
|
(svn r26085) -Codechange: Pass ResolverObjects as reference instead of pointer since they are never NULL.
|
11 years ago |
|
frosch
|
db894b0b3f
|
(svn r26085) -Codechange: Pass ResolverObjects as reference instead of pointer since they are never NULL.
|
11 years ago |
alberth
|
6c1ff5f772
|
(svn r24693) -Doc: Add some doxymentation into the newgrf code.
|
12 years ago |
|
alberth
|
33ff55a8f1
|
(svn r24693) -Doc: Add some doxymentation into the newgrf code.
|
12 years ago |
|
alberth
|
8a297ca5f1
|
(svn r24692) -Cleanup: Cleanup final parts of the old resolver code.
|
12 years ago |
|
alberth
|
4c9bea2a71
|
(svn r24692) -Cleanup: Cleanup final parts of the old resolver code.
|
12 years ago |
|
alberth
|
818332f3e8
|
(svn r24679) -Codechange: Add resolver classes for towns.
|
12 years ago |
|
alberth
|
b985c4c0f8
|
(svn r24679) -Codechange: Add resolver classes for towns.
|
12 years ago |
|
rubidium
|
76d5833650
|
(svn r24179) -Codechange: move some variables of Town to TownCache
|
12 years ago |
|
rubidium
|
41e5c839e0
|
(svn r24179) -Codechange: move some variables of Town to TownCache
|
12 years ago |
|
rubidium
|
d5eeab43b7
|
(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files
|
13 years ago |
|
rubidium
|
6d6be50ae0
|
(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files
|
13 years ago |