dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
52,678 Commits 1 Branch 0 Tags
e5c99b3601425b4ba848b3f3af25c87c8c06ce9c
Commit Graph

52678 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan G Rennison
f54d69a60a Merge branch 'master' into jgrpp-beta 
# Conflicts:
#	src/economy.cpp
#	src/elrail.cpp
#	src/graph_gui.cpp
#	src/linkgraph/linkgraph_gui.cpp
#	src/network/core/game_info.cpp
#	src/newgrf_station.cpp
#	src/saveload/saveload.cpp
#	src/settings.cpp
#	src/station_cmd.cpp
#	src/station_gui.cpp
#	src/strings_func.h
#	src/table/settings/network_settings.ini
#	src/table/settings/settings.ini
 2021-11-01 21:18:24 +00:00
Jonathan G Rennison
62afd94b47 Merge branch 'master' into jgrpp-beta 
# Conflicts:
#	src/company_cmd.cpp
#	src/economy.cpp
#	src/lang/swedish.txt
#	src/network/network_command.cpp
#	src/news_gui.cpp
#	src/saveload/saveload.h
#	src/script/api/script_list.cpp
#	src/video/cocoa/cocoa_v.mm
#	src/video/sdl2_v.cpp
 2021-11-01 18:54:43 +00:00
translators
00a6287f97 Update: Translations from eints 
arabic (egypt): 2 changes by AviationGamerX
 2021-11-01 18:49:20 +00:00
Jonathan G Rennison
d1f1a6942a Add support for loading trunk savegames versions 293 - 299 (12.0) 
Use modified upstream saveload implementation for these versions
Re-arrange headers to support multiple saveload implementations
 2021-11-01 18:33:39 +00:00
Jonathan G Rennison
c6f0559ad4 Fix const-correctness in script DoCommand string validation 
See: 665e3c1f
 2021-11-01 18:16:46 +00:00
SamuXarick
0563c0e308 Fix #9591: Update station docking tiles upon placing a water object on a docking tile (#9594) 
(cherry picked from commit e404d16929)
 2021-10-31 13:26:39 +00:00
Loïc Guilloux
a4a7240511 Change: Allow all tiles around docks to be docking tiles (#9578) 
(cherry picked from commit 38a64eb2aa)
 2021-10-31 13:25:26 +00:00
Loïc Guilloux
a84feb3444 Fix 39e90ec: Integers for scripts are 64bit, but saved as 32bit (#9415) 
(cherry picked from commit ddafc0de05)
 2021-10-31 10:04:06 +00:00
Jonathan G Rennison
fb8020916a Add upstream savegame version fields 2021-10-31 09:47:42 +00:00
Jonathan G Rennison
5ec1573ccd Add separate max load savegame version, set savegame version values 2021-10-31 09:46:02 +00:00
Jonathan G Rennison
61cc60099a Merge branch 'jgrpp' into jgrpp-beta 
# Conflicts:
#	src/network/core/packet.cpp
#	src/network/core/udp.cpp
 2021-10-29 22:22:54 +01:00
Jonathan G Rennison
e34cc229d1 Version: Committing version data for tag: jgrpp-0.43.2 2021-10-29 21:19:36 +01:00
Jonathan G Rennison
6bc3481931 Fix MinGW compilation issues 2021-10-29 21:18:19 +01:00
Jonathan G Rennison
5586d1a20a Remove use of deprecated allocator rebind in cpp-btree 2021-10-29 21:12:16 +01:00
Jonathan G Rennison
9540d42427 Fix cast warning in GUIHouseList 
See: #307
 2021-10-29 20:36:15 +01:00
Jonathan G Rennison
4a57625183 Avoid cast warnings in network packet handling 
See: #307
 2021-10-29 20:31:28 +01:00
Jonathan G Rennison
6ba53a9a68 Add ifdef around 32 bit length limit check in SlSetLength 2021-10-29 20:28:03 +01:00
Jonathan G Rennison
1d89fe3820 Add casts around engine property checks in GetEngineProperty 2021-10-29 20:27:12 +01:00
Jonathan G Rennison
d2e757db9a Set field size for PropertyID enum 2021-10-29 20:11:01 +01:00
Jonathan G Rennison
86e1f58bc0 Avoid unused variable warning when not using threads 
See: #307
 2021-10-29 20:10:39 +01:00
Jonathan G Rennison
0842621653 Remove unused _network_udp_mutex 
See: #307
 2021-10-29 20:05:16 +01:00
Jonathan G Rennison
8a7cb10813 Fix incorrect cast/colour operation in screenshot GetIndustryValue 
See: #307
 2021-10-29 20:03:29 +01:00
Jonathan G Rennison
23497dea35 Github: Enable blank issues, remove contact links section 2021-10-29 19:51:27 +01:00
translators
ccf70fc4b3 Update: Translations from eints 
dutch: 2 changes by Afoklala
 2021-10-29 18:49:23 +00:00
Jonathan G Rennison
36f90607ba Merge pull request #326 from telk5093/jgrpp 
Update: Korean translation
 2021-10-29 19:47:03 +01:00
Jonathan G Rennison
24c6dfe872 Merge branch 'master' into jgrpp-beta 2021-10-29 17:56:32 +01:00
TELK
afe7824270 Update: Korean translation up to aff6dbec2d 2021-10-29 19:16:09 +09:00
TELK
ed1c0c70ea Update: Korean translation up to 9254be5 2021-10-29 19:16:09 +09:00
TELK
7b12d23e4f Update: Korean translation 2021-10-29 19:16:09 +09:00
Jonathan G Rennison
da282c3ecc Merge branch 'master' into jgrpp-beta 
# Conflicts:
#	.github/workflows/ci-build.yml
#	CMakeLists.txt
#	src/lang/finnish.txt
#	src/lang/french.txt
#	src/lang/korean.txt
#	src/lang/norwegian_bokmal.txt
#	src/lang/russian.txt
#	src/lang/spanish.txt
#	src/misc_gui.cpp
#	src/newgrf.cpp
 2021-10-28 23:51:24 +01:00
translators
edf7b02ddb Update: Translations from eints 
german: 2 changes by Wuzzy2
 2021-10-28 18:48:40 +00:00
Jonathan G Rennison
81290df946 Merge branch 'master' into jgrpp-beta 
# Conflicts:
#	src/lang/spanish.txt
#	src/network/core/tcp_content_type.h
#	src/network/network_content.cpp
#	src/saveload/cheat_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/saveload/station_sl.cpp
#	src/saveload/vehicle_sl.cpp
#	src/settings.cpp
#	src/settings_internal.h
#	src/table/settings.h.preamble
#	src/table/settings/company_settings.ini
#	src/table/settings/currency_settings.ini
#	src/table/settings/gameopt_settings.ini
#	src/table/settings/misc_settings.ini
#	src/table/settings/settings.ini
#	src/table/settings/win32_settings.ini
#	src/table/settings/window_settings.ini
 2021-10-28 01:07:51 +01:00
translators
488cf26406 Update: Translations from eints 
swedish: 44 changes by joeax910
japanese: 1 change by clzls
chinese (simplified): 2 changes by clzls
 2021-10-27 18:50:25 +00:00
Jonathan G Rennison
aff6dbec2d Show timetabled 0 wait times for stations/depots in timetable window 2021-10-27 00:24:26 +01:00
Jonathan G Rennison
53139c2405 Add current day/month to tracerestrict and conditional order conditionals 2021-10-26 23:39:40 +01:00
translators
4487ad1a5e Update: Translations from eints 
korean: 1 change by telk5093
polish: 2 changes by pAter-exe
 2021-10-25 18:49:13 +00:00
Jonathan G Rennison
ffef1c9e44 Merge branch 'master' into jgrpp-beta 
# Conflicts:
#	src/saveload/cargopacket_sl.cpp
#	src/saveload/cheat_sl.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/engine_sl.cpp
#	src/saveload/map_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/saveload/station_sl.cpp
#	src/saveload/vehicle_sl.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/stdafx.h
#	src/table/settings/settings.ini
#	src/town_cmd.cpp
#	src/vehicle.cpp
 2021-10-25 18:10:15 +01:00
Jonathan G Rennison
944f090b46 Add settings for minimum contiguous landmass size for town/city placement 2021-10-25 00:30:25 +01:00
Jonathan G Rennison
55620ff162 Add general function for checking size of contiguous tile area 2021-10-25 00:29:51 +01:00
translators
a0831cec39 Update: Translations from eints 
swedish: 1 change by joeax910
 2021-10-24 18:46:47 +00:00
Jonathan G Rennison
8b5b96af77 Fix typos in PostProcessNetworks 2021-10-24 13:33:02 +01:00
Jonathan G Rennison
28fd549808 Decline company takeover offer on company's behalf if company has no client 2021-10-24 12:23:52 +01:00
Jonathan G Rennison
296987153b Add console command to offer a company for sale 2021-10-24 00:11:51 +01:00
Jonathan G Rennison
ec8512e2ea When declining to buy a company, ask the next company immediately 2021-10-24 00:07:54 +01:00
translators
279fe11b03 Update: Translations from eints 
indonesian: 2 changes by hadyatmo
 2021-10-23 18:47:57 +00:00
frosch
e8bff0ad03 Change: Suppress panning in intro game, while user is interacting with the GUI. (#9645) 2021-10-23 15:13:39 +02:00
frosch
111a47af0d Codechange: rename 'info_view' to 'rotor_in_gui', because it is only used by helicopters. 2021-10-23 14:45:08 +02:00
frosch
bc984d9af5 Codechange: remove redundant 'info_view' parameter, it can be derived from 'image_type'. 2021-10-23 14:45:08 +02:00
translators
bf0210229c Update: Translations from eints 
english (us): 2 changes by 2TallTyler
vietnamese: 2 changes by KhoiCanDev
catalan: 2 changes by J0anJosep
portuguese (brazilian): 2 changes by Vimerum
 2021-10-22 18:53:01 +00:00
Joan Josep
b2e83b4da6 Fix: Draw rotor in cursor when dragging helicopters. (#9612) 2021-10-22 19:39:47 +02:00