Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-17 21:25:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,291 Commits 12 Branches 180 Tags 451 MiB
97fd250d21
Commit Graph

24291 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan G Rennison
97fd250d21 Remove conditional order refs when removing tracerestrict slot 
See #40
 2018-04-22 15:03:16 +01:00
keldorkatarn
78588d8ce5 First implementation of conditional order checking slot occupancy 
(cherry picked from commit 524e3e56cb4a357ba60335f91dce1e00cb8d22f2)

Some code adjustments: serialisation/storage, formatting

See: #40
 2018-04-22 15:03:16 +01:00
Jonathan G Rennison
2e4ac325e2 Add extra data fields to Order extended data 2018-04-22 12:58:50 +01:00
Jonathan G Rennison
f96f716a75 Merge branch 'enhanced_viewport_overlay' into jgrpp 2018-04-19 09:31:55 +01:00
keldorkatarn
8df549284f Route Line Rendering: Properly prevent endless loop due to conditional orders cycle. 
(cherry picked from commit ac1c26f5fe942ef47c664ff71000053d874a6008)

See #39
 2018-04-19 09:28:29 +01:00
keldorkatarn
d154debb5e FIX: Endless look in vehicle route drawing if conditional orders form a cycle (in the simplest form, a conditional order skipping to itself) 
(cherry picked from commit 680ddba875208b09160908ad03064b542193df4e)

See: #39
 2018-04-18 16:02:14 +01:00
Jonathan G Rennison
02328680a1 Merge branch 'tracerestrict-sx' into jgrpp 2018-04-17 16:35:38 +01:00
Jonathan G Rennison
8e903b0a85 Merge branch 'departure-boards' into jgrpp 2018-04-17 16:35:29 +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
keldorkatarn
f10840438e TraceRestrictSlots: Fix highlighting behavior. Marking group ALL_SLOTS didn't reset the selected slot and dragging from ALL to ALL threw an unnecessary error. 
(cherry picked from commit c76b560134bd8d9869ead872f7a434e61a5c5a48)

Fixes: #38
 2018-04-17 16:34:19 +01:00
keldorkatarn
2f3e4044b7 FIX: TraceRestrictSlots: Fix crash when removing vehicle from slot. Invalid iterator got used. (it was no longer valid after calling erase with it) 
(cherry picked from commit 3571f1bc898b9ffd8b124040882caa5357085f42)

Fixes: #37
 2018-04-17 16:34:03 +01:00
keldorkatarn
d2ca8914ac Departure Boards: Allow Ctrl-Click on vehicle type buttons to show type exclusively 
(cherry picked from commit a834d3cd452fe28e2c32fb953d41c0bd0ce20494)

See: #36
 2018-04-17 16:30:59 +01:00
keldorkatarn
9ab2b8fa3e FIX: {PREVIOUS_COLOUR} string control code was not activated for some reason. The logic for it is in place. 
(cherry picked from commit 9d7c265fdca7884db26b3c2d0f856cc18a751c54)

Fixes: #41
 2018-04-17 16:11:19 +01:00
Jonathan G Rennison
9be65dc96d Fix use of wrong veh tile for station animation/trigger in through load 2018-03-29 23:46:21 +01:00
Jonathan G Rennison
6ec78ff4b0 Add UI setting to disable mass action buttons for top-level vehicle lists 2018-03-29 20:39:25 +01:00
Jonathan G Rennison
53dd010f3b Add way to mass cancel vehicle go to depot/service 2018-03-29 19:37:16 +01:00
Jonathan G Rennison
2821599f6b Better handle out of track and depot through load cases 
Add advice messages for when loading is aborted due to out of track/depot
Handle non-aligned use of platform
Fix full-load behaviour
Fix speed limiting whilst advancing
 2018-03-29 19:16:44 +01:00
Jonathan G Rennison
7aab49e282 Add setting to enable through loading in UI 2018-03-29 18:52:54 +01:00
Jonathan G Rennison
8337fcb271 Fix disaster vehicles having uninitialised sprite bounds 2018-03-27 17:52:11 +01:00
Jonathan G Rennison
4cdc253c38 Add dev console command to trigger disaster 2018-03-27 17:51:45 +01:00
Jonathan G Rennison
7c620edb52 Avoid auto-refitting to cargo which is marked no-load in per-cargo type order 2018-03-27 02:04:22 +01:00
Jonathan G Rennison
c779915ccb Fix train through load always advancing last section to far end of platform 2018-03-26 21:11:11 +01:00
Jonathan G Rennison
f012d45491 Merge branch 'signal_tunnels_bridges' into jgrpp 2018-03-26 20:49:11 +01:00
Jonathan G Rennison
df72bc6e09 Fix signal on tun/bridge gradual decel end tile detection 2018-03-26 20:48:52 +01:00
Jonathan G Rennison
78838ee2a2 Add freight train load/unload mode: through load 2018-03-26 20:12:50 +01:00
Jonathan G Rennison
52edafab5e Add savegame support for 32 bit Train::flags field 2018-03-26 19:50:34 +01:00
Jonathan G Rennison
09ca051ff8 Merge branch 'signal_tunnels_bridges' into jgrpp 
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
#	src/train.h
 2018-03-26 18:42:23 +01:00
Jonathan G Rennison
def3a3933b Move dual-use of load_unload_ticks for bridge/tun signals to new field 2018-03-26 18:40:05 +01:00
Jonathan G Rennison
10db379202 Merge branch 'signal_tunnels_bridges' into jgrpp 
# Conflicts:
#	src/train_cmd.cpp
 2018-03-25 00:57:59 +00:00
Jonathan G Rennison
38cb80872b Gradually slow down for red signals on bridges/tunnels 
Instead of coming to a sudden halt immediately before the signal
 2018-03-25 00:57:20 +00:00
Jonathan G Rennison
70b6500d73 Merge branch 'save_ext' into jgrpp 2018-03-22 23:13:16 +00:00
Jonathan G Rennison
c2ab4cb2ae Fix commit fb946f6a, which broke new game/map creation 2018-03-22 23:11:19 +00:00
Jonathan G Rennison
22724e13bc Merge branch 'save_ext' into jgrpp 2018-03-20 01:15:21 +00:00
Jonathan G Rennison
fb946f6a2b Don't reset savegame feature versions at end of DoLoad, so that -q works 2018-03-20 01:15:01 +00:00
Jonathan G Rennison
80c0655c06 Relax validation for conditional order travel time in old savegame load 2018-03-11 22:42:37 +00:00
Jonathan G Rennison
ab390253b1 Fix typo in changelog: trunk SVN rev number for jgrpp-0.23.0 
See #32
 2018-03-11 22:27:22 +00:00
Jonathan G Rennison
385a2552e9 Merge branch 'enhanced_viewport_overlay' into jgrpp 2018-03-11 22:21:39 +00:00
Jonathan G Rennison
864d94d2c5 Merge branch 'save_ext' into enhanced_viewport_overlay 
# Conflicts:
#	src/industry_cmd.cpp
#	src/vehicle.cpp
 2018-03-11 22:16:19 +00:00
Jonathan G Rennison
16c67ea484 Merge branch 'master' into enhanced_viewport_overlay 
# Conflicts:
#	src/industry_cmd.cpp
#	src/saveload/saveload.cpp
#	src/stdafx.h
#	src/vehicle.cpp
 2018-03-11 22:10:21 +00:00
Jonathan G Rennison
cb2077edd5 Zoning: Fix unserved building/industry highlight not being removed when tile cleared 2018-03-11 22:07:33 +00:00
frosch
a537fd5d0e (svn r27989) -Fix (r27985): VA2 optimisation failed in various special cases: 
- nvar=0 is meant to return the calculated result.
  - Missing references resolve to NULL and got identified with the default result.
  - Missing 'break' broke overlapping cases.
  - Splitting into non-overlapping cases could result in more than 256 cases.
 2018-03-11 15:08:51 +00:00
frosch
23b21b15eb (svn r27988) -Codechange: Extent hg- and gitignore for .vs 2018-03-11 13:34:28 +00:00
frosch
25a2b98b4c (svn r27987) -Change: Increase maximum allowed vehicle sprite size to reduce clipping of ships. 2018-03-11 13:25:26 +00:00
frosch
6b088d37bf (svn r27986) -Codechange: Name magic constants in the vehicle position hash functions. 2018-03-11 13:23:26 +00:00
frosch
30f73d907a (svn r27985) -Codechange: Convert VA2 switches into ones with non-overlapping ranges, sort them and resolve them using binary search. Speedup sprite resolving by about 7 percent. 2018-03-11 13:21:27 +00:00
frosch
29dca1be3b (svn r27984) -Codechange: Make ScopeResolver constructors/destructors inlineable. Speedup sprite resolving by about 8 percent. 2018-03-11 13:19:41 +00:00
frosch
2a3d0cea50 (svn r27983) -Codechange: Reduce complexity of VA2 add-div/mod adjustments 2018-03-11 13:18:13 +00:00
frosch
aee8ffc73b (svn r27982) -Codechange: Reduce invocations of GetGlobalVariable. Speedup sprite resolving by about 3 percent. 2018-03-11 13:17:44 +00:00
frosch
8f47687b84 (svn r27981) -Change [FS#6679]: Check companies for bankruptcy before subtracting reoccuring monthly costs. (Samu) 2018-03-11 12:46:05 +00:00
frosch
b1592787eb (svn r27980) -Doc: Yearly increment 2018-03-11 12:24:32 +00:00