1fe0bb76b9
Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp
7 years ago
1e6b57675b
Merge branch 'master' into version_utils
7 years ago
4bcd05a620
Merge branch 'cpp-11' into save_ext
...
# Conflicts:
# findversion.sh
7 years ago
f42cc19aad
Merge branch 'cpp-11' into crashlog_improvements
...
# Conflicts:
# Makefile.src.in
# src/crashlog.cpp
# src/crashlog.h
7 years ago
b90c5b9618
Merge branch 'master' into cpp-11
...
# Conflicts:
# src/stdafx.h
7 years ago
b7ce21038a
Merge branch 'custom_bridgeheads' into jgrpp
...
# Conflicts:
# src/tunnelbridge_cmd.cpp
7 years ago
1911c0cb69
Fix handling of custom bridge head ramp-only pieces/types when upgrading
7 years ago
c053549144
Merge branch 'signal_tunnels_bridges' into jgrpp
7 years ago
c92a28a072
Preserve signal simulation/reservation data when upgrading bridges.
...
Based on commit 301925f948c9b36966c9c668e1476c2485425338
7 years ago
714b9711e4
Merge branch 'custom_bridgeheads' into jgrpp
...
# Conflicts:
# src/tunnelbridge_cmd.cpp
7 years ago
ff6a3ed234
Preserve custom bridge head road data when upgrading bridges.
...
Based on commit 301925f948c9b36966c9c668e1476c2485425338
7 years ago
78cce81bac
Prevent AIs/scripts from creating road custom bridge heads.
...
(cherry picked from commit f3dde49ff8
7 years ago
e138d3564b
Fix tram reversing on custom bridge head tiles.
...
(cherry picked from commit 0a345efc27
7 years ago
de4d958808
Fix tracerestrict current order test on load through advance order
7 years ago
8e4bce58ea
Feature: GS methods to scroll viewport for players ( #6745 )
7 years ago
34b63930f5
Fix: Typo in game.hpp
...
Just a typo fix in a code comment line.
7 years ago
692c753865
Change: win9x installer configuration to correct path.
7 years ago
e7cc53ed62
Add: post build events to VS projects to copy the output into 'bin'
7 years ago
97fd250d21
Remove conditional order refs when removing tracerestrict slot
...
See #40
7 years ago
78588d8ce5
First implementation of conditional order checking slot occupancy
...
(cherry picked from commit 524e3e56cb4a357ba60335f91dce1e00cb8d22f2)
Some code adjustments: serialisation/storage, formatting
See: #40
7 years ago
6ff81b908e
Feature #6459 : API for querying network clients from GS ( #6736 )
7 years ago
2e4ac325e2
Add extra data fields to Order extended data
7 years ago
e0ae67cefa
Fix: [OSX] Compiler warning about an unused NULL argument.
7 years ago
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
7 years ago
4d5396980a
Change: always pull latest image when running CI
7 years ago
8c531f1278
Add: also validate Pull Requests with clang 6.0 with OSX as target
7 years ago
86012e10ea
Fix: Remove need to instantiate SmallStack's pool object by making it a singleton method
7 years ago
5c5267726f
Fix: Warning about base set template instantiations with clang
7 years ago
e8de33a61f
Cleanup: Use new filename for README file. ( #6738 )
7 years ago
3b32075e8a
Add: {PUSH_COLOUR} and {POP_COLOUR} control codes to handle switching colours. ( #6737 )
...
This replaces the internal SCC_PREVIOUS_COLOUR swap.
7 years ago
f4f9e18790
Update: Translations from eints
...
belarusian: 3 changes by KorneySan
7 years ago
f96f716a75
Merge branch 'enhanced_viewport_overlay' into jgrpp
7 years ago
8df549284f
Route Line Rendering: Properly prevent endless loop due to conditional orders cycle.
...
(cherry picked from commit ac1c26f5fe942ef47c664ff71000053d874a6008)
See #39
7 years ago
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
7 years ago
9175c349da
Fix #6465 : Add {NORMAL_FONT} and {MONO_FONT} control codes to GS strings ( #6726 )
7 years ago
4d6a5fbec4
Fix: Four group action icons were misplaced and cropped.
7 years ago
02328680a1
Merge branch 'tracerestrict-sx' into jgrpp
7 years ago
8e903b0a85
Merge branch 'departure-boards' into jgrpp
7 years ago
4955996b35
Remove costly recalculation of a date format we already have.
...
(cherry picked from commit 6aca18d18252f1c2f6d4a215999b7d7afb7df813)
See #36
7 years ago
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
7 years ago
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
7 years ago
d2ca8914ac
Departure Boards: Allow Ctrl-Click on vehicle type buttons to show type exclusively
...
(cherry picked from commit a834d3cd452fe28e2c32fb953d41c0bd0ce20494)
See: #36
7 years ago
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
7 years ago
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.
7 years ago
a72117111e
Update: Translations from eints
...
spanish (mexican): 6 changes by Absay
7 years ago
6d31478988
Doc: add CONTRIBUTING.md (derived from Bootstrap) ( #6732 )
7 years ago
00c1603256
Fix e614357: Ask the compiler who it is, instead of using symlinks ( #6727 )
...
This fixes #6723
7 years ago
ce6761a6de
Change: [Jenkinsfile] Set a git user.email and user.name before rebase ( #6728 )
...
Rebase demands both are set, otherwise it refuses to work
7 years ago
079f774fd7
Doc #6698 : rewrite of the readme in Markdown syntax
7 years ago
413ece9b51
Doc #6698 : rename the readme.txt to REAMDE.md
7 years ago
Jonathan G Rennison
Pavel Stupnikov
gdinit
ZehMatt
keldorkatarn
Michael Lutz
Patric Stout
Charles Pigott
Ricardo N Feliciano
PeterN
translators
Peter Nelson
Andy
Heiko August