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
|
4 years ago |
Charles Pigott
|
b9f3e45af7
|
Cleanup: Remove unused (and mostly duplicated) function
|
4 years ago |
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
|
5 years ago |
glx
|
d8a1be48cd
|
Codechange: Replace vehicle related FOR_ALL with range-based for loops
|
5 years ago |
glx
|
1f6b3a37f9
|
Codechange: Replace FOR_ALL_ENGINES with range-based for loops
|
5 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
|
edfd378e93
|
Merge branch 'master' into jgrpp
# Conflicts:
# source.list
# src/blitter/32bpp_anim.cpp
# src/linkgraph/linkgraphjob.cpp
# src/order_cmd.cpp
# src/vehicle.cpp
# src/vehicle_type.h
|
5 years ago |
JMcKiern
|
04f659e768
|
Fix: Some typos found using codespell
|
5 years ago |
Jonathan G Rennison
|
ba8ed880c1
|
Merge branch 'master' into jgrpp-nrt
Merge NRT feature
# Conflicts:
# docs/landscape.html
# docs/landscape_grid.html
# src/bridge_map.h
# src/build_vehicle_gui.cpp
# src/company_base.h
# src/company_cmd.cpp
# src/misc_gui.cpp
# src/newgrf.cpp
# src/newgrf_engine.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/npf/npf.cpp
# src/road_cmd.cpp
# src/road_func.h
# src/road_gui.cpp
# src/road_map.h
# src/road_type.h
# src/roadveh_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/company_sl.cpp
# src/script/api/script_bridge.cpp
# src/table/newgrf_debug_data.h
# src/tile_cmd.h
# src/town_cmd.cpp
# src/tunnel_map.h
# src/tunnelbridge_cmd.cpp
|
5 years ago |
Jonathan G Rennison
|
829c635add
|
Add road layout change counter, add to road veh path caches
Update layout counter when non-leaf road bits are added or removed
|
5 years ago |
Jonathan G Rennison
|
42b6e8b0d8
|
Check far side of level crossing when pruning road bits in CleanUpRoadBits
|
5 years ago |
peter1138
|
c02ef3e456
|
Feature: Add NotRoadTypes (NRT)
|
6 years ago |
Henry Wilson
|
7c8e7c6b6e
|
Codechange: Use null pointer literal instead of the NULL macro
|
6 years ago |
frosch
|
c0a301ae60
|
(svn r27424) -Fix [FS#6374]: Towns did not connect roads to existing roads, unless they had only a single roadbit. Otoh, towns also tried to connect to single roadbit tiles such as tunnels and depots, even though they were not connectable in the direction of interest.
|
9 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 |
planetmaker
|
c24374f99c
|
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
|
12 years ago |
truebrain
|
084f4e6aac
|
(svn r23629) -Add: allow ScriptRoad::BuildRoad, ScriptBridge::BuildBridge (for roads) and ScriptTunnel:BuildTunnel (for roads) to work for GameScript
|
13 years ago |
rubidium
|
ecbc56a677
|
(svn r23094) -Codechange: add a default NULL to GetFoundationSlope and use it
|
13 years ago |
rubidium
|
7757a2ed40
|
(svn r23091) -Codechange: rename some Get*Z functions to Get*PixelZ functions if they return the Z in pixels (like TilePixelHeight)
|
13 years ago |
rubidium
|
37415b9cf7
|
(svn r22785) -Codechange: rename IsGeneratingWorld to HasModalProgress
|
13 years ago |
rubidium
|
7eba2bf4d3
|
(svn r21890) -Cleanup: remove some unneeded includes
|
14 years ago |
rubidium
|
9ca4b629cd
|
(svn r21846) -Codechange: move documentation towards the code to make it more likely to be updated [o-s].
|
14 years ago |
rubidium
|
e356cb9405
|
(svn r20281) -Codechange: unify case scope closure + break coding style
|
14 years ago |
alberth
|
a825b4fa5f
|
(svn r20266) -Doc: Mostly typo fixes, a few doxygen-related improvements.
|
14 years ago |
smatz
|
d62d0ac489
|
(svn r19019) -Codechange: use HasExactlyOneBit() and HasAtMostOneBit() instead of CountBits() where possible
|
15 years ago |
rubidium
|
860b9b1cea
|
(svn r18028) -Codechange: unglobalise some functions
|
15 years ago |
rubidium
|
d6cded5380
|
(svn r17693) -Cleanup: remove some unneeded includes
|
15 years ago |
rubidium
|
7fbc33dae1
|
(svn r17248) -Fix: add GPL license notice where appropriate
|
15 years ago |
smatz
|
8808f3beea
|
(svn r16352) -Codechange: use PoolItem::GetIfValid() instead of PoolItem::IsValidID() and PoolItem::Get()
|
16 years ago |
smatz
|
871107f529
|
(svn r16327) -Codechange: replace IsValidPoolItemID(index) by PoolItem::IsValidID(index)
|
16 years ago |
smatz
|
6221d74644
|
(svn r16325) -Codechange: replace GetPoolItem(index) by PoolItem::Get(index)
|
16 years ago |
frosch
|
8ffb93c358
|
(svn r16311) -Fix: (Get|Set)TrackBits() is only valid for RAIL_TILE_NORMAL and _SIGNALS.
|
16 years ago |
rubidium
|
e8dbf62761
|
(svn r15454) -Fix [FS#2614]: towns did not know about build_on_slopes in some cases, or made decisions on the 'original' slope instead the slope after applying the foundation..
|
16 years ago |
smatz
|
0d3f5e6e74
|
(svn r15299) -Cleanup: remove many redundant includes
|
16 years ago |
Yexo
|
1c7cb8368c
|
(svn r15295) -Fix [FS#2591] (r15190): Towns tried to build roads outside the map.
|
16 years ago |
smatz
|
e00cf92f47
|
(svn r15077) -Codechange: enumify DAYS_IN_YEAR and DAYS_IN_LEAP_YEAR
-Change: when computing daily running cost, divide by 365 (instead of 364). Since r12134, the rounding errors don't need this correction anymore
|
16 years ago |
rubidium
|
b650a86e58
|
(svn r14422) -Codechange: also reflect the changes of r14421 in the filenames.
|
16 years ago |
rubidium
|
3b798599b6
|
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
|
16 years ago |
rubidium
|
d06529ef4d
|
(svn r13719) -Codechange: rename IsValidPlayer to IsValidPlayerID in line with all other structs/classes that are in a pool.
|
16 years ago |
rubidium
|
923e21129c
|
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
|
17 years ago |
rubidium
|
8c9cc415e3
|
(svn r13255) -Codechange: move _opt to _settings.
|
17 years ago |
rubidium
|
d03994098b
|
(svn r12971) -Documentation: add @file in files that missed them and add something more than whitespace as description of files that don't have a description.
|
17 years ago |
peter1138
|
a00371c8db
|
(svn r12924) -Feature: Introducing the so called 'engine pool' which primarily removes the fixed engine type limits and also happens to allow (with the patch option 'dynamic_engines') multiple NewGRF vehicle sets to coexist.
|
17 years ago |
peter1138
|
5ca6fd67fc
|
(svn r12917) -Codechange: standardise variable names called with FOR_ALL_ENGINEIDS_OF_TYPE
|
17 years ago |
rubidium
|
ef2be7d0fc
|
(svn r12490) -Codechange: rename engine.h to engine_func.h and remove unneeded inclusions of engine.h and/or replace them with engine_type.h.
|
17 years ago |
peter1138
|
e35cf20a23
|
(svn r11957) -Codechange [FS#1678]: Minor simplification and optimisation when checking for available road/rail types (bilbo)
|
17 years ago |
rubidium
|
ac528411df
|
(svn r11818) -Codechange: split player.h into smaller pieces.
|
17 years ago |
rubidium
|
998d7644f6
|
(svn r11800) -Codechange: move some functions to a more logical location + some type safety.
|
17 years ago |
rubidium
|
429521a7d1
|
(svn r11692) -Codechange: move some functions from 'functions.h' to a more logical place and remove about 50% of the includes of 'functions.h'
|
17 years ago |