2fdcc52321
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# Makefile.src.in
# findversion.sh
# projects/determineversion.vbs
# src/lang/dutch.txt
# src/lang/korean.txt
# src/network/network.cpp
# src/network/network_client.cpp
# src/rail.cpp
# src/rail_cmd.cpp
# src/saveload/afterload.cpp
# src/ship_cmd.cpp
# src/toolbar_gui.cpp
# src/vehicle.cpp
5 years ago
b1e40b6b56
Fix #7151 : Hang when concurrently starting AIs in multiplayer, or with shift pressed.
5 years ago
ddf31702a2
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/group_gui.cpp
# src/lang/english.txt
# src/saveload/saveload.cpp
# src/widgets/group_widget.h
5 years ago
23960d0f2c
Feature: Group liveries, and livery window usability enhancements. ( #7108 )
...
* Change: Replace checkbox in livery selection window with Default option in drop down selection.
This reduces clutter in the UI and allows for primary/secondary colours to independently follow the default scheme if desired.
* Feature: Add vehicle group liveries.
5 years ago
10320747a9
Allow purchasing a region of tile at once, by dragging
6 years ago
989577d40c
Add support for adding a third error line to the error GUI
...
Add support for a second error string ID to CommandCost
6 years ago
e735c1a51a
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/aircraft_cmd.cpp
# src/autoreplace_cmd.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/yapf/yapf_rail.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/script/api/ai/ai_station.hpp.sq
# src/script/api/game/game_station.hpp.sq
# src/script/api/script_station.hpp
# src/track_func.h
# src/vehicle_base.h
6 years ago
f5b1115039
Doc: Lots and lots of doxymentation fixes
6 years ago
ee00a28717
Merge branch 'template_train_replacement' into jgrpp
...
# Conflicts:
# src/saveload/extended_ver_sl.cpp
6 years ago
c4f5c8e789
TBTR: Add option to replace only old vehicles
6 years ago
cff61bac96
Merge branch 'progsig-sx' into jgrpp
...
# Conflicts:
# src/command.cpp
6 years ago
e01ea3e629
Change progsig command type from landscape to other management
6 years ago
d8b9e2953e
Merge branch 'enhanced_viewport_overlay' into jgrpp
...
# Conflicts:
# src/command.cpp
# src/saveload/extended_ver_sl.cpp
6 years ago
98da7019d6
Plans: Make it possible to give plans a name.
...
(cherry picked from commit d9b553f130a6eda36e2eea217785f829d3d8624e)
6 years ago
90f89770c2
Set CMD_NO_TEST flag for plan commands
...
(cherry picked from commit 8709fdade3
6 years ago
940314a3c7
Use std::string for CommandContainer text instead of giant static buffer
...
Use move semantics for CommandContainer instance where feasible
6 years ago
8709fdade3
Set CMD_NO_TEST flag for plan commands
6 years ago
9e1e074c2b
Update existing assertions to log tile information where suitable
6 years ago
cecbf257bc
Merge branch 'save_ext' into template_train_replacement
...
# Conflicts:
# src/saveload/saveload.cpp
# src/vehicle_gui.cpp
6 years ago
1fe0bb76b9
Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp
6 years ago
f42cc19aad
Merge branch 'cpp-11' into crashlog_improvements
...
# Conflicts:
# Makefile.src.in
# src/crashlog.cpp
# src/crashlog.h
6 years ago
8e4bce58ea
Feature: GS methods to scroll viewport for players ( #6745 )
6 years ago
0b8f0e64ec
Scheduled Dispatch feature
...
Code is tested and run well on small-ish train network. Not tested extensively.
7 years ago
4979309094
TBTR: Fix build and refit of template trains.
7 years ago
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
2fbeb29277
Merge branch 'crashlog_improvements' into jgrpp
...
# Conflicts:
# src/misc.cpp
# src/openttd.cpp
7 years ago
349ddd90b7
Maintain a circular buffer of recent commands, add to crashlog.
...
Add console command to dump command log.
Increase max crashlog size.
7 years ago
fba4268127
Build and refit vehicle test no longer needs to match exec command.
7 years ago
8e6569c11f
Include tick skip counter in all desync debug output.
...
Change message format to make field identification easier.
Update desync message reader to support tick skip counter.
8 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
5cc56d6ad9
Make 32 instead of 16 rail types possible. by using one free bit of m1 in the map array.
...
(cherry picked from commit b44843800880cdc186f5183301ee0f42afbb5f84)
Also set non-rail type M3 bits to 0 where applicable.
Change savegame versioning to SLXI format.
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
4722c81e88
Merge branch 'crashlog_improvements' into jgrpp
8 years ago
0062881a46
Avoid using malloc in scope guard logger.
...
Use a temporary object with its own buffer, which lives on the stack.
Reformat SCOPE_INFO_FMT to not be all on one line.
Other minor reformatting.
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
ae6e43c5fa
Initial uses of scope guard logging.
8 years ago
48e4c35fdc
Add support for verbose asserts.
...
Use for test/exec DoCommand mismatches.
8 years ago
0779c7b7a9
Merge branch 'template_train_replacement-sx' into jgrpp
...
# Conflicts:
# src/build_vehicle_gui.cpp
# src/saveload/afterload.cpp
8 years ago
5850bcf699
TBTR: Fix crash and issues when using a no longer available engine type.
...
Show error messages when cloning a vehicle to a template
or virtual vehicle fails.
Handle failed clones gracefully.
Bypass engine availability check when doing a template edit action.
Show correct error message if template replacement fails for
a non-money reason.
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
cd23d17745
Merge branch 'auto_timetables-sx' into jgrpp
...
Conflicts:
src/vehicle.cpp
9 years ago
d2b87485fb
When clearing auto timetables, mark times as undefined rather than 0.
...
Fix unautomate timetable having reversed ctrl key behaviour,
update tooltip string with ctrl behaviour.
Minor comment/whitespace fixes.
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
Jonathan G Rennison
Peter Nelson
PeterN
Charles Pigott
keldorkatarn
Pavel Stupnikov
innocenat