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 |
Charles Pigott
|
5b34c8019f
|
Codechange: Remove Company/OwnerByte types
|
5 years ago |
|
Charles Pigott
|
69a6c494bf
|
Codechange: Set VehicleType's base type to byte instead of using VehicleTypeByte
|
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 |
|
Henry Wilson
|
c01a2e2a81
|
Codechange: Removed SmallVector completely
|
5 years ago |
|
Jonathan G Rennison
|
a6a1e67dbc
|
Scale displayed running costs by day length factor
|
7 years ago |
alberth
|
ad88588481
|
(svn r27797) -Add: Display aircraft type in its vehicle window (patch by Samu)
|
7 years ago |
|
alberth
|
e2e9bd0b25
|
(svn r27797) -Add: Display aircraft type in its vehicle window (patch by Samu)
|
7 years ago |
|
alberth
|
f72ad87540
|
(svn r26802) -Add: Command to set visibility of an engine for a company (based on patch by Juanjo).
|
10 years ago |
|
alberth
|
44d2f6a988
|
(svn r26802) -Add: Command to set visibility of an engine for a company (based on patch by Juanjo).
|
10 years ago |
planetmaker
|
c24374f99c
|
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
|
12 years ago |
|
planetmaker
|
f00d9976f9
|
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
|
12 years ago |
frosch
|
0e4b212c45
|
(svn r24810) -Fix: Make engine preview offers more robust wrt. changes in the company ranking.
|
12 years ago |
|
frosch
|
9f0e8399b0
|
(svn r24810) -Fix: Make engine preview offers more robust wrt. changes in the company ranking.
|
12 years ago |
rubidium
|
e40eb8177a
|
(svn r23735) -Codechange: remove ~50 includes from headers that weren't needed
|
13 years ago |
|
rubidium
|
0cfe86cead
|
(svn r23735) -Codechange: remove ~50 includes from headers that weren't needed
|
13 years ago |
truebrain
|
1c9bec1999
|
(svn r23640) -Fix: stop using FORCEINLINE (1/3rd of the instances were, the others were still regular inline), but make sure inline is always a 'forced' inline (I am looking at you MSVC)
|
13 years ago |
|
truebrain
|
aa1a0053b0
|
(svn r23640) -Fix: stop using FORCEINLINE (1/3rd of the instances were, the others were still regular inline), but make sure inline is always a 'forced' inline (I am looking at you MSVC)
|
13 years ago |
michi_cc
|
def8e7215b
|
(svn r23504) -Feature: Aircraft range.
|
13 years ago |
|
michi_cc
|
957b643ae6
|
(svn r23504) -Feature: Aircraft range.
|
13 years ago |
|
frosch
|
0fbad47371
|
(svn r23176) -Codechange: Deduplicate code between Engine::DetermineCapacity() and Engine::GetDisplayDefaultCapacity().
|
13 years ago |
|
frosch
|
cdb8445a47
|
(svn r23176) -Codechange: Deduplicate code between Engine::DetermineCapacity() and Engine::GetDisplayDefaultCapacity().
|
13 years ago |
|
frosch
|
026317bb44
|
(svn r23173) -Codechange: Rename GetVehicleCapacity() to Engine::DetermineCapacity().
|
13 years ago |
|
frosch
|
3178814a00
|
(svn r23173) -Codechange: Rename GetVehicleCapacity() to Engine::DetermineCapacity().
|
13 years ago |
|
frosch
|
acc3c75951
|
(svn r23075) -Codechange: Add GetGRF() and GetGRFID() methods to Engine and Vehicle to simplify code.
|
13 years ago |
|
frosch
|
ad38f27242
|
(svn r23075) -Codechange: Add GetGRF() and GetGRFID() methods to Engine and Vehicle to simplify code.
|
13 years ago |
|
alberth
|
bb4d832146
|
(svn r22239) -Doc: Further engine doxyment additions.
|
13 years ago |
|
alberth
|
46d3b48fb3
|
(svn r22239) -Doc: Further engine doxyment additions.
|
13 years ago |
|
frosch
|
faa2a26ae1
|
(svn r21986) -Codechange: Add helper function to test whether an engine is still associated to a GRF.
|
14 years ago |
|
frosch
|
dd1c718ac7
|
(svn r21986) -Codechange: Add helper function to test whether an engine is still associated to a GRF.
|
14 years ago |
|
frosch
|
915e339d0f
|
(svn r21975) -Add: console command to reset the engine pool. It removes the traces of engines which are no longer associated to a NewGRF, and can be used to e.g. 'fix' scenarios which were screwed up by the author. You can only use it when there are no vehicles in the game though.
|
14 years ago |
|
frosch
|
447f3dbe2c
|
(svn r21975) -Add: console command to reset the engine pool. It removes the traces of engines which are no longer associated to a NewGRF, and can be used to e.g. 'fix' scenarios which were screwed up by the author. You can only use it when there are no vehicles in the game though.
|
14 years ago |
|
alberth
|
f65a9a5515
|
(svn r21593) -Codechange: endif comment correcttions.
|
14 years ago |
|
alberth
|
0b0127b13d
|
(svn r21593) -Codechange: endif comment correcttions.
|
14 years ago |
terkhen
|
d6959dcc6b
|
(svn r21517) -Codechange: Add IsGroundVehicle function to the Engine class.
|
14 years ago |
|
terkhen
|
14100e9798
|
(svn r21517) -Codechange: Add IsGroundVehicle function to the Engine class.
|
14 years ago |
|
rubidium
|
29b489a055
|
(svn r20437) -Codechange: lets Engines use GRFFilePropsBase as well
|
14 years ago |
|
rubidium
|
b5d5a4e159
|
(svn r20437) -Codechange: lets Engines use GRFFilePropsBase as well
|
14 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
|
9467b7c6d6
|
(svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header
|
15 years ago |
|
frosch
|
67cae40ec1
|
(svn r17926) -Fix (r9352): Make the decision whether aircraft carry mail consistent. Now always the cargo class decides.
|
15 years ago |
|
frosch
|
9fafef56d0
|
(svn r17926) -Fix (r9352): Make the decision whether aircraft carry mail consistent. Now always the cargo class decides.
|
15 years ago |
|
rubidium
|
7fbc33dae1
|
(svn r17248) -Fix: add GPL license notice where appropriate
|
15 years ago |
|
rubidium
|
99d46e0ad7
|
(svn r17248) -Fix: add GPL license notice where appropriate
|
15 years ago |
|
frosch
|
8bd029015e
|
(svn r17209) -Codechange: Move cargo_type from (Rail|Road|Ship)VehicleInfo to EngineInfo.
|
15 years ago |
|
frosch
|
0ddf9c86e1
|
(svn r17209) -Codechange: Move cargo_type from (Rail|Road|Ship)VehicleInfo to EngineInfo.
|
15 years ago |
|
rubidium
|
35aabc1d4c
|
(svn r16586) -Codechange: don't store lifelength in the savegame; it can easily be calculated, it isn't used often and now changing extend_vehicle_life in game has some effect.
|
15 years ago |
|
rubidium
|
11c7c258dd
|
(svn r16586) -Codechange: don't store lifelength in the savegame; it can easily be calculated, it isn't used often and now changing extend_vehicle_life in game has some effect.
|
15 years ago |