Jonathan G Rennison
|
a670e369db
|
Add setting for no vehicles introduced after given year
|
2021-03-17 18:51:19 +00:00 |
|
Jonathan G Rennison
|
b7ddd486cf
|
Merge branch 'master' into jgrpp
# Conflicts:
# cmake/CompileFlags.cmake
# src/aircraft_cmd.cpp
# src/blitter/32bpp_anim.cpp
# src/cargopacket.cpp
# src/cheat_gui.cpp
# src/company_cmd.cpp
# src/company_gui.cpp
# src/core/pool_func.hpp
# src/date.cpp
# src/economy.cpp
# src/error_gui.cpp
# src/ground_vehicle.cpp
# src/ground_vehicle.hpp
# src/group_gui.cpp
# src/industry_cmd.cpp
# src/lang/dutch.txt
# src/lang/french.txt
# src/lang/german.txt
# src/linkgraph/linkgraph_gui.cpp
# src/linkgraph/mcf.cpp
# src/network/network_content.cpp
# src/network/network_server.cpp
# src/network/network_udp.cpp
# src/newgrf_engine.cpp
# src/newgrf_station.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/yapf/yapf_common.hpp
# src/saveload/saveload.cpp
# src/settings_gui.cpp
# src/station_cmd.cpp
# src/station_kdtree.h
# src/string_func.h
# src/table/settings.ini
# src/tgp.cpp
# src/timetable_cmd.cpp
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/train_cmd.cpp
# src/train_gui.cpp
# src/tree_gui.cpp
# src/tunnelbridge_cmd.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/video/sdl2_v.cpp
# src/video/sdl_v.cpp
# src/video/win32_v.cpp
# src/viewport.cpp
# src/viewport_sprite_sorter_sse4.cpp
# src/window.cpp
|
2021-02-01 17:07:34 +00:00 |
|
Charles Pigott
|
9b800a96ed
|
Codechange: Remove min/max functions in favour of STL variants (#8502)
|
2021-01-08 11:16:18 +01:00 |
|
Matt Kimber
|
9b28b15e67
|
Codechange: create MutableSpriteCache to remove the need to cast Vehicle to a mutable type in render methods
|
2021-01-05 11:42:25 +01:00 |
|
Jonathan G Rennison
|
840e459601
|
Revert "Fix 63ccb36ef3: Crash trying to load TTO/TTD savegames. (#8356)"
This is not necessary due to 5243cfd6d0.
This reverts commit c558936ec3.
|
2020-12-07 18:19:54 +00:00 |
|
Jonathan G Rennison
|
4da3cfcf56
|
Merge branch 'master' into jgrpp
# Conflicts:
# CMakeLists.txt
# src/bootstrap_gui.cpp
|
2020-12-07 17:56:44 +00:00 |
|
Michael Lutz
|
c558936ec3
|
Fix 63ccb36ef3: Crash trying to load TTO/TTD savegames. (#8356)
|
2020-12-06 00:29:27 +01:00 |
|
Jonathan G Rennison
|
2ad446369d
|
Cache animated tile speed, use btree map for animated tiles
|
2020-11-26 00:19:51 +00:00 |
|
Jonathan G Rennison
|
bb862100af
|
Fix operator typo in 6dd7b286 in oldloader_sl.cpp
|
2020-10-13 21:32:10 +01:00 |
|
Jonathan G Rennison
|
6dd7b2869c
|
Increase per-vehicle order limit to 64k
See: #110
|
2020-10-12 23:48:54 +01:00 |
|
Jonathan G Rennison
|
b96e7f78fb
|
Merge branch 'master' into jgrpp
|
2020-02-21 21:18:01 +00:00 |
|
glx
|
9116b22386
|
Fix #8011, f5381798: Dock tile in TTD savegame was only 2 bytes
|
2020-02-19 17:45:42 +01:00 |
|
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
|
2020-01-06 18:45:51 +00:00 |
|
glx
|
ee7a8eebca
|
Codechange: Replace FOR_ALL_TOWNS with range-based for loops
|
2019-12-21 20:13:03 +01:00 |
|
glx
|
d8a1be48cd
|
Codechange: Replace vehicle related FOR_ALL with range-based for loops
|
2019-12-21 20:13:03 +01:00 |
|
glx
|
fa9769f81a
|
Codechange: Replace FOR_ALL_DEPOTS with range-based for loops
|
2019-12-21 20:13:03 +01:00 |
|
glx
|
3a14cea068
|
Codechange: Replace FOR_ALL_COMPANIES with range-based for loops
|
2019-12-21 20:13:03 +01:00 |
|
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
|
2019-11-12 18:43:10 +00:00 |
|
S. D. Cloudt
|
13cc8a0cee
|
Cleanup: Removed SVN headers
|
2019-11-10 17:59:20 +00:00 |
|
Jonathan G Rennison
|
d3e0c3787f
|
Merge branch 'master' into jgrpp-nrt
Merge trunk multiple docks implementation
# Conflicts:
# docs/landscape_grid.html
# src/order_cmd.cpp
# src/pathfinder/npf/npf.cpp
# src/pathfinder/yapf/yapf_ship.cpp
# src/rail_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/oldloader_sl.cpp
# src/saveload/station_sl.cpp
# src/script/api/script_order.cpp
# src/ship_cmd.cpp
# src/station.cpp
# src/station_base.h
# src/station_cmd.cpp
# src/tunnelbridge_cmd.cpp
|
2019-07-13 20:34:52 +01:00 |
|
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
|
2019-07-08 16:19:07 +01:00 |
|
peter1138
|
f538179878
|
Feature: Multi-tile docks and docking points.
|
2019-06-30 16:46:32 +02:00 |
|
Charles Pigott
|
931d32f414
|
Codechange: Remove RailTypeByte type
|
2019-04-29 17:40:22 +01:00 |
|
Jonathan G Rennison
|
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
|
2019-04-16 18:03:08 +01:00 |
|
Michael Lutz
|
4e85ccf3c0
|
Codechange: Replace SmallStackSafeStackAlloc with std::array.
The only port that ever used it to make heap allocations instead of stack ones was the NDS port, which got thrown out some time ago.
|
2019-04-15 22:52:50 +01:00 |
|
Jonathan G Rennison
|
674732cd68
|
Merge: Codechange: Use null pointer literal instead of the NULL macro
|
2019-04-11 18:14:13 +01:00 |
|
Henry Wilson
|
7c8e7c6b6e
|
Codechange: Use null pointer literal instead of the NULL macro
|
2019-04-10 23:22:20 +02:00 |
|
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
|
2019-03-27 18:12:04 +00:00 |
|
Henry Wilson
|
c01a2e2a81
|
Codechange: Removed SmallVector completely
|
2019-03-26 20:15:57 +00:00 |
|
Henry Wilson
|
a0f36a50e6
|
Codechange: Replaced SmallVector::Append() with std::vector::[push|emplace]_back()
|
2019-03-26 20:15:57 +00:00 |
|
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
|
2018-05-25 18:29:17 +01:00 |
|
PeterN
|
42b43c9983
|
Change: Available railtypes is always calculated on load, so no need to load value for old savegames (#6782)
|
2018-05-19 22:31:46 +01:00 |
|
Jonathan G Rennison
|
1fe0bb76b9
|
Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp
|
2018-04-27 02:42:20 +01:00 |
|
keldorkatarn
|
4955996b35
|
Remove costly recalculation of a date format we already have.
(cherry picked from commit 6aca18d18252f1c2f6d4a215999b7d7afb7df813)
See #36
|
2018-04-17 16:35:22 +01:00 |
|
Michael Lutz
|
7dd6027194
|
Codechange: Use a SmallVec for the animated tile list instead of replicating most of the logic.
|
2018-04-15 20:49:29 +02:00 |
|
Jonathan G Rennison
|
d730cfd51d
|
Cache sprite sequence bounds for vehicles
|
2018-01-19 19:13:01 +00:00 |
|
keldorkatarn
|
1d3cf59d8a
|
Allow building multiple docks per station.
(cherry picked from commit 0110c4a35d383e0be2cbb53cbe9cbe6784abb3e9)
# Conflicts:
# src/station_cmd.cpp
|
2017-09-20 19:11:48 +01:00 |
|
frosch
|
117e73751c
|
(svn r27668) -Feature: [NewGRF] Allow composing vehicles from multiple sprites.
|
2016-10-16 14:59:44 +00:00 |
|
frosch
|
ba566e9126
|
(svn r27668) -Feature: [NewGRF] Allow composing vehicles from multiple sprites.
|
2016-10-16 14:59:44 +00:00 |
|
frosch
|
d2393b4f6c
|
(svn r27666) -Codechange: Pass vehicle sprites around using a struct VehicleSpriteSeq.
|
2016-10-16 14:57:56 +00:00 |
|
frosch
|
f36539837e
|
(svn r27666) -Codechange: Pass vehicle sprites around using a struct VehicleSpriteSeq.
|
2016-10-16 14:57:56 +00:00 |
|
rubidium
|
982f5a6aa2
|
(svn r26878) -Change: move m6 to TileExtended to keep Tile 8 bytes and thus better alignable
|
2014-09-21 11:23:33 +00:00 |
|
rubidium
|
f3b79480ed
|
(svn r26878) -Change: move m6 to TileExtended to keep Tile 8 bytes and thus better alignable
|
2014-09-21 11:23:33 +00:00 |
|
rubidium
|
04e2324b8f
|
(svn r26873) -Change: split type_height into a type and height array (ic111)
|
2014-09-21 11:14:58 +00:00 |
|
rubidium
|
337af973b0
|
(svn r26873) -Change: split type_height into a type and height array (ic111)
|
2014-09-21 11:14:58 +00:00 |
|
rubidium
|
9e0f4b3847
|
(svn r26864) -Codechange: bring a bit more OO into the disaster vehicles
|
2014-09-20 15:46:44 +00:00 |
|
rubidium
|
8ab4f746f2
|
(svn r26864) -Codechange: bring a bit more OO into the disaster vehicles
|
2014-09-20 15:46:44 +00:00 |
|
rubidium
|
89c25b955e
|
(svn r26580) -Codechange: s/GES_PICKUP/GES_RATING/ (it has nothing to do with actual pickup), s/acceptance_pickup/status/ (the enum isn't called GoodEntryStatus for a reason; it's not only acceptance and pickup anymore)
|
2014-05-11 18:02:11 +00:00 |
|
rubidium
|
fb9dbf30fa
|
(svn r26580) -Codechange: s/GES_PICKUP/GES_RATING/ (it has nothing to do with actual pickup), s/acceptance_pickup/status/ (the enum isn't called GoodEntryStatus for a reason; it's not only acceptance and pickup anymore)
|
2014-05-11 18:02:11 +00:00 |
|
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
|
2014-04-23 20:13:33 +00:00 |
|