dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,987 Commits 1 Branch 0 Tags
6c5ef1ea38d9ff7f74f49807ecdf83e9c732528d
Commit Graph

23987 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan G Rennison
f0bcec77fb Import patch for random town road reconstruction. 
From https://www.tt-forums.net/viewtopic.php?f=33&t=36438

Change scale from 0-100 to 0-1000
Adjust strings, settings GUI placement, etc.
 2016-09-19 23:07:09 +01:00
Jonathan G Rennison
d0657a587e Document more rail types patch in landscape HTML docs. 2016-09-18 22:02:20 +01:00
Jonathan G Rennison
11f64c5294 Document programmable signal map bits in lanscape HTML doc. 2016-09-18 20:23:59 +01:00
Jonathan G Rennison
f82feb160f Merge branch 'signal_tunnels_bridges' into jgrpp 
# Conflicts:
#	projects/openttd_vs100.vcxproj
#	projects/openttd_vs100.vcxproj.filters
#	projects/openttd_vs140.vcxproj
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs80.vcproj
#	projects/openttd_vs90.vcproj
#	source.list
#	src/misc.cpp
#	src/openttd.cpp
#	src/pbs.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/saveload.cpp
#	src/signal.cpp
#	src/train_cmd.cpp
#	src/tunnelbridge_map.h
 2016-09-18 20:07:48 +01:00
Jonathan G Rennison
556594f2f0 Extend bridge signal simulation to support an unlimited no. of signals. 
This is instead of the previous limit of 16, all stored in M2.
 2016-09-18 20:06:59 +01:00
Jonathan G Rennison
61500b596e Fix tunnel/bridge entrance signal not being refreshed. 
When a train left a tunnel or a bridge with no intermediary signals,
when setting the entrance signal to green, the display was not refreshed
with show track reservations was enabled.
 2016-09-18 20:06:59 +01:00
Jonathan G Rennison
0d2e9f91bf Adjust signal on bridge/tunnel map bits, rename accessors, add docs. 
Use same bit to store red/green state for entrances and exits.
No longer re-use exit bit to store red/green state of entrance.
Avoid modifying the M2 of tunnel entrances/exits.
Rename and rationalise map accessor functions.
Document bits used in landscape HTML docs.
 2016-09-18 20:06:39 +01:00
frosch
740534440e (svn r27656) -Fix [FS#6511]: When removing objects of bankrupt companies the tiles may revert to canal. In that case also check the ownership of the canal. 2016-09-18 14:07:52 +00:00
Jonathan G Rennison
161f70eb4a Merge branch 'save_ext' into signal_tunnels_bridges 2016-09-18 13:53:01 +01:00
Jonathan G Rennison
8a59b960d4 Fix missing include in parent commit. 2016-09-18 13:43:25 +01:00
Jonathan G Rennison
201294c16e Merge branch 'tracerestrict-sx' into jgrpp 2016-09-18 12:51:58 +01:00
Jonathan G Rennison
c3db41ad2c Merge branch 'tracerestrict' into tracerestrict-sx 2016-09-18 12:51:50 +01:00
Jonathan G Rennison
6a3ceb3e01 Document tracerestrict bit in landscape HTML docs. 2016-09-18 12:51:40 +01:00
Jonathan G Rennison
021b72490f Mark SpringPP imports as fake extended savegame versions. 2016-09-13 22:58:00 +01:00
Jonathan G Rennison
e844b82d9e Use vector instead of list for Station::loading_vehicles. 2016-09-13 22:58:00 +01:00
Jonathan G Rennison
95aad35774 Instead of list use deque in FlowRiver, vector in StationViewWindow. 2016-09-13 22:58:00 +01:00
Jonathan G Rennison
a422cb6753 Use a deque instead of list for CargoPacketList and StationCargoPacketMap. 2016-09-13 22:58:00 +01:00
Jonathan G Rennison
ae8e19cf9a Merge branch 'save_ext' into jgrpp 2016-09-13 22:57:08 +01:00
Jonathan G Rennison
d124089d29 Add extended version tag and feature versions to output of -q. 2016-09-13 22:56:17 +01:00
Jonathan G Rennison
94d3700f79 SaveLoad: Add support for saving/loading from a std::vector<T *> 2016-09-13 22:56:16 +01:00
Jonathan G Rennison
c752da3a9e SaveLoad: Add support for saving/loading from a std::deque<T *> 2016-09-13 22:56:16 +01:00
Jonathan G Rennison
27ee2da1f7 Merge branch 'cpp-11' into save_ext 2016-09-12 23:31:19 +01:00
Jonathan G Rennison
13fb737bed Add a template parameter for the inner container of MultiMap. 2016-09-12 23:30:43 +01:00
Jonathan G Rennison
0bd33eff1e Fixes use of builtins in CountBits for small and/or signed input types. 2016-09-12 18:37:28 +01:00
Jonathan G Rennison
e85e302a68 Merge branch 'signal_tunnels_bridges' into jgrpp 
# Conflicts:
#	src/rail_cmd.cpp
 2016-09-11 13:21:14 +01:00
Jonathan G Rennison
8281041784 Fix action cost estimation for signal dragging over bridge/tunnels. 
If a bridge/tunnel entrance is signalled, blacklist the far end.
 2016-09-11 13:20:30 +01:00
Jonathan G Rennison
888cd1be07 Merge branch 'cpp-11' into signal_tunnels_bridges 
# Conflicts:
#	src/saveload/saveload.cpp
 2016-09-11 13:16:54 +01:00
Jonathan G Rennison
375b069f82 Replace day length scaled tick macros with global variables. 
This is to avoid needing to expensively re-calculate them all the time.
Instead update them by incrementing.
 2016-09-10 01:03:48 +01:00
Jonathan G Rennison
d733955d33 Add road vehicle state to UpdateViewport()->GetImage() var whitelist. 
Minor refactoring of var check.
 2016-09-10 01:03:48 +01:00
Jonathan G Rennison
0c1f59807d Merge branch 'enhanced_viewport_overlay' into jgrpp 2016-09-10 01:03:31 +01:00
Jonathan G Rennison
c137303584 Cache list of active viewports instead of always iterating window list. 
This is to speed up marking all viewports dirty, which is done very
frequently.
 2016-09-10 01:01:07 +01:00
Jonathan G Rennison
c20cf31514 Merge branch 'cpp-11' into enhanced_viewport_overlay 
# Conflicts:
#	src/rail_gui.cpp
#	src/saveload/saveload.cpp
#	src/smallmap_gui.cpp
 2016-09-10 00:57:05 +01:00
Jonathan G Rennison
ea2b04a6be Add C++11 container utility functions. 2016-09-10 00:55:13 +01:00
Jonathan G Rennison
778d3f1352 Configure: Default to trying clang then gcc on OSX, gcc then clang elsewhere. 2016-09-08 23:14:02 +01:00
Jonathan G Rennison
db026ec8b0 No longer truncate savegame version in gamelog. 
Add an extended feature for changed savegame format.
 2016-09-08 21:22:39 +01:00
Jonathan G Rennison
5672b6c2c8 Enable custom allocator use on clang. 2016-09-08 20:09:42 +01:00
Jonathan G Rennison
a8e0862500 Enable prefetch and bswap buitins for clang. 2016-09-08 20:00:56 +01:00
Jonathan G Rennison
34040b694c Make use of override unconditional. 2016-09-08 19:47:59 +01:00
Jonathan G Rennison
8ad53acfef Merge branch 'crashlog_improvements' into jgrpp 2016-09-08 19:41:53 +01:00
Jonathan G Rennison
c2825c12ea Add clang version support to crashlog output. 2016-09-08 19:40:15 +01:00
Jonathan G Rennison
c59509c2aa Use -gline-tables-only instead of -g1 on clang. 2016-09-08 19:38:13 +01:00
Jonathan G Rennison
f7774415f2 Merge branch 'cpp-11' into crashlog_improvements 
# Conflicts:
#	src/stdafx.h
 2016-09-08 19:36:00 +01:00
Jonathan G Rennison
8a2f9311a9 Include -01 in CFLAGS_BUILD when using clang. 2016-09-08 19:31:40 +01:00
Jonathan G Rennison
b8a89437a1 Enable use of atomic store/load on clang. 2016-09-08 18:40:08 +01:00
Jonathan G Rennison
390a22f864 Enable FINAL, (un)linkely, __attribute__ for clang. 2016-09-08 18:38:53 +01:00
Jonathan G Rennison
9a7c1911fc Fix narrowing conversion errors with clang. 2016-09-08 18:17:55 +01:00
Jonathan G Rennison
9ea018abc5 Merge branch 'cargo_type_order' into jgrpp 
# Conflicts:
#	src/order_base.h
#	src/order_gui.cpp
#	src/order_type.h
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/extended_ver_sl.h
#	src/vehicle_base.h
 2016-09-08 00:12:48 +01:00
Jonathan G Rennison
bc04b07f2b Fix double-use of bits 3 and 7 in Order::flags. 
Use a different encoding for the cargo type load/unload bit in flags.
 2016-09-08 00:12:27 +01:00
Jonathan G Rennison
153a0536df Merge branch 'tracerestrict-sx' into jgrpp 
# Conflicts:
#	src/rail_gui.cpp
#	src/saveload/extended_ver_sl.cpp
 2016-09-07 22:06:06 +01:00
Jonathan G Rennison
88156ee570 Merge branch 'day_length' into jgrpp 2016-09-07 22:04:10 +01:00