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 |
frosch
|
bc7f92815b
|
Cleanup: Remove unused constants. The value of the tram constant was also incorrect.
|
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
|
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
|
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 |
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 |
peter1138
|
c02ef3e456
|
Feature: Add NotRoadTypes (NRT)
|
5 years ago |
Charles Pigott
|
e18c8c30be
|
Codechange: Remove RoadTypesByte
|
5 years ago |
rubidium
|
3d605f6488
|
(svn r23595) -Codechange: add comma after last enum to get a more uniform coding style
|
13 years ago |
rubidium
|
df16ebd730
|
(svn r23595) -Codechange: add comma after last enum to get a more uniform coding style
|
13 years ago |
smatz
|
82d54f5097
|
(svn r19683) -Fix (r19654): towns with 3x3 and 2x2 road layouts couldn't expand
|
15 years ago |
smatz
|
dba2a57b0d
|
(svn r19683) -Fix (r19654): towns with 3x3 and 2x2 road layouts couldn't expand
|
15 years ago |
frosch
|
ed80045221
|
(svn r19654) -Codechange: Use Extract<> in more places.
|
15 years ago |
frosch
|
75d4bc947d
|
(svn r19654) -Codechange: Use Extract<> in more places.
|
15 years ago |
frosch
|
6726bc727a
|
(svn r19605) -Codechange: Merge ExtractBits into EnumPropsT.
|
15 years ago |
frosch
|
0d4e6c46ff
|
(svn r19605) -Codechange: Merge ExtractBits into EnumPropsT.
|
15 years ago |
smatz
|
d2e99657fa
|
(svn r19507) -Codechange: remove semicolon after DECLARE_POSTFIX_INCREMENT and DECLARE_ENUM_AS_BIT_SET
|
15 years ago |
smatz
|
53aaabe6e9
|
(svn r19507) -Codechange: remove semicolon after DECLARE_POSTFIX_INCREMENT and DECLARE_ENUM_AS_BIT_SET
|
15 years ago |
rubidium
|
99d46e0ad7
|
(svn r17248) -Fix: add GPL license notice where appropriate
|
15 years ago |
rubidium
|
7fbc33dae1
|
(svn r17248) -Fix: add GPL license notice where appropriate
|
15 years ago |
rubidium
|
c252e18421
|
(svn r16917) -Codechange: fix some GCC 4.5 'case X is not in enum Y' warnings
|
15 years ago |
rubidium
|
3bcfa7c52a
|
(svn r16917) -Codechange: fix some GCC 4.5 'case X is not in enum Y' warnings
|
15 years ago |
rubidium
|
87dfc2a881
|
(svn r16428) -Codechange: use the less bloated SimpleTinyEnumT instead of TinyEnumT if the stuff provided by TinyEnumT but not SimpleTinyEnumT is not used.
|
16 years ago |
rubidium
|
b19d0e0254
|
(svn r16428) -Codechange: use the less bloated SimpleTinyEnumT instead of TinyEnumT if the stuff provided by TinyEnumT but not SimpleTinyEnumT is not used.
|
16 years ago |
rubidium
|
9f2a906bc1
|
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
-Feature: allow building road stops on road/tram tracks of competitors.
|
16 years ago |
rubidium
|
7831346ef8
|
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
-Feature: allow building road stops on road/tram tracks of competitors.
|
16 years ago |
peter1138
|
7de2096d1f
|
(svn r14170) -Codechange: Missing enum for road type iteration.
|
16 years ago |
peter1138
|
6a742cef5f
|
(svn r14170) -Codechange: Missing enum for road type iteration.
|
16 years ago |
glx
|
bba1a62db1
|
(svn r11914) -Documentation: fix some @file statement
|
17 years ago |
glx
|
b7f50533c2
|
(svn r11914) -Documentation: fix some @file statement
|
17 years ago |
rubidium
|
2d2e1e3863
|
(svn r11800) -Codechange: move some functions to a more logical location + some type safety.
|
17 years ago |
rubidium
|
998d7644f6
|
(svn r11800) -Codechange: move some functions to a more logical location + some type safety.
|
17 years ago |
rubidium
|
efc18e8ab3
|
(svn r11663) -Codechange: moving of the road related types and functions.
|
17 years ago |
rubidium
|
e4ef359f47
|
(svn r11663) -Codechange: moving of the road related types and functions.
|
17 years ago |