0d93ecb6bf
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/core/alloc_type.hpp
# src/group_gui.cpp
# src/newgrf.cpp
# src/saveload/economy_sl.cpp
# src/saveload/map_sl.cpp
# src/station_cmd.cpp
6 years ago
801cbea9cc
Codechange: use std::sort() for all std::vector types
6 years ago
674732cd68
Merge: Codechange: Use null pointer literal instead of the NULL macro
6 years ago
7c8e7c6b6e
Codechange: Use null pointer literal instead of the NULL macro
6 years ago
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
c01a2e2a81
Codechange: Removed SmallVector completely
6 years ago
ab711e6942
Codechange: Replaced SmallVector::[Begin|End]() with std alternatives
6 years ago
2bc2de9034
Codechange: Replaced SmallVector::Find() with std::find()
6 years ago
a0f36a50e6
Codechange: Replaced SmallVector::Append() with std::vector::[push|emplace]_back()
6 years ago
097328c3d7
Codechange: Replaced SmallVector::Get() const with std alternatives
6 years ago
f3938fdb83
Codechange: Replaced SmallVector::Reset() with std::vector::clear() + shrink_to_fit()
6 years ago
a690936ed7
Codechange: Replace SmallVector::Length() with std::vector::size()
6 years ago
65b9a103ad
Initial implementation of two rail types per tile
6 years ago
385a2552e9
Merge branch 'enhanced_viewport_overlay' into jgrpp
7 years ago
d9d669dcf8
(svn r27984) -Codechange: Make ScopeResolver constructors/destructors inlineable. Speedup sprite resolving by about 8 percent.
7 years ago
29dca1be3b
(svn r27984) -Codechange: Make ScopeResolver constructors/destructors inlineable. Speedup sprite resolving by about 8 percent.
7 years ago
740e4543c3
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/industry_cmd.cpp
7 years ago
82ae414e8d
(svn r27928) -Fix: [NewGRF] While executing random triggers, var 5F should include the new triggers.
...
-Fix: [NewGRF] Reset used random triggers only after all A123 chains have been resolved, so that all RA2 in all chains can test the shard triggers. This also includes multiple RA2 in the same A123 chain.
-Fix: [NewGRF] Industry random triggers are stored per tile, even when randomising the shared random bits of the parent industry.
7 years ago
ffdcbb8f21
(svn r27928) -Fix: [NewGRF] While executing random triggers, var 5F should include the new triggers.
...
-Fix: [NewGRF] Reset used random triggers only after all A123 chains have been resolved, so that all RA2 in all chains can test the shard triggers. This also includes multiple RA2 in the same A123 chain.
-Fix: [NewGRF] Industry random triggers are stored per tile, even when randomising the shared random bits of the parent industry.
7 years ago
d204062300
Merge branch 'master' into template_train_replacement
8 years ago
117e73751c
(svn r27668) -Feature: [NewGRF] Allow composing vehicles from multiple sprites.
8 years ago
ba566e9126
(svn r27668) -Feature: [NewGRF] Allow composing vehicles from multiple sprites.
8 years ago
d2393b4f6c
(svn r27666) -Codechange: Pass vehicle sprites around using a struct VehicleSpriteSeq.
8 years ago
f36539837e
(svn r27666) -Codechange: Pass vehicle sprites around using a struct VehicleSpriteSeq.
8 years ago
ff922f41da
Fix NewGRF vehicle variables 4A, FE and FF crashing with virtual trains.
...
This is due to attempts to look up the rail type of the current tile.
8 years ago
1bbe59af69
(svn r27075) -Fix [FS#6182]: Variable 47 used the carge translation table of the wrong GRF in case of callback 1D.
10 years ago
c97d3c322f
(svn r27075) -Fix [FS#6182]: Variable 47 used the carge translation table of the wrong GRF in case of callback 1D.
10 years ago
e21ebb26c8
(svn r27060) -Doc: Remove obsolete comment (64KB LUT would be 8GB with current limits)
10 years ago
759e963083
(svn r27060) -Doc: Remove obsolete comment (64KB LUT would be 8GB with current limits)
10 years ago
354f03ad5d
(svn r26988) -Add: [NewGRF] Allow callback 160 to access variable 61.
10 years ago
54a5b1b0d0
(svn r26988) -Add: [NewGRF] Allow callback 160 to access variable 61.
10 years ago
39ded38c01
(svn r26866) -Change: make aircraft ascend/descend when they are too close to the ground or too far away (based on patch by ic111)
10 years ago
c0771b1657
(svn r26866) -Change: make aircraft ascend/descend when they are too close to the ground or too far away (based on patch by ic111)
10 years ago
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
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
393c4fa965
(svn r26430) -Feature(ette): Add vehicle modflag 1 (unloading in progress).
11 years ago
6562ec9402
(svn r26430) -Feature(ette): Add vehicle modflag 1 (unloading in progress).
11 years ago
ce92faf682
(svn r26388) -Codechange: Move resolving of Action 3 into ResolverObject constructor.
11 years ago
6b61c4608f
(svn r26388) -Codechange: Move resolving of Action 3 into ResolverObject constructor.
11 years ago
e1ee51d43c
(svn r26294) -Change: [NewGRF] Make vehicle variable 61 return 'not available' instead of zero when using it in invalid callback contexts.
11 years ago
9e5fc88499
(svn r26294) -Change: [NewGRF] Make vehicle variable 61 return 'not available' instead of zero when using it in invalid callback contexts.
11 years ago
edf905e6cf
(svn r26157) -Feature: [NewGRF] Vehicle variable 4D for determining the position within an articulated vehicle.
11 years ago
e0d69933f6
(svn r26157) -Feature: [NewGRF] Vehicle variable 4D for determining the position within an articulated vehicle.
11 years ago
6c63c98d7f
(svn r26085) -Codechange: Pass ResolverObjects as reference instead of pointer since they are never NULL.
11 years ago
db894b0b3f
(svn r26085) -Codechange: Pass ResolverObjects as reference instead of pointer since they are never NULL.
11 years ago
c702853917
(svn r25705) -Fix: a number of typos (inspired by 90c920601c84975acb694f3673e2beb08b013753)
11 years ago
13855f0a09
(svn r25705) -Fix: a number of typos (inspired by 90c920601c84975acb694f3673e2beb08b013753)
11 years ago
c5d7445704
(svn r25185) -Fix [FS#5508]: Remove ambivalent functions CargoList::Empty() and Count(), and replace them with VehicleCargoList::StoredCount(), TotalCount(), StationCargoList::AvailableCount() and TotalCount(). (fonsinchen)
12 years ago
5eddbb338b
(svn r25185) -Fix [FS#5508]: Remove ambivalent functions CargoList::Empty() and Count(), and replace them with VehicleCargoList::StoredCount(), TotalCount(), StationCargoList::AvailableCount() and TotalCount(). (fonsinchen)
12 years ago
2c67dc3d9f
(svn r24994) -Codechange: Replace access to service_interval with accessors (peter1138)
12 years ago
Jonathan G Rennison
glx
Henry Wilson
frosch
peter1138
rubidium