6c5b86bd21
Merge branch 'progsig-sx' into jgrpp
9 years ago
b2b9c0a070
Progsig: Fix various issues with removing program dependencies.
...
Fix RemoveProgramDependencies using one parameter for both source
and target, and rename the parameters to something sensible.
Update program window when invalidating in RemoveProgramDependencies.
Make SignalStateCondition::IsSignalValid const and add CheckSignalValid
for non-const validaty checking.
9 years ago
1823deae7d
Programmable signals: Fix whitespace issues.
9 years ago
4c6dc11c16
Merge branch 'infrastructure_sharing-sx' into jgrpp
...
Conflicts:
src/lang/english.txt
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/signal.cpp
src/table/settings.ini
src/vehicle.cpp
9 years ago
a4ad4130a6
Merge branch 'master' into infrastructure_sharing
...
Conflicts:
src/aircraft_cmd.cpp
src/economy.cpp
src/lang/english.txt
src/order_gui.cpp
src/roadveh_cmd.cpp
src/saveload/saveload.cpp
src/settings.cpp
src/settings_gui.cpp
src/train_cmd.cpp
9 years ago
ee791055f9
Import infrastructure sharing patch
...
Strip trailing whitespace
Remove a leftover line form settings.ini
http://www.tt-forums.net/viewtopic.php?p=1008843#p1008843
9 years ago
7ed93f9211
Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
...
town_gui.cpp updated due to struct CommandContainer change.
Conflicts:
src/command.cpp
src/command_type.h
src/gfxinit.cpp
src/openttd.cpp
src/pbs.cpp
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/saveload/saveload.cpp
src/stdafx.h
src/train_cmd.cpp
src/viewport_type.h
src/window_type.h
9 years ago
536a95dfd0
Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch
...
https://www.tt-forums.net/viewtopic.php?f=33&t=53394
9 years ago
27c70542da
Merge branch 'signal_tunnels_bridges-sx' into jgrpp
...
Conflicts:
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/settings_type.h
src/signal.cpp
9 years ago
22a5c6d459
Minor fixes in CmdRemoveSingleSignal
...
Whitespace fixes
9 years ago
59b0b18aa2
Import signals on tunnels and bridges patch
...
http://www.tt-forums.net/viewtopic.php?p=1140215#p1140215
9 years ago
fc0efe599e
Port of the programmable signals patch to recent trunk
...
Also add some additional changes from the SpringPP patch,
and make some other minor changes/fixes.
9 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
10 years ago
ae3a178a25
(svn r26110) -Codechange: add guard for enterdir being valid in signal code
11 years ago
f00d9976f9
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
12 years ago
701bd8848a
(svn r22017) -Codechange: move MarkTileDirtyByTile to viewport_func.h
14 years ago
c92b2e9d3c
(svn r20239) -Doc: Give a common name to all fall throughs (FALL THROUGH).
14 years ago
a70fd540fc
(svn r19814) -Codechange: give some more unnamed enums a name, in case they consisted of unrelated values use static const (u)int
14 years ago
b04de719b3
(svn r19369) -Codechange: EnsureNoTrainOnTrackBits() returns a CommandCost now.
14 years ago
014f651e65
(svn r19365) -Codechange: Move EnsureNoTrainOnTrackProc() to src/vehicle.cpp.
14 years ago
9467b7c6d6
(svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header
15 years ago
4c342c6f76
(svn r17464) -Codechange: use C++0x mode when compiling with gcc >= 4.3 or icc >= 11.0
15 years ago
99d46e0ad7
(svn r17248) -Fix: add GPL license notice where appropriate
15 years ago
00a9b2fd3d
(svn r16938) -Codechange: introduce helper function to tell whether a tile is either a rail station or rail waypoint tile
15 years ago
b0e85a1f92
(svn r16915) -Fix (r16909): signal updates didn't propagate through waypoints
15 years ago
100cb17fa8
(svn r16909) -Fix [FS#2996]: NewGRF stations would be triggering assertions all over the place when using the more advanced station types.
...
-Change: make (rail) waypoints sub classes of 'base stations', make buoys waypoints and unify code between them where possible.
15 years ago
af85994f7f
(svn r16527) -Codechange: use static member functions instead of simple casts when converting Vehicle to specialised vehicle types. Includes safety check
15 years ago
d091c7d80f
(svn r16492) -Remove: support for gcc2. It hasn't been able to compile OTTD for months. All attempts to do another workaround failed.
15 years ago
580e478e4e
(svn r16491) -Codechange: Added parentheses around bitwise operators for code style.
15 years ago
6350648a6c
(svn r16392) -Codechange: move some variables (the ones that aren't caches) from VehicleRail to Train
15 years ago
1324100d69
(svn r16391) -Codechange: use Train instead of Vehicle where appropriate.
15 years ago
0c10daa243
(svn r16327) -Codechange: replace IsValidPoolItemID(index) by PoolItem::IsValidID(index)
15 years ago
9021c20b5e
(svn r15299) -Cleanup: remove many redundant includes
16 years ago
e589c7e580
(svn r14422) -Codechange: also reflect the changes of r14421 in the filenames.
16 years ago
f56e630e5c
(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
6e67ea1f9d
(svn r14258) -Codechange: rework the way to query the vehicle hash to make sure it always results in the same irregardless of the order of the hash-linked-list.
...
-Fix: desync in PBS reservation following, vehicle flooding and road vehicle overtake/follow code.
16 years ago
e78a235293
(svn r13960) -Codechange [YAPP]: Reserve a path when exiting a depot into a PBS block. (michi_cc)
16 years ago
c34a1db15e
(svn r13933) -Codechange [YAPP]: Handle through and PBS signals correctly in the signal code. (michi_cc)
16 years ago
2b6978e48e
(svn r13912) -Codechange: remove some casts by returning the proper type instead of void*.
16 years ago
6898a76c5f
(svn r13719) -Codechange: rename IsValidPlayer to IsValidPlayerID in line with all other structs/classes that are in a pool.
16 years ago
c1a1e28b88
(svn r13589) -Fix (r11802): signals could be propagated through waypoints built in orthogonal axis
16 years ago
6b4f70099e
(svn r13207) -Fix: misleading comments (michi_cc)
16 years ago
9b8d16b7ff
(svn r13088) -Codechange: use SigSegState enum instead of bool variable (michi_cc)
16 years ago
f4b07a78c4
(svn r12762) -Fix: tabs after the first non-tab character are generally not okay (or lines starting with a space and then tabs).
16 years ago
7f3d56041b
(svn r12199) -Codechange: Remove magic around the results of GetTileTrackStatus().
17 years ago
e01a7e2e91
(svn r11903) -Fix: try to fix MorphOS compilation
17 years ago
61e40b1aa5
(svn r11871) -Fix [FS#1074]: do not update signals after each tile when building/removing a large block of track/signals/station
17 years ago
81cad58c68
(svn r11864) -Codechange: pass owner whose signals we will update instead of complex detection later
17 years ago
2fc62eab05
(svn r11818) -Codechange: split player.h into smaller pieces.
17 years ago
81b3635c80
(svn r11815) -Codechange (r11802): some compilers were giving a false warning about uninitialized variable
17 years ago
Jonathan G Rennison
patch-import
rubidium
planetmaker
terkhen
alberth
smatz
frosch