dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
48,169 Commits 1 Branch 0 Tags
2105d213564a07989f869279cf5238b87c88966a
Commit Graph

48169 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Niels Martin Hansen
76cccc64c9 Codechange: Music GUI comments and function naming 2018-04-29 19:26:05 +02:00
Patric Stout
0165fe1283 Codechange: remove endian_check in favour of __BYTE_ORDER macro (Rubidium) (#6762) 2018-04-29 19:01:28 +02:00
Jonathan G Rennison
fc8779dc3d Merge branch 'version_utils' into jgrpp 2018-04-29 15:02:25 +01:00
Jonathan G Rennison
57412675b7 Update handling of .ottdrev-vc file in findversion.sh 2018-04-29 15:02:12 +01:00
Patric Stout
aef69443e7 Remove: WinCE support 2018-04-29 15:32:16 +02:00
Patric Stout
85adde7485 Remove: PSP support 2018-04-29 15:32:16 +02:00
Pavel Stupnikov
8d8b9a026a Feature #6610: Allow towns to build houses on road turns (#6758) 2018-04-28 23:47:36 +02:00
PeterN
cfe6a8ea4f Add: Replace independment map scrolling GUI settings with single option, and add choice to not lock cursor position when scrolling. (#6756) 2018-04-28 22:27:14 +01:00
Pavel Stupnikov
913119487f Feature: Add GS method to question a single client (#6748) 2018-04-28 17:37:59 +02:00
Jonathan G Rennison
1fe0bb76b9 Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp 2018-04-27 02:42:20 +01:00
Jonathan G Rennison
1e6b57675b Merge branch 'master' into version_utils 2018-04-27 01:38:34 +01:00
Jonathan G Rennison
4bcd05a620 Merge branch 'cpp-11' into save_ext 
# Conflicts:
#	findversion.sh
 2018-04-27 01:33:39 +01:00
Jonathan G Rennison
f42cc19aad Merge branch 'cpp-11' into crashlog_improvements 
# Conflicts:
#	Makefile.src.in
#	src/crashlog.cpp
#	src/crashlog.h
 2018-04-27 00:33:44 +01:00
Jonathan G Rennison
b90c5b9618 Merge branch 'master' into cpp-11 
# Conflicts:
#	src/stdafx.h
 2018-04-26 23:59:13 +01:00
Jonathan G Rennison
b7ce21038a Merge branch 'custom_bridgeheads' into jgrpp 
# Conflicts:
#	src/tunnelbridge_cmd.cpp
 2018-04-26 21:08:52 +01:00
Jonathan G Rennison
1911c0cb69 Fix handling of custom bridge head ramp-only pieces/types when upgrading 2018-04-26 21:07:58 +01:00
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