ad1c402ad8
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/debug.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/settings_type.h
# src/town_cmd.cpp
# src/window.cpp
6 years ago
fef8b831a9
Change: Switch town growth rate and counter to actual game ticks ( #6763 )
6 years ago
cfb8092397
Fix b4b98e5165: Use FALLTHROUGH attribute with correct indentation.
6 years ago
944f785be8
Fix: Spelling errors ( #6769 )
6 years ago
a6b18f0d92
Fix #6090 : And (svn r27822). Run scripts for widgets. ( #6765 )
...
Fix 19f5a6cbb0#6765 )
6 years ago
913119487f
Feature: Add GS method to question a single client ( #6748 )
6 years ago
1fe0bb76b9
Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp
6 years ago
8e4bce58ea
Feature: GS methods to scroll viewport for players ( #6745 )
6 years ago
6ff81b908e
Feature #6459 : API for querying network clients from GS ( #6736 )
6 years ago
78838ee2a2
Add freight train load/unload mode: through load
6 years ago
09d4735679
(svn r27993) -Change: Heading for 1.9 now
6 years ago
4a0d949d83
Merge branch 'master' into jgrpp
7 years ago
b69c0acca2
(svn r27950) -Merge: Documentation updates from 1.7 branch
7 years ago
54040bd31a
(svn r27950) -Merge: Documentation updates from 1.7 branch
7 years ago
1d3cf59d8a
Allow building multiple docks per station.
...
(cherry picked from commit 0110c4a35d383e0be2cbb53cbe9cbe6784abb3e9)
# Conflicts:
# src/station_cmd.cpp
7 years ago
f34833f111
Merge branch 'improved_breakdowns' into jgrpp
...
# Conflicts:
# src/vehiclelist.cpp
7 years ago
b4b98e5165
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
7 years ago
a47fb85cd8
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
7 years ago
f3dde49ff8
Prevent AIs/scripts from creating road custom bridge heads.
7 years ago
ac69b746ab
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/gfxinit.cpp
# src/saveload/saveload.cpp
7 years ago
afcef7faa6
(svn r27780) -Update: Numbers
7 years ago
ed63b48e76
(svn r27780) -Update: Numbers
7 years ago
9fa6e3d83a
(svn r27776) -Merge: Documentation updates from 1.6 branch
7 years ago
ffcdd47321
(svn r27776) -Merge: Documentation updates from 1.6 branch
7 years ago
a6168dd2f0
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/saveload/company_sl.cpp
7 years ago
2bb80d280c
(svn r27758) -Change: Increase the maximum number of GameScript texts to 64k, and NewGRF texts to 512k.
7 years ago
ce32ca4dc6
(svn r27758) -Change: Increase the maximum number of GameScript texts to 64k, and NewGRF texts to 512k.
7 years ago
fc4c4d080c
(svn r27757) -Change: Make StringID 32bit.
7 years ago
0c1fcc02ec
(svn r27757) -Change: Make StringID 32bit.
7 years ago
a56e2bccd0
(svn r27756) -Codechange: Add StringTab enum
7 years ago
49b940f69c
(svn r27756) -Codechange: Add StringTab enum
7 years ago
9ad09627ad
(svn r27754) -Codechange: Add GetStringTab(), GetStringIndex() and MakeStringID() to access the structure of StringIDs.
7 years ago
02967c3c08
(svn r27754) -Codechange: Add GetStringTab(), GetStringIndex() and MakeStringID() to access the structure of StringIDs.
7 years ago
90cd312428
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/fios.h
8 years ago
7b553d255e
(svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message.
8 years ago
050271ed2d
(svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message.
8 years ago
58381a3ea2
Merge branch 'master' into jgrpp
8 years ago
ad43465c31
(svn r27683) -Change: Rearrange the autoreplace GUI for trains, and do not filter it by railtype by default.
8 years ago
da76191afc
(svn r27683) -Change: Rearrange the autoreplace GUI for trains, and do not filter it by railtype by default.
8 years ago
37a58fd11d
Add setting to increase station catchment radius.
...
Update acceptance and refresh screen when catchment settings change.
8 years ago
9ea018abc5
Merge branch 'cargo_type_order' into jgrpp
...
# Conflicts:
# src/order_base.h
# src/order_gui.cpp
# src/order_type.h
# src/saveload/extended_ver_sl.cpp
# src/saveload/extended_ver_sl.h
# src/vehicle_base.h
8 years ago
e6122f5ce4
Remove ZeroedMemoryAllocator from ScriptText
...
Have ScriptText initialise all of its members on construction and
not derive from ZeroedMemoryAllocator.
(cherry picked from commit 3240126202d3437396004f2d5b0371783effb1ea)
Reorder ScriptText constructor initialisers.
8 years ago
c1c983ea16
Import cargo type orders patch
...
https://www.tt-forums.net/viewtopic.php?p=1047749#p1047749
Port to current trunk, resolve various conflicts, etc.
Adjust bit allocations for CmdModifyOrder.
Use save_ext framework for added order flags.
8 years ago
655b329142
Merge branch 'master' into jgrpp
...
# Conflicts:
# config.lib
8 years ago
a2edf52b41
(svn r27594) -Fix [FS#6473]: [Script] Kill scripts, when a non-suspendable valuator call takes way too long.
8 years ago
842aaf7cdd
(svn r27594) -Fix [FS#6473]: [Script] Kill scripts, when a non-suspendable valuator call takes way too long.
8 years ago
f6d374ade4
Merge branch 'house_placing' into jgrpp
...
This reverts the house picking/placing patch back to v2.
This is to fix house placement/town growth desync issues introduced in v4.
# Conflicts:
# src/settings_gui.cpp
# src/settings_type.h
# src/town_gui.cpp
8 years ago
95b65163e3
Revert back to v2 of house picking/placing patch.
8 years ago
3da991bf9b
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/rail_gui.cpp
8 years ago
da7978a08c
(svn r27545) -Fix: Remove special handling of classes with virtual methods from squirrel_export.awk. It seems to serve no purpose, except to break on 3 classes.
8 years ago
Jonathan G Rennison
Pavel Stupnikov
J0an Josep
frosch
keldorkatarn
cirdan