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
|
4 months ago |
frosch
|
b1718478c8
|
Codechange: Replace old non-standard attributes with C++17/20 standard attributes.
|
4 months ago |
Jonathan G Rennison
|
b01fd1607a
|
Re-order various structs to reduce holes/padding
|
5 months ago |
Tyler Trahan
|
735abfe111
|
Codechange: Split dates and timers into Economy and Calendar time (#10700)
|
5 months ago |
Jonathan G Rennison
|
97e6f3062e
|
Adding of _t to (u)int types, and WChar to char32_t
See: eaae0bb5e
|
5 months ago |
frosch
|
b6c8f301be
|
Codechange: Silence warnings about intentionally unused parameters.
|
9 months ago |
Jonathan G Rennison
|
c6ce9ce687
|
Add road vehicle flags for whether any part is on level crossing
|
9 months ago |
Jonathan G Rennison
|
2ae4e5bdc1
|
Change road vehicle path cache to be optional and use ring buffers
Show path cache in debug window
|
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 |
Peter Nelson
|
56085be9bd
|
Codechange: Move includes for common STL headers to stdafx.
|
1 year ago |
Jonathan G Rennison
|
4ec6a99dd8
|
Add GetTileTrackStatus wrapper for when red signals part is not needed
|
1 year ago |
Jonathan G Rennison
|
f7d62a1767
|
Add road/tram type flag to disallow collisions with trains
|
1 year ago |
Jonathan G Rennison
|
0310fb0cdc
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/lang/czech.txt
# src/lang/galician.txt
# src/lang/german.txt
# src/order_cmd.cpp
# src/saveload/afterload.cpp
# src/ship.h
# src/vehicle.cpp
|
1 year ago |
Rubidium
|
375a5b8e3f
|
Codechange: refactor FindClosestDepot to not use pointers, but return a struct
|
1 year ago |
Jonathan G Rennison
|
1f36c3f3e4
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/ai/ai_gui.cpp
# src/build_vehicle_gui.cpp
# src/genworld_gui.cpp
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/newgrf_sound.cpp
# src/roadveh.h
# src/sound.cpp
# src/station_cmd.cpp
# src/train.h
# src/train_cmd.cpp
# src/vehicle.cpp
# src/vehicle_base.h
# src/vehicle_gui.cpp
|
2 years ago |
Henry Wilson
|
59dbcdb5ba
|
Feature: Display power-to-weight ratio in ground vehicle details GUI
|
2 years ago |
Henry Wilson
|
b304c06a4a
|
Codechange: Use override specifier for Train and RoadVehicle structs
|
2 years ago |
Henry Wilson
|
89cf0d5da8
|
Codechange: Factor cargotype weight conversion magic numbers
|
2 years ago |
Jonathan G Rennison
|
29a1e49c28
|
Change various asserts to not be included in release builds
|
2 years ago |
Jonathan G Rennison
|
6d877b5e70
|
Reduce redundant calls to get current max speed for trains and RVs
Between ShowVisualEffect() and UpdateSpeed()
|
2 years ago |
Jonathan G Rennison
|
5b7db9d849
|
Merge branch 'master' into jgrpp
# Conflicts:
# .github/workflows/ci-build.yml
# .github/workflows/commit-checker.yml
# src/command.cpp
# src/company_cmd.cpp
# src/company_gui.cpp
# src/crashlog.cpp
# src/economy.cpp
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/misc_gui.cpp
# src/newgrf_config.cpp
# src/openttd.cpp
# src/settings_gui.cpp
# src/ship_cmd.cpp
# src/table/settings/gui_settings.ini
|
2 years ago |
Tyler Trahan
|
f4ca94d3f6
|
Codechange: Revenue is not the same as Income
Income is revenue minus costs. Let's name things correctly (without breaking the script API).
|
2 years ago |
Jonathan G Rennison
|
ba65a5bab5
|
Run most "daily" vehicle tasks at a fixed frequency at day lengths >= 8
This includes: running costs, track sharing costs, breakdown checks,
servicing checks, order checks
|
3 years ago |
Jonathan G Rennison
|
95fb222852
|
Distribute articulated vehicle weight evenly between articulated parts
Instead of allocating it all to the first part
This improves realistic braking behaviour for long articulated consists
|
3 years ago |
Jonathan G Rennison
|
3a75f13874
|
Allow drive-through road stops to be one-way
|
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
|
5 years ago |
glx
|
d8a1be48cd
|
Codechange: Replace vehicle related FOR_ALL with range-based for loops
|
5 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
|
ba8ed880c1
|
Merge branch 'master' into jgrpp-nrt
Merge NRT feature
# Conflicts:
# docs/landscape.html
# docs/landscape_grid.html
# src/bridge_map.h
# src/build_vehicle_gui.cpp
# src/company_base.h
# src/company_cmd.cpp
# src/misc_gui.cpp
# src/newgrf.cpp
# src/newgrf_engine.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/npf/npf.cpp
# src/road_cmd.cpp
# src/road_func.h
# src/road_gui.cpp
# src/road_map.h
# src/road_type.h
# src/roadveh_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/company_sl.cpp
# src/script/api/script_bridge.cpp
# src/table/newgrf_debug_data.h
# src/tile_cmd.h
# src/town_cmd.cpp
# src/tunnel_map.h
# src/tunnelbridge_cmd.cpp
|
5 years ago |
Jonathan G Rennison
|
36eb4165b8
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/bridge_map.h
# src/crashlog.cpp
# src/industry.h
# src/linkgraph/linkgraph_type.h
# src/order_type.h
# src/saveload/afterload.cpp
# src/settings.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/spritecache.cpp
# src/stdafx.h
# src/table/settings.h.preamble
# src/train.h
# src/vehicle.cpp
# src/viewport.cpp
# src/viewport_func.h
# src/widgets/station_widget.h
# src/zoom_func.h
# src/zoom_type.h
|
5 years ago |
Jonathan G Rennison
|
829c635add
|
Add road layout change counter, add to road veh path caches
Update layout counter when non-leaf road bits are added or removed
|
5 years ago |
peter1138
|
c02ef3e456
|
Feature: Add NotRoadTypes (NRT)
|
5 years ago |
Charles Pigott
|
9f3928658b
|
Codechange: Remove Track{dir,}{Bits,}Byte types
|
5 years ago |
Jonathan G Rennison
|
a6ea1ea408
|
Allow articulated road vehicles to overtake other vehicles
Add setting
|
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 |
PeterN
|
6c6971fb43
|
Add: Road vehicle path cache. (#7261)
|
5 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
|
a07394a63a
|
Change: Remove direction parameter from Vehicle::UpdateDeltaXY. (#6792)
The value is either unused or always the same as this->direction.
|
6 years ago |
Jonathan G Rennison
|
dda20d08c1
|
Merge branch 'improved_breakdowns' into jgrpp
Update German and Korean language strings
# Conflicts:
# src/saveload/extended_ver_sl.cpp
|
7 years ago |
Jonathan G Rennison
|
0a80aec634
|
Implement critical breakdown speed reduction for road vehicles
|
7 years ago |
Jonathan G Rennison
|
0073c4e71e
|
Road vehicles may no longer be stopped on level crossings.
|
7 years ago |
Jonathan G Rennison
|
dcbde21f18
|
Merge branch 'save_ext' into improved_breakdowns
# Conflicts:
# src/train_cmd.cpp
|
8 years ago |
Jonathan G Rennison
|
7f10d83a4a
|
Merge branch 'template_train_replacement' into jgrpp
# Conflicts:
# src/linkgraph/linkgraphjob.cpp
# src/saveload/extended_ver_sl.cpp
# src/train_cmd.cpp
# src/vehicle_base.h
|
8 years ago |
frosch
|
d2393b4f6c
|
(svn r27666) -Codechange: Pass vehicle sprites around using a struct VehicleSpriteSeq.
|
8 years ago |
frosch
|
f36539837e
|
(svn r27666) -Codechange: Pass vehicle sprites around using a struct VehicleSpriteSeq.
|
8 years ago |
Jonathan G Rennison
|
80d52eb20e
|
Improved breakdowns patch: fix various issues
* Whitespace/formatting
* Fix setting lang string
* Fix spelling of VRF_TO_HEAVY
|
9 years ago |
patch-import
|
9f5164b403
|
Import Improved Breakdowns patch
Fix trailing whitespace
http://www.tt-forums.net/viewtopic.php?p=1146419#p1146419
|
9 years ago |