dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
46,653 Commits 1 Branch 0 Tags
ce80eedd96dc1d23511dbcdb153b668efe8888ca
Commit Graph

46653 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan G Rennison
c053549144 Merge branch 'signal_tunnels_bridges' into jgrpp 2018-04-25 22:33:10 +01:00
Jonathan G Rennison
c92a28a072 Preserve signal simulation/reservation data when upgrading bridges. 
Based on commit 301925f948c9b36966c9c668e1476c2485425338
 2018-04-25 22:32:50 +01:00
Jonathan G Rennison
714b9711e4 Merge branch 'custom_bridgeheads' into jgrpp 
# Conflicts:
#	src/tunnelbridge_cmd.cpp
 2018-04-25 21:59:22 +01:00
Jonathan G Rennison
ff6a3ed234 Preserve custom bridge head road data when upgrading bridges. 
Based on commit 301925f948c9b36966c9c668e1476c2485425338
 2018-04-25 18:51:15 +01:00
Jonathan G Rennison
78cce81bac Prevent AIs/scripts from creating road custom bridge heads. 
(cherry picked from commit f3dde49ff8)
 2018-04-24 22:08:09 +01:00
Jonathan G Rennison
e138d3564b Fix tram reversing on custom bridge head tiles. 
(cherry picked from commit 0a345efc27)
 2018-04-24 22:08:03 +01:00
Jonathan G Rennison
de4d958808 Fix tracerestrict current order test on load through advance order 2018-04-24 21:30:00 +01:00
Pavel Stupnikov
8e4bce58ea Feature: GS methods to scroll viewport for players (#6745) 2018-04-24 19:19:00 +02:00
gdinit
34b63930f5 Fix: Typo in game.hpp 
Just a typo fix in a code comment line.
 2018-04-23 23:14:23 +02:00
ZehMatt
692c753865 Change: win9x installer configuration to correct path. 2018-04-22 19:24:07 +02:00
ZehMatt
e7cc53ed62 Add: post build events to VS projects to copy the output into 'bin' 2018-04-22 19:24:07 +02:00
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
Pavel Stupnikov
6ff81b908e Feature #6459: API for querying network clients from GS (#6736) 2018-04-22 15:42:29 +02:00
Jonathan G Rennison
2e4ac325e2 Add extra data fields to Order extended data 2018-04-22 12:58:50 +01:00
Michael Lutz
e0ae67cefa Fix: [OSX] Compiler warning about an unused NULL argument. 2018-04-21 22:42:14 +02:00
Patric Stout
a4df8bc246 Change: fail in same step as the reason for failing is in CI result 
This makes it easier for people to understand what went wrong
 2018-04-21 16:31:22 +02:00
Patric Stout
4d5396980a Change: always pull latest image when running CI 2018-04-21 16:31:22 +02:00
Patric Stout
8c531f1278 Add: also validate Pull Requests with clang 6.0 with OSX as target 2018-04-21 16:31:22 +02:00
Charles Pigott
86012e10ea Fix: Remove need to instantiate SmallStack's pool object by making it a singleton method 2018-04-21 16:28:50 +02:00
Charles Pigott
5c5267726f Fix: Warning about base set template instantiations with clang 2018-04-21 16:28:50 +02:00
Ricardo N Feliciano
e8de33a61f Cleanup: Use new filename for README file. (#6738) 2018-04-21 11:05:38 +02:00
PeterN
3b32075e8a Add: {PUSH_COLOUR} and {POP_COLOUR} control codes to handle switching colours. (#6737) 
This replaces the internal SCC_PREVIOUS_COLOUR swap.
 2018-04-19 19:33:21 +01:00
translators
f4f9e18790 Update: Translations from eints 
belarusian: 3 changes by KorneySan
 2018-04-19 19:45:40 +02: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
Pavel Stupnikov
9175c349da Fix #6465: Add {NORMAL_FONT} and {MONO_FONT} control codes to GS strings (#6726) 2018-04-17 18:41:31 +01:00
Peter Nelson
4d6a5fbec4 Fix: Four group action icons were misplaced and cropped. 2018-04-17 19:05:35 +02: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
Patric Stout
88be2413ce Codechange #6729: mute bogus GCC 7 warning (#6733) 
We do a memset of (byte - byte), which strictly seen ranges from -254 .. 255, for which GCC warns.
But just before this memset is an if() which says the first byte has to be bigger than the second.
So this is a bogus warning.
 2018-04-16 23:48:19 +02:00
translators
a72117111e Update: Translations from eints 
spanish (mexican): 6 changes by Absay
 2018-04-16 23:25:46 +02:00
Andy
6d31478988 Doc: add CONTRIBUTING.md (derived from Bootstrap) (#6732) 2018-04-16 23:20:04 +02:00
Charles Pigott
00c1603256 Fix e614357: Ask the compiler who it is, instead of using symlinks (#6727) 
This fixes #6723
 2018-04-15 23:07:17 +02:00
Patric Stout
ce6761a6de Change: [Jenkinsfile] Set a git user.email and user.name before rebase (#6728) 
Rebase demands both are set, otherwise it refuses to work
 2018-04-15 22:22:32 +02:00
Heiko August
079f774fd7 Doc #6698: rewrite of the readme in Markdown syntax 2018-04-15 22:10:54 +02:00
Heiko August
413ece9b51 Doc #6698: rename the readme.txt to REAMDE.md 2018-04-15 22:10:54 +02:00
Michael Lutz
7dd6027194 Codechange: Use a SmallVec for the animated tile list instead of replicating most of the logic. 2018-04-15 20:49:29 +02:00
Michael Lutz
4851feb102 Codechange: Add functions to insert and extract an element at a specific position in a SmallVec. 2018-04-15 20:49:29 +02:00
Michael Lutz
f240274b7e Codechange: Replace magic numbers with the proper enum. 2018-04-15 00:33:57 +02:00
Patric Stout
158eed669a Add: [Jenkinsfile] rebase the pull-request on top of master (#6720) 
This allows PRs to be a bit older, but still validate the correct result
 2018-04-14 22:14:10 +02:00
glx
bd18951db1 Codechange: a .aps is created by MSVC when opening a .rc, so ignore it 2018-04-14 22:06:28 +02:00
Patric Stout
aaf7e98c77 Fix 6ac0790: don't show the location to / failure of 'realpath' every time (#6719) 2018-04-14 22:05:39 +02:00
Patric Stout
43338b8a45 Change: [JenkinsFile] allow easier configuration stages 2018-04-14 20:19:59 +02:00