Jonathan G Rennison
|
674732cd68
|
Merge: Codechange: Use null pointer literal instead of the NULL macro
|
6 years ago |
Henry Wilson
|
7c8e7c6b6e
|
Codechange: Use null pointer literal instead of the NULL macro
|
6 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
|
6 years ago |
|
Henry Wilson
|
ab711e6942
|
Codechange: Replaced SmallVector::[Begin|End]() with std alternatives
|
6 years ago |
|
Henry Wilson
|
a0f36a50e6
|
Codechange: Replaced SmallVector::Append() with std::vector::[push|emplace]_back()
|
6 years ago |
|
Henry Wilson
|
a690936ed7
|
Codechange: Replace SmallVector::Length() with std::vector::size()
|
6 years ago |
|
Henry Wilson
|
bfd79e59dc
|
Codechange: Replace SmallVector::Clear() with std::vector::clear()
|
6 years ago |
|
Jonathan G Rennison
|
7ff252c58d
|
Merge branch 'master' into jgrpp
# Conflicts:
# Makefile.src.in
# findversion.sh
# projects/determineversion.vbs
# src/aircraft_cmd.cpp
# src/lang/dutch.txt
# src/linkgraph/linkgraph_gui.cpp
# src/linkgraph/linkgraph_gui.h
# src/order_cmd.cpp
# src/settings_gui.cpp
# src/smallmap_gui.cpp
# src/town_cmd.cpp
# src/viewport.cpp
# src/water_map.h
|
6 years ago |
Eddi-z
|
8139b14e9c
|
Change: Synchronize introduction date and reliability randomness across vehicles with the same base introduction date (#7147)
|
6 years ago |
|
Jonathan G Rennison
|
e735c1a51a
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/aircraft_cmd.cpp
# src/autoreplace_cmd.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/yapf/yapf_rail.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/script/api/ai/ai_station.hpp.sq
# src/script/api/game/game_station.hpp.sq
# src/script/api/script_station.hpp
# src/track_func.h
# src/vehicle_base.h
|
6 years ago |
Charles Pigott
|
f5b1115039
|
Doc: Lots and lots of doxymentation fixes
|
6 years ago |
|
Jonathan G Rennison
|
3a640af71d
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/ground_vehicle.cpp
# src/viewport.cpp
|
6 years ago |
Johannes E. Krause
|
662dcc3c31
|
Fix #6920: Make 9.8m/s^2 a common constant for TE-calculation
|
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 |
|
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)
|
8 years ago |
|
alberth
|
e2e9bd0b25
|
(svn r27797) -Add: Display aircraft type in its vehicle window (patch by Samu)
|
8 years ago |
frosch
|
4b8b9e1cb1
|
(svn r27700) -Codechange: Simplify railtype date introduction. A check that is safe to run every day before the last railtype has been introduced, is also safe to run after the last railtype has been introduced.
|
8 years ago |
|
frosch
|
1522558cf7
|
(svn r27700) -Codechange: Simplify railtype date introduction. A check that is safe to run every day before the last railtype has been introduced, is also safe to run after the last railtype has been introduced.
|
8 years ago |
|
frosch
|
ee9a54c0a0
|
(svn r27598) -Fix: Company 0 could accept engine previews before they were offered.
|
8 years ago |
|
frosch
|
9a7618aeb6
|
(svn r27598) -Fix: Company 0 could accept engine previews before they were offered.
|
8 years ago |
|
frosch
|
ebb6e38075
|
(svn r27578) -Fix [FS#6454]: Vehicles could not be hidden from the purchase list when they were in exclusive preview.
|
8 years ago |
|
frosch
|
6981fee459
|
(svn r27578) -Fix [FS#6454]: Vehicles could not be hidden from the purchase list when they were in exclusive preview.
|
8 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 |
rubidium
|
9ed12b0f07
|
(svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL)
|
11 years ago |
|
rubidium
|
034735a54c
|
(svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL)
|
11 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
|
11 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
|
11 years ago |
|
alberth
|
24d3594723
|
(svn r25640) -Fix: Do not suggest a start date for the game when there will be no vehicles available at all.
|
11 years ago |
|
alberth
|
67cb7d4def
|
(svn r25640) -Fix: Do not suggest a start date for the game when there will be no vehicles available at all.
|
11 years ago |
|
alberth
|
46901b73b2
|
(svn r25639) -Codechange: Rename both 'STR_ERROR_NO_VEHICLES_AVAILABLE*' strings.
|
11 years ago |
|
alberth
|
888ebe4f6f
|
(svn r25639) -Codechange: Rename both 'STR_ERROR_NO_VEHICLES_AVAILABLE*' strings.
|
11 years ago |
|
rubidium
|
1efc64fa7d
|
(svn r25553) -Fix [FS#5530]: provide a warning when no vehicles are available, and tell what to do in that case
|
11 years ago |
|
rubidium
|
6272a35c0a
|
(svn r25553) -Fix [FS#5530]: provide a warning when no vehicles are available, and tell what to do in that case
|
11 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
|
f93602aec9
|
(svn r24813) -Change: Offer engine previews only to companies which actually use the particular vehicle-type/cargo-type combination.
|
12 years ago |
|
frosch
|
1e250109df
|
(svn r24813) -Change: Offer engine previews only to companies which actually use the particular vehicle-type/cargo-type combination.
|
12 years ago |
|
frosch
|
51fca5eec7
|
(svn r24812) -Fix: Close pending preview windows when the engine is introduced to everyone.
|
12 years ago |
|
frosch
|
ce48182768
|
(svn r24812) -Fix: Close pending preview windows when the engine is introduced to everyone.
|
12 years ago |
|
frosch
|
5c358c4173
|
(svn r24811) -Add: Close engine preview window when another client accepts it.
|
12 years ago |
|
frosch
|
f126497c08
|
(svn r24811) -Add: Close engine preview window when another client accepts it.
|
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 |
yexo
|
3439769fef
|
(svn r24660) -Feature: do not display the preview window for disabled vehicle types (Eagle_rainbow)
|
12 years ago |
|
yexo
|
69b91c2102
|
(svn r24660) -Feature: do not display the preview window for disabled vehicle types (Eagle_rainbow)
|
12 years ago |
|
alberth
|
0849fb8d36
|
(svn r24535) -Doc: Two additions, lots of small spelling fixes, and some Doxygen improvements.
|
12 years ago |
|
alberth
|
6c6abd87db
|
(svn r24535) -Doc: Two additions, lots of small spelling fixes, and some Doxygen improvements.
|
12 years ago |