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
|
846737e56a
|
Fix refit in station with articulated vehicles with no capacity in leading part
|
12 months ago |
|
Jonathan G Rennison
|
2ed248a61d
|
Merge branch 'master' into jgrpp
# Conflicts:
# .github/workflows/ci-build.yml
# .github/workflows/release-linux.yml
# src/aircraft_cmd.cpp
# src/airport_gui.cpp
# src/articulated_vehicles.cpp
# src/build_vehicle_gui.cpp
# src/company_gui.cpp
# src/genworld_gui.cpp
# src/gfx_layout.cpp
# src/misc_gui.cpp
# src/newgrf.cpp
# src/newgrf_config.h
# src/newgrf_engine.cpp
# src/news_gui.cpp
# src/order_gui.cpp
# src/roadveh_cmd.cpp
# src/saveload/saveload.h
# src/saveload/vehicle_sl.cpp
# src/ship_cmd.cpp
# src/statusbar_gui.cpp
# src/table/settings/network_private_settings.ini
# src/table/settings/network_settings.ini
# src/toolbar_gui.cpp
# src/train_cmd.cpp
# src/vehicle_gui.cpp
|
1 year ago |
Peter Nelson
|
f177ce7c9a
|
Codechange: Base CargoArray off std::array.
This avoids needing to define array accessors and allows use of
default value initialization.
|
1 year ago |
|
Peter Nelson
|
76516d7f70
|
Codechange: Use IsValidCargoID/IsValidCargoType.
IsValidCargoType() is used only for unmapped IDs.
|
1 year ago |
|
Peter Nelson
|
4a5e413a6c
|
Cleanup: Remove unnecessary VehicleRandomBits()
Simple Random() assignment to byte does the same.
|
1 year ago |
|
Jonathan G Rennison
|
8cd7c9559f
|
Multi-part ships: Require feature test to enable callback 16
|
1 year ago |
|
Jonathan G Rennison
|
211fdd62b2
|
Initial support for multi-part (pseudo-articulated) ships
|
1 year ago |
|
Jonathan G Rennison
|
10e76b2788
|
Fix #10032: Capacities of articulated vehicles in build window
See also: #9954
|
1 year ago |
|
Jonathan G Rennison
|
c7e4dbf2f6
|
Fix displayed capacities/weights of articulated vehicles in build window
Simplify handling of multi-part capacities and refits
See: https://github.com/OpenTTD/OpenTTD/issues/9954
See: https://github.com/OpenTTD/OpenTTD/issues/10032
|
2 years ago |
|
Jonathan G Rennison
|
17d949980f
|
Fix assert fail when building virtual train from engine with invalid cargo
|
3 years ago |
Matt Kimber
|
9b28b15e67
|
Codechange: create MutableSpriteCache to remove the need to cast Vehicle to a mutable type in render methods
|
3 years ago |
|
Jonathan G Rennison
|
f077c3bf6e
|
Merge branch 'master' into jgrpp
|
4 years ago |
glx
|
b50d77b831
|
Fix #8064: Incorrect display of refit capacity
|
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
|
5a2e498182
|
TBTR: Avoid articulated/rear units being added to tile hash
|
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
|
ba34ec7ade
|
Merge branch 'master' into jgrpp
Replace build and refit, and group collapse implementations
Fix template creation build and refit
# Conflicts:
# Makefile.bundle.in
# config.lib
# src/animated_tile.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_base.hpp
# src/blitter/8bpp_base.hpp
# src/blitter/null.hpp
# src/build_vehicle_gui.cpp
# src/command.cpp
# src/command_func.h
# src/console_gui.cpp
# src/core/smallstack_type.hpp
# src/date.cpp
# src/debug.cpp
# src/genworld_gui.cpp
# src/ground_vehicle.hpp
# src/group_gui.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.h
# src/main_gui.cpp
# src/misc_gui.cpp
# src/network/core/game.h
# src/network/core/packet.cpp
# src/network/core/udp.cpp
# src/network/core/udp.h
# src/network/network_content.cpp
# src/network/network_type.h
# src/network/network_udp.cpp
# src/newgrf_house.h
# src/openttd.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/os/unix/crashlog_unix.cpp
# src/os/windows/crashlog_win.cpp
# src/osk_gui.cpp
# src/pathfinder/opf/opf_ship.cpp
# src/rail_cmd.cpp
# src/rail_gui.cpp
# src/saveload/saveload.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/smallmap_gui.h
# src/station_base.h
# src/station_cmd.cpp
# src/table/gameopt_settings.ini
# src/table/newgrf_debug_data.h
# src/table/settings.ini
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/vehiclelist.cpp
# src/viewport.cpp
# src/widgets/dropdown.cpp
# src/window_gui.h
|
5 years ago |
|
peter1138
|
e6bb90543e
|
Change: Show additional cost and refitted capacity in build vehicle window.
|
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
|
4cebebcf68
|
Change: Add CargoTypes type for cargo masks. (#6790)
|
6 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
|
09291a3b74
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/blitter/32bpp_anim.cpp
# src/rail_gui.cpp
# src/saveload/saveload.cpp
# src/train_cmd.cpp
# src/vehicle_base.h
|
8 years ago |
|
frosch
|
d188d02384
|
(svn r27580) -Fix [FS#6395]: Set date of last service on construction also for wagons and articulated parts.
|
8 years ago |
|
frosch
|
c9f68ede59
|
(svn r27580) -Fix [FS#6395]: Set date of last service on construction also for wagons and articulated parts.
|
8 years ago |
|
Jonathan G Rennison
|
a1b60bcc85
|
Fix build and refit cost estimation with artic/multihead vehicles.
Trailing vehicle part refit costs were not being added to the cost
estimate.
|
9 years ago |
rubidium
|
ac269a3f08
|
(svn r26863) -Codechange: move a number of Vehicle* functions into the Vehicle class
|
10 years ago |
|
rubidium
|
6c2abf0930
|
(svn r26863) -Codechange: move a number of Vehicle* functions into the Vehicle class
|
10 years ago |
alberth
|
1e7992d4f9
|
(svn r26849) -Fix[FS#6113]: Better display of refit information in articulated vehicles.
|
10 years ago |
|
alberth
|
bc84c52b30
|
(svn r26849) -Fix[FS#6113]: Better display of refit information in articulated vehicles.
|
10 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 |
|
rubidium
|
6b746167e4
|
(svn r25259) -Codechange: track capacities and usage of links
|
11 years ago |
|
rubidium
|
3947453277
|
(svn r25259) -Codechange: track capacities and usage of links
|
11 years ago |
planetmaker
|
f00d9976f9
|
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
|
12 years ago |
|
planetmaker
|
c24374f99c
|
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
|
12 years ago |
yexo
|
d7c065b625
|
(svn r24029) -Change: [NoAI] make AIEngine::IsArticulated return true if the articulated callback flag is set, don't try to run the callback.
|
12 years ago |
|
yexo
|
1f0593e7ca
|
(svn r24029) -Change: [NoAI] make AIEngine::IsArticulated return true if the articulated callback flag is set, don't try to run the callback.
|
12 years ago |
|
frosch
|
fb9562c83a
|
(svn r23965) -Fix [FS#5070]: Refittability should never depend on the current capacity of a vehicle.
|
12 years ago |
|
frosch
|
5167f2be29
|
(svn r23965) -Fix [FS#5070]: Refittability should never depend on the current capacity of a vehicle.
|
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 |
truebrain
|
92c60447dc
|
(svn r23713) -Codechange: split VehicleMove() into two functions, to minimalize the work done where possible
|
13 years ago |
|
truebrain
|
0d929e877f
|
(svn r23713) -Codechange: split VehicleMove() into two functions, to minimalize the work done where possible
|
13 years ago |
|
rubidium
|
24263638bf
|
(svn r23526) -Codechange: unify cargos vs cargoes
|
13 years ago |
|
rubidium
|
3d88c74389
|
(svn r23526) -Codechange: unify cargos vs cargoes
|
13 years ago |