b8328ad21f
Merge branch 'tracerestrict-sx' into jgrpp
...
# Conflicts:
# src/command.cpp
# src/group_gui.cpp
# src/lang/english.txt
# src/saveload/extended_ver_sl.cpp
# src/settings_gui.cpp
# src/tracerestrict.cpp
# src/tracerestrict.h
# src/tracerestrict_gui.cpp
# src/vehicle_gui.cpp
# src/vehicle_gui_base.h
# src/vehiclelist.cpp
# src/window_type.h
7 years ago
6417fb16c3
Initial implementation of trace restrict slots
7 years ago
fba4268127
Build and refit vehicle test no longer needs to match exec command.
7 years ago
4c5173b6bf
Merge branch 'auto_timetables-sx' into jgrpp
...
# Conflicts:
# src/lang/english.txt
# src/saveload/afterload.cpp
# src/saveload/extended_ver_sl.cpp
# src/settings_gui.cpp
# src/settings_type.h
# src/table/company_settings.ini
# src/vehicle.cpp
8 years ago
d59252d15b
Timetable auto separation is now per vehicle, with a company default.
...
Remove global on-off setting.
Add button to timetable GUI.
Add company setting to control default for new vehicles.
Fix automate, start date, change time and autofill buttons
being shown enabled for other companies' vehicles.
8 years ago
ca9f6411cc
Implement adding a vehicle list to a new group.
8 years ago
c0cc72ad96
Implement change timetable waiting time for all stations.
...
Loosely based on http://www.tt-forums.net/viewtopic.php?f=32&t=50274
8 years ago
5dba89c783
Merge branch 'crashlog_improvements' into jgrpp
...
# Conflicts:
# source.list
# src/openttd.cpp
# src/stdafx.h
# src/vehicle.cpp
8 years ago
48e4c35fdc
Add support for verbose asserts.
...
Use for test/exec DoCommand mismatches.
8 years ago
580b2f7584
Merge branch 'template_train_replacement-sx' into jgrpp
...
Remove a duplicated declaration.
# Conflicts:
# projects/openttd_vs100.vcxproj
# projects/openttd_vs100.vcxproj.filters
# projects/openttd_vs140.vcxproj
# projects/openttd_vs140.vcxproj.filters
# projects/openttd_vs80.vcproj
# projects/openttd_vs90.vcproj
# source.list
# src/group_gui.cpp
# src/lang/english.txt
# src/network/network_command.cpp
# src/saveload/extended_ver_sl.cpp
# src/saveload/extended_ver_sl.h
# src/saveload/saveload.cpp
# src/train_cmd.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/vehicle_gui_base.h
# src/window_type.h
8 years ago
6be2efc084
Update from KeldorKatarn branch
...
This approximately corresponds to 971ba4928a5c7c7916fea55d91a3b6dd5bba140c,
excluding the different virtual train build GUI, but including the basic
changes to the original train build GUI for multiplayer to work.
Fixup
8 years ago
2c9029703b
Add menu item to vehicle list to change order target.
...
Allow moving depot/station/waypoint orders to a different depot/etc.
9 years ago
9bd32e76bd
Merge branch 'progsig-sx' into jgrpp
...
Conflicts:
src/command.cpp
9 years ago
769b8ae096
progsig: Fix remove and clone program functions being completely broken.
...
Remove function only removed instructions from the local machine, and
was therefore not MP safe.
Clone function failed to work correctly for non-trivial cases,
and sometimes caused an array out of bounds assertion.
These are replaced by a new commandproc which does each operation
as a single action, which is therefore MP safe.
Remove an unused struct field.
9 years ago
f6a8f27501
Make server and all clients run desync checks if a client desyncs.
9 years ago
7ed93f9211
Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
...
town_gui.cpp updated due to struct CommandContainer change.
Conflicts:
src/command.cpp
src/command_type.h
src/gfxinit.cpp
src/openttd.cpp
src/pbs.cpp
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/saveload/saveload.cpp
src/stdafx.h
src/train_cmd.cpp
src/viewport_type.h
src/window_type.h
9 years ago
536a95dfd0
Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch
...
https://www.tt-forums.net/viewtopic.php?f=33&t=53394
9 years ago
ba4e5dd62f
Merge branch 'auto_timetables-sx' into jgrpp
...
Conflicts:
src/lang/english.txt
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/settings_gui.cpp
src/vehicle.cpp
9 years ago
0ebf8b6b0b
Fixes to auto timetable patch: move new VehicleFlags to end,
...
whitespace & style, fix lang strings.
9 years ago
80deb3c01d
Import auto timetable separation patch
...
http://www.tt-forums.net/viewtopic.php?p=1140899#p1140899
9 years ago
ce34225b0e
Merge branch 'house_placing' into jgrpp
9 years ago
19dcbb1cb9
Import Picking and placing single houses in scenario editor patch
...
Minor whitespace fixes
http://www.tt-forums.net/viewtopic.php?f=33&t=68894&view=unread#p1099696
9 years ago
2bcbeea011
Merge branch 'progsig-sx' into jgrpp
...
Conflicts:
src/command.cpp
src/command_type.h
src/lang/english.txt
src/rail_cmd.cpp
src/rail_gui.cpp
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/saveload/saveload.cpp
src/widgets/rail_widget.h
src/window_type.h
9 years ago
fc0efe599e
Port of the programmable signals patch to recent trunk
...
Also add some additional changes from the SpringPP patch,
and make some other minor changes/fixes.
9 years ago
5f1b148cf9
Initial minimal working tracerestrict implementation.
...
This is a port of the tracerestrict/routing restrictions feature
from TTDPatch.
At present this implements if tests (train length only),
and pathfinder deny and penalty actions.
This requires the use of YAPF. Note that restrictions are only evaluated
within the YAPF lookahead distance.
9 years ago
44d2f6a988
(svn r26802) -Add: Command to set visibility of an engine for a company (based on patch by Juanjo).
10 years ago
f72ad87540
(svn r26802) -Add: Command to set visibility of an engine for a company (based on patch by Juanjo).
10 years ago
ed8f6f1a0f
(svn r26450) -Feature: Hierarchical vehicle subgroups.
10 years ago
567d0ff3a7
(svn r26450) -Feature: Hierarchical vehicle subgroups.
10 years ago
6a571811c7
(svn r26306) -Add: [nogo] More story APIs: RemovePageElement, GetCompany, GetDate, SetDate
11 years ago
1dbd59e6ab
(svn r26306) -Add: [nogo] More story APIs: RemovePageElement, GetCompany, GetDate, SetDate
11 years ago
7b238142b8
(svn r26241) -Codechange: Remember the GRFFile which filled the TextRefStack in the TextRefStack.
11 years ago
ba1779b978
(svn r26241) -Codechange: Remember the GRFFile which filled the TextRefStack in the TextRefStack.
11 years ago
c7620a1ea7
(svn r25788) -Feature: [Script] Game Scripts can now charge fees and give money to companies
11 years ago
ab69c6c2a0
(svn r25788) -Feature: [Script] Game Scripts can now charge fees and give money to companies
11 years ago
141c08166d
(svn r25352) -Feature: GameScript API for selecting a story page to view
11 years ago
33ad9774fb
(svn r25352) -Feature: GameScript API for selecting a story page to view
11 years ago
65129db43c
(svn r25342) -Add: StoryPage data structures and GS API
11 years ago
9aa1bf0264
(svn r25342) -Add: StoryPage data structures and GS API
11 years ago
f23a61e1aa
(svn r25296) -Feature: Goals can now have a progress text and/or be marked as completed.
11 years ago
a4cddc3e08
(svn r25296) -Feature: Goals can now have a progress text and/or be marked as completed.
11 years ago
f00d9976f9
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
12 years ago
c24374f99c
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
12 years ago
90fa700cc7
(svn r24127) -Feature [FS#1497]: Allow closing airports for incoming aircraft. (Based on patch by cirdan)
12 years ago
aa47d6c7f2
(svn r24127) -Feature [FS#1497]: Allow closing airports for incoming aircraft. (Based on patch by cirdan)
12 years ago
274f446b2c
(svn r23783) -Cleanup: remove ancient but not needed command flag
13 years ago
1a0fe0e8c6
(svn r23783) -Cleanup: remove ancient but not needed command flag
13 years ago
59de5e9570
(svn r23731) -Add: add GSGoal::Question(), to ask a question to a(ll) company(ies). It can contain random text, and at most 3 buttons from a collection of 17
13 years ago
34d90da509
(svn r23731) -Add: add GSGoal::Question(), to ask a question to a(ll) company(ies). It can contain random text, and at most 3 buttons from a collection of 17
13 years ago
304156a297
(svn r23683) -Fix [FS#4912]-ish: when fitting another engine the cargo capacity of wagons could become lower, causing them to contain more than they should. This caused the cargo transfer from the replaced parts to put even more stuff in the already full wagon. Prevent this from happening by reducing the amount of cargo in the vehicle to the capacity when moving vehicles/wagons around, or when autoreplacing
13 years ago
8d125a60ce
(svn r23683) -Fix [FS#4912]-ish: when fitting another engine the cargo capacity of wagons could become lower, causing them to contain more than they should. This caused the cargo transfer from the replaced parts to put even more stuff in the already full wagon. Prevent this from happening by reducing the amount of cargo in the vehicle to the capacity when moving vehicles/wagons around, or when autoreplacing
13 years ago
aa1a0053b0
(svn r23640) -Fix: stop using FORCEINLINE (1/3rd of the instances were, the others were still regular inline), but make sure inline is always a 'forced' inline (I am looking at you MSVC)
13 years ago
1c9bec1999
(svn r23640) -Fix: stop using FORCEINLINE (1/3rd of the instances were, the others were still regular inline), but make sure inline is always a 'forced' inline (I am looking at you MSVC)
13 years ago
ccf9b01f5d
(svn r23630) -Add: a Goal GUI to show your current goals
13 years ago
3ada3b9cc5
(svn r23630) -Add: a Goal GUI to show your current goals
13 years ago
2fc120d4d1
(svn r23628) -Add: ScriptSubsidy::Create, to create subsidies (GameScript only)
13 years ago
5858c53420
(svn r23628) -Add: ScriptSubsidy::Create, to create subsidies (GameScript only)
13 years ago
09ef12ab03
(svn r23627) -Add: ScriptNews::Create, to create custom news messages (GameScript only)
13 years ago
e0ffe4faf2
(svn r23627) -Add: ScriptNews::Create, to create custom news messages (GameScript only)
13 years ago
6961332f05
(svn r23626) -Add: ScriptTown::SetText, which adds custom text to the Town GUI
13 years ago
ad48ab9237
(svn r23626) -Add: ScriptTown::SetText, which adds custom text to the Town GUI
13 years ago
b00fcef81a
(svn r23620) -Add: ScriptTown::SetCargoGoal and ScriptTown::SetGrowthRate (GameScript only)
13 years ago
afcf07ac8a
(svn r23620) -Add: ScriptTown::SetCargoGoal and ScriptTown::SetGrowthRate (GameScript only)
13 years ago
2b381d0765
(svn r23603) -Add: support for control commands in strings, in both network and safe/load (Rubidium)
13 years ago
5cda1d7c90
(svn r23603) -Add: support for control commands in strings, in both network and safe/load (Rubidium)
13 years ago
5394a8c220
(svn r23602) -Add: support for DEITY commands, commands where no real company was involved in (Rubidium)
13 years ago
577fe0238e
(svn r23602) -Add: support for DEITY commands, commands where no real company was involved in (Rubidium)
13 years ago
3d605f6488
(svn r23595) -Codechange: add comma after last enum to get a more uniform coding style
13 years ago
df16ebd730
(svn r23595) -Codechange: add comma after last enum to get a more uniform coding style
13 years ago
1cd3dac854
(svn r23215) -Codechange: stricter type safety for CommandFlags
13 years ago
f600429424
(svn r23215) -Codechange: stricter type safety for CommandFlags
13 years ago
ef5b18ab3b
(svn r22629) -Fix [FS#4599]: Remove all usages of the ErrorRefStack. It was continuously overwritten by e.g. industry prospection without closing the old error window; also StopTextRefStackUsage() was not called for errors returned by commands (which caused FS#4599). Now return in the CommandCost result whether the textref stack needs to be used, and store a copy of the stack values in the error window just like for the normal string parameters.
13 years ago
2a55273291
(svn r22629) -Fix [FS#4599]: Remove all usages of the ErrorRefStack. It was continuously overwritten by e.g. industry prospection without closing the old error window; also StopTextRefStackUsage() was not called for errors returned by commands (which caused FS#4599). Now return in the CommandCost result whether the textref stack needs to be used, and store a copy of the stack values in the error window just like for the normal string parameters.
13 years ago
a70556dac2
(svn r22459) -Doc: Typo fixes and doxygen markup improvements.
13 years ago
28092366ec
(svn r22459) -Doc: Typo fixes and doxygen markup improvements.
13 years ago
aed86fec3f
(svn r22016) -Fix [FS#4479]: when paused and having the allowed actions while paused setting on "no actions" cheating money would fail
14 years ago
68ace1b79b
(svn r22016) -Fix [FS#4479]: when paused and having the allowed actions while paused setting on "no actions" cheating money would fail
14 years ago
72a4dc53d9
(svn r21668) -Feature: command logging using the admin interface (dihedral)
14 years ago
6546561360
(svn r21668) -Feature: command logging using the admin interface (dihedral)
14 years ago
8f3607bbc7
(svn r21425) -Codechange: add "command types" to all commands
14 years ago
b3eb3b96b9
(svn r21425) -Codechange: add "command types" to all commands
14 years ago
f9edc64bb2
(svn r21403) -Change: the maximum size of the string argument of a command
14 years ago
7e9b132d04
(svn r21403) -Change: the maximum size of the string argument of a command
14 years ago
db3a6485d7
(svn r20768) -Codechange: unify send-to-depot commands
14 years ago
9badab6454
(svn r20768) -Codechange: unify send-to-depot commands
14 years ago
66d57b96a8
(svn r20748) -Fix: overbuilding an object tile with sea under it with a canal didn't take the cost for clearing the sea into account
14 years ago
0e250f2bdf
(svn r20748) -Fix: overbuilding an object tile with sea under it with a canal didn't take the cost for clearing the sea into account
14 years ago
27e45d96a4
(svn r20547) -Change: the way order backups are performed. Now restoring an order doesn't require up to 765 commands.
14 years ago
926594b599
(svn r20547) -Change: the way order backups are performed. Now restoring an order doesn't require up to 765 commands.
14 years ago
8a9929d702
(svn r20542) -Codechange: generalise the setting of "p2" to the ClientID.
14 years ago
69fa0b36d3
(svn r20542) -Codechange: generalise the setting of "p2" to the ClientID.
14 years ago
982df3e96b
(svn r20536) -Codechange: unify the refitting of vehicles
14 years ago
c5a670037b
(svn r20536) -Codechange: unify the refitting of vehicles
14 years ago
c57a5b735a
(svn r20532) -Codechange: unify selling of vehicles a bit
14 years ago
4780cc50b2
(svn r20532) -Codechange: unify selling of vehicles a bit
14 years ago
253080ad64
(svn r20531) -Codechange: unify quite a bit of the vehicle building commands
14 years ago
c14853b72e
(svn r20531) -Codechange: unify quite a bit of the vehicle building commands
14 years ago
1f2276b785
(svn r20411) -Codechange: rename unmovables as quite a lot of them are actually movable; e.g. HQ and owned land are pretty movable.
14 years ago
3da3d131c6
(svn r20411) -Codechange: rename unmovables as quite a lot of them are actually movable; e.g. HQ and owned land are pretty movable.
14 years ago
7fe695dc28
(svn r20328) -Codechange: unify the unmovable related commands and make building lighthouses/transmitters actually happen via a command
14 years ago
49cee72fa4
(svn r20328) -Codechange: unify the unmovable related commands and make building lighthouses/transmitters actually happen via a command
14 years ago
ec6cba6b92
(svn r20323) -Codechange: Move Delete town code to a command.
14 years ago
7a6df202d0
(svn r20323) -Codechange: Move Delete town code to a command.
14 years ago
014771848d
(svn r20322) -Codechange: Move Expand town code to a command.
14 years ago
ca0751adb8
(svn r20322) -Codechange: Move Expand town code to a command.
14 years ago
c873246257
(svn r20112) -Codechange: Prevent implicit use of CommandCost constructors.
14 years ago
5eb5ddbf31
(svn r20112) -Codechange: Prevent implicit use of CommandCost constructors.
14 years ago
f09a74a996
(svn r19812) -Codechange: give some unnamed enums a name or, in case they consisted of unrelated values use static const (u)int
14 years ago
398418b8fa
(svn r19812) -Codechange: give some unnamed enums a name or, in case they consisted of unrelated values use static const (u)int
14 years ago
63865a5ed7
(svn r19801) -Add [FS#3691]: custom naming of depots. Based on work by sbr
14 years ago
1a5d7b34d8
(svn r19801) -Add [FS#3691]: custom naming of depots. Based on work by sbr
14 years ago
ea7aececf8
(svn r19602) -Codechange: add the name of the command to the desync logs
14 years ago
5c7aaf11ba
(svn r19602) -Codechange: add the name of the command to the desync logs
14 years ago
d2e99657fa
(svn r19507) -Codechange: remove semicolon after DECLARE_POSTFIX_INCREMENT and DECLARE_ENUM_AS_BIT_SET
14 years ago
53aaabe6e9
(svn r19507) -Codechange: remove semicolon after DECLARE_POSTFIX_INCREMENT and DECLARE_ENUM_AS_BIT_SET
14 years ago
72d62fd6fc
(svn r19494) -Codechange: Remove _error_message.
14 years ago
05d705e077
(svn r19494) -Codechange: Remove _error_message.
14 years ago
19dff3a6b2
(svn r19414) -Doc: Several doxygen additions and corrections.
14 years ago
777123c228
(svn r19414) -Doc: Several doxygen additions and corrections.
14 years ago
9e302e5fa1
(svn r19130) -Codechange: Use references and inlining in CommandCost.
15 years ago
7dcc414000
(svn r19130) -Codechange: Use references and inlining in CommandCost.
15 years ago
a2af272a52
(svn r19128) -Codechange: CommandCost cost methods return void instead of a copy of *this.
15 years ago
e8d40d6a19
(svn r19128) -Codechange: CommandCost cost methods return void instead of a copy of *this.
15 years ago
6ade772f01
(svn r18975) -Cleanup: CMD_REMOVE_ROAD is unused.
15 years ago
5f4f562d53
(svn r18975) -Cleanup: CMD_REMOVE_ROAD is unused.
15 years ago
9313532ddd
(svn r18783) -Codechange: make CheckCompanyHasMoney set an error on the CommandCost it tests when you don't have enough money instead of setting a global variable.
15 years ago
3e5a87a52c
(svn r18783) -Codechange: make CheckCompanyHasMoney set an error on the CommandCost it tests when you don't have enough money instead of setting a global variable.
15 years ago
26b203e3ff
(svn r18781) -Codechange: pass the CommandCost to the callback instead of whether it succeeded or not.
...
-Fix: AIs did update their last cost incorrectly in network games if the cost of the DC_EXEC phase differed from the ~DC_EXEC phase.
15 years ago
2b97f38cd1
(svn r18781) -Codechange: pass the CommandCost to the callback instead of whether it succeeded or not.
...
-Fix: AIs did update their last cost incorrectly in network games if the cost of the DC_EXEC phase differed from the ~DC_EXEC phase.
15 years ago
bd9c679873
(svn r18292) -Codechange: add a command to set the start date of a timetable. Based on work by PhilSophus.
15 years ago
a951c505bf
(svn r18292) -Codechange: add a command to set the start date of a timetable. Based on work by PhilSophus.
15 years ago
f7466979b9
(svn r18281) -Feature: founding towns in-game (based on work by Belugas, TheJosh, GeekToo, Terkhen and others)
15 years ago
f0c64208cf
(svn r18281) -Feature: founding towns in-game (based on work by Belugas, TheJosh, GeekToo, Terkhen and others)
15 years ago
13437a998e
(svn r17603) -Codechange: since now, towns are 'founded' instead of 'built'
15 years ago
15511678e3
(svn r17603) -Codechange: since now, towns are 'founded' instead of 'built'
15 years ago
99d46e0ad7
(svn r17248) -Fix: add GPL license notice where appropriate
15 years ago
7fbc33dae1
(svn r17248) -Fix: add GPL license notice where appropriate
15 years ago
b3f3ba36db
(svn r16990) -Codechange: unify some (command) naming w.r.t. stations/waypoints.
15 years ago
37e6f6a003
(svn r16990) -Codechange: unify some (command) naming w.r.t. stations/waypoints.
15 years ago
7eb9ad0415
(svn r16429) -Change: Make the company settings behave like all others settings: the default set in the main menu / config file is now really the default for a new company, and changing the value in game will no longer change the default for new companies.
15 years ago
a10e5f707a
(svn r16429) -Change: Make the company settings behave like all others settings: the default set in the main menu / config file is now really the default for a new company, and changing the value in game will no longer change the default for new companies.
15 years ago
d5525b8f2d
(svn r15452) -Codechange: Add DC_NO_MODIFY_TOWN_RATING.
16 years ago
032346cf8a
(svn r15452) -Codechange: Add DC_NO_MODIFY_TOWN_RATING.
16 years ago
f9feb4a0e6
(svn r15449) -Codechange: Rename DC_NO_TOWN_RATING to DC_NO_TEST_TOWN_RATING as that is what it does.
16 years ago
3e3a158610
(svn r15449) -Codechange: Rename DC_NO_TOWN_RATING to DC_NO_TEST_TOWN_RATING as that is what it does.
16 years ago
5c8cf85613
(svn r15434) -Codechange: bit of type safety for the DC_xxx flags.
16 years ago
d846eef0b6
(svn r15434) -Codechange: bit of type safety for the DC_xxx flags.
16 years ago
89e1afdaa0
(svn r15428) -Codechange: consistently use colour instead of having both color and colour.
16 years ago
c0a8d09ca7
(svn r15428) -Codechange: consistently use colour instead of having both color and colour.
16 years ago
283b3d16ab
(svn r15410) -Cleanup: get rid of most of the references to the 'patches' except where it's used for backward compatability.
16 years ago
Jonathan G Rennison
patch-import
alberth
peter1138
zuu
frosch
planetmaker
michi_cc
rubidium
truebrain
yexo
terkhen
smatz