Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-13 07:10:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,578 Commits 12 Branches 180 Tags 450 MiB
0b0d154788
Commit Graph

518 Commits

Author SHA1 Message Date
Jonathan G Rennison
b2ef6c0de8 Add implementation of multi-aspect signalling and GRF support 
Requires realistic braking

See: #247
 2021-08-28 12:54:18 +01:00
Jonathan G Rennison
a026d82c6b Allow cloning trains directly from the template train list 
See: #312
 2021-08-22 15:01:26 +01:00
Jonathan G Rennison
587039daba Use CMD_LOG_AUX for all goal/story related commands 2021-06-30 17:14:27 +01:00
Jonathan G Rennison
eeece0928c Include setting name in command log for setting change commands 2021-06-15 18:52:40 +01:00
Jonathan G Rennison
1002c6d9d2 Fix various compiler warnings 
See: #267
 2021-06-11 22:54:27 +01:00
Jonathan G Rennison
253772e9af Merge branch 'master' into jgrpp 
# Conflicts:
#	CMakeLists.txt
#	COMPILING.md
#	src/console.cpp
#	src/console_cmds.cpp
#	src/console_internal.h
#	src/rev.cpp.in
 2021-04-25 02:14:58 +01:00
peter1138
c56fce70b4 Codechange: Replace CMD_SET_GROUP_REPLACE_PROTECTION with generic CMD_SET_GROUP_FLAG. 2021-04-22 22:57:00 +02:00
Jonathan G Rennison
c951dc8b9d Add command log flag for whether random seed changed 2021-04-18 12:35:32 +01:00
Jonathan G Rennison
3f4333bcc8 Add setting to enable non-admin multiplayer clients to rename towns 2021-03-14 16:44:15 +00:00
Jonathan G Rennison
7154f8859d Merge tag '1.11.0-beta1' into jgrpp 
# Conflicts:
#	src/console_cmds.cpp
#	src/gfx_func.h
#	src/industry.h
#	src/lang/czech.txt
#	src/lang/estonian.txt
#	src/lang/german.txt
#	src/lang/indonesian.txt
#	src/lang/japanese.txt
#	src/lang/norwegian_bokmal.txt
#	src/lang/russian.txt
#	src/lang/slovak.txt
#	src/saveload/saveload.h
#	src/station_gui.cpp
#	src/town_gui.cpp
#	src/vehicle_gui.cpp
#	src/video/sdl2_v.cpp
#	src/waypoint_gui.cpp
 2021-02-01 18:58:36 +00:00
Jonathan G Rennison
b7ddd486cf Merge branch 'master' into jgrpp 
# Conflicts:
#	cmake/CompileFlags.cmake
#	src/aircraft_cmd.cpp
#	src/blitter/32bpp_anim.cpp
#	src/cargopacket.cpp
#	src/cheat_gui.cpp
#	src/company_cmd.cpp
#	src/company_gui.cpp
#	src/core/pool_func.hpp
#	src/date.cpp
#	src/economy.cpp
#	src/error_gui.cpp
#	src/ground_vehicle.cpp
#	src/ground_vehicle.hpp
#	src/group_gui.cpp
#	src/industry_cmd.cpp
#	src/lang/dutch.txt
#	src/lang/french.txt
#	src/lang/german.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/linkgraph/mcf.cpp
#	src/network/network_content.cpp
#	src/network/network_server.cpp
#	src/network/network_udp.cpp
#	src/newgrf_engine.cpp
#	src/newgrf_station.cpp
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/yapf/yapf_common.hpp
#	src/saveload/saveload.cpp
#	src/settings_gui.cpp
#	src/station_cmd.cpp
#	src/station_kdtree.h
#	src/string_func.h
#	src/table/settings.ini
#	src/tgp.cpp
#	src/timetable_cmd.cpp
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/train_cmd.cpp
#	src/train_gui.cpp
#	src/tree_gui.cpp
#	src/tunnelbridge_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/video/sdl2_v.cpp
#	src/video/sdl_v.cpp
#	src/video/win32_v.cpp
#	src/viewport.cpp
#	src/viewport_sprite_sorter_sse4.cpp
#	src/window.cpp
 2021-02-01 17:07:34 +00:00
Jonathan G Rennison
6c3e5642f8 Merge branch 'master' into jgrpp 
# Conflicts:
#	cmake/CompileFlags.cmake
#	src/crashlog.cpp
#	src/fileio.cpp
#	src/fileio_func.h
#	src/fios_gui.cpp
#	src/ini_load.cpp
#	src/ini_type.h
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/network/network_client.cpp
#	src/order_base.h
#	src/order_cmd.cpp
#	src/os/windows/win32.cpp
#	src/road_cmd.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/settings.cpp
#	src/station_cmd.cpp
#	src/stdafx.h
#	src/table/settings.ini
#	src/tree_cmd.cpp
#	src/tree_gui.cpp
#	src/vehicle_base.h
#	src/video/cocoa/cocoa_v.mm
#	src/video/cocoa/event.mm
#	src/video/cocoa/wnd_quartz.mm
#	src/viewport.cpp
#	src/widgets/tree_widget.h
 2021-01-31 01:08:35 +00:00
dP
bab7de6cf2 Feature: Allow GameScripts to add additional text to Industry view window 2021-01-22 09:50:53 +00:00
Niels Martin Hansen
4d97fbc814 Feature: Influence industry production changes from GS (#7912) 
(cherry picked from commit b7751c483e)
 2020-12-27 21:07:41 +00:00
Charles Pigott
860c270c73 Codechange: Replace assert_compile macro with static_assert 2020-12-27 10:55:42 +00:00
Niels Martin Hansen
b7751c483e
Feature: Influence industry production changes from GS (#7912) 2020-12-22 14:21:31 +01:00
Jonathan G Rennison
39b7dc7b2a Use aux command log for sign commands 2020-11-21 12:51:22 +00:00
Jonathan G Rennison
0902243ab3 Allow changing the colour of plans 2020-11-06 22:40:02 +00:00
Jonathan G Rennison
9984f39c96 Add feature to reverse the order of an order list 
See: #120
 2020-11-02 20:10:44 +00:00
Jonathan G Rennison
63d3f33fd2 Add display setting for income/cost text effects 2020-10-20 18:20:57 +01:00
Jonathan G Rennison
6e17f9bf5d Use p3 for order indices which don't fit into p1 
Fix insert/modify order overflowing p1
Don't use text field for change timetable
 2020-10-17 17:25:44 +01:00
Jonathan G Rennison
bbbda0739b Add third DoCommand parameter p3 2020-10-17 17:25:44 +01:00
Jonathan G Rennison
0949a4e0a4 Command log: Do not set text flag for binary data 2020-10-17 13:00:57 +01:00
Jonathan G Rennison
6dd7b2869c Increase per-vehicle order limit to 64k 
See: #110
 2020-10-12 23:48:54 +01:00
Jonathan G Rennison
cce6d731a1 TBTR: Delete orphaned virtual trains on client disconnection 2020-10-09 19:26:07 +01:00
Jonathan G Rennison
5e409c19f0 Debug: Use two command logs instead of one 
Log uninteresting GS commands in secondary log
 2020-10-08 22:39:23 +01:00
Jonathan G Rennison
7cb9493314 Deduplicate command log entries where possible 2020-09-28 21:09:30 +01:00
Jonathan G Rennison
f44d75eaf5 Allow building objects by area (1x1 objects only) 
Add setting (default on)
 2020-09-14 23:19:45 +01:00
Jonathan G Rennison
f0f5ce5840 Fix bulk land purchasing removing structures and water 2020-09-14 23:00:09 +01:00
Jonathan G Rennison
817bc44a3e Initial implementation of tracerestrict counter mechanism 2020-08-31 19:08:35 +01:00
Yourself
3927ec08c6 Feature: GSMarine.BuildRiver function 2020-07-06 14:32:18 -07:00
TechGeekNZ
cf8ea74733 Update: Merge branch 'jgrpp_master_cmake' into jgrpp_cmake 2020-06-28 21:56:43 +01:00
frosch
d8182b7e15 Change: Allow command cost-estimation while paused. 2020-06-18 08:59:27 +01:00
Jonathan G Rennison
14e7d43c62 Merge branch 'master' into jgrpp 2020-05-27 20:47:54 +01:00
Niels Martin Hansen
800ade7702
Feature: Push-buttons on storybook pages (#7896) 
Allow more direct player-initiated interaction for Game Scripts, by letting the GS put push-buttons on storybook pages. These buttons can either trigger an immediate event, or require the player to first select a tile on the map, or a vehicle.

Additionally this reworks how the storybook pages are layouted and rendered, to allow for slightly more complex layouts, and maybe speeding drawing up a bit.
 2020-05-22 22:22:55 +02:00
Jonathan G Rennison
ab99c16601 Add support for money cheat in multiplayer 
Add a setting for whether this is permitted by multiplayer clients
 2020-04-14 22:04:41 +01:00
Jonathan G Rennison
86b6e9727f Cheats: Enable setting magic bulldozer, tunnels and jet crashes in multiplayer 2020-04-14 20:41:37 +01:00
Jonathan G Rennison
ba65a79d09 Enable allowing/disallowing supply to a station, per cargo 
Ctrl-click station cargo rating
 2020-03-22 13:49:22 +00:00
Jonathan G Rennison
dd99fd646d Merge branch 'master' into jgrpp 
# Conflicts:
#	src/base_station_base.h
#	src/industry.h
#	src/industry_cmd.cpp
#	src/industry_gui.cpp
#	src/lang/korean.txt
#	src/os/macosx/crashlog_osx.cpp
#	src/station_cmd.cpp
#	src/town.h
#	src/town_cmd.cpp
#	src/town_gui.cpp
 2020-01-20 18:36:55 +00:00
Pavel Stupnikov
d7a928a08b Feature: GS method to control engine availability for a specific company (#7791) 
* Feature: GS method to allow company to use an engine before its introduction date

* Feature: GS method to retire an engine early for a specific company
 2020-01-15 18:46:26 +01:00
Jonathan G Rennison
7960db35f2 Merge branch 'master' into jgrpp 
# Conflicts:
#	config.lib
#	projects/openttd_vs140.vcxproj
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs141.vcxproj
#	projects/openttd_vs141.vcxproj.filters
#	projects/openttd_vs142.vcxproj
#	projects/openttd_vs142.vcxproj.filters
#	src/aircraft_cmd.cpp
#	src/base_station_base.h
#	src/core/pool_type.hpp
#	src/disaster_vehicle.cpp
#	src/economy.cpp
#	src/engine.cpp
#	src/group.h
#	src/group_cmd.cpp
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/lang/german.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/network/network_command.cpp
#	src/network/network_server.cpp
#	src/openttd.cpp
#	src/order_cmd.cpp
#	src/road_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/cargopacket_sl.cpp
#	src/saveload/linkgraph_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/station_sl.cpp
#	src/saveload/town_sl.cpp
#	src/saveload/vehicle_sl.cpp
#	src/screenshot.cpp
#	src/screenshot.h
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/station.cpp
#	src/station_cmd.cpp
#	src/table/settings.ini
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/train.h
#	src/train_cmd.cpp
#	src/train_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehiclelist.cpp
#	src/window_type.h
 2020-01-06 18:45:51 +00:00
Niels Martin Hansen
f401622149 Feature: Script API to change town rating of companies 2020-01-04 19:07:13 +01:00
Jonathan G Rennison
cbdd9f84d8 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/console_gui.cpp
#	src/lang/korean.txt
#	src/video/sdl2_v.cpp
#	src/video/sdl2_v.h
#	src/window.cpp
#	src/window_gui.h
 2019-11-12 18:43:10 +00:00
S. D. Cloudt
13cc8a0cee Cleanup: Removed SVN headers 2019-11-10 17:59:20 +00:00
Jonathan G Rennison
edfd378e93 Merge branch 'master' into jgrpp 
# Conflicts:
#	source.list
#	src/blitter/32bpp_anim.cpp
#	src/linkgraph/linkgraphjob.cpp
#	src/order_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_type.h
 2019-10-05 21:45:54 +01:00
JMcKiern
04f659e768 Fix: Some typos found using codespell 2019-09-29 21:27:32 +01:00
Jonathan G Rennison
1f535915d1 Merge branch 'master' into jgrpp-nrt 
# Conflicts:
#	config.lib
#	src/core/bitmath_func.hpp
#	src/lang/korean.txt
#	src/main_gui.cpp
#	src/order_gui.cpp
#	src/script/api/script_object.cpp
#	src/station_cmd.cpp
#	src/video/cocoa/wnd_quartz.mm
 2019-09-18 01:18:28 +01:00
Max Maton
e4414471dd Add: Allow GameScript to demolish without a company 
This allows GameScripts to shrink towns as well as grow them.
 2019-09-08 10:09:19 +02:00
glx22
b3fd787959 Fix #7188: check the validity of command callback for scripts (#7701) 2019-09-07 17:37:01 +01:00
Jonathan G Rennison
04ef407ddf Merge branch 'jgrpp' into jgrpp-nrt 
# Conflicts:
#	.ottdrev-vc
#	README.md
#	jgrpp-changelog.md
#	src/ship_cmd.cpp
 2019-08-24 10:41:08 +01:00