dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
49,991 Commits 1 Branch 0 Tags
b7ddd486cf42ff37ca29d84fc2d8f9648cde0101
Commit Graph

49991 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
1d1b105299 Fix auto remove signals functionality 2021-01-31 01:46:29 +00:00
Jonathan G Rennison
082d9021d0 Only use more specific texts for money sending where available 2021-01-31 01:46:29 +00:00
Jonathan G Rennison
d978ffcb59 Fix train braking model not being set to original on load 2021-01-31 01:46:29 +00:00
Jonathan G Rennison
f9956d88c3 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/aircraft_cmd.cpp
#	src/company_gui.cpp
#	src/lang/arabic_egypt.txt
#	src/lang/czech.txt
#	src/lang/esperanto.txt
#	src/lang/faroese.txt
#	src/lang/finnish.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/lang/latvian.txt
#	src/lang/malay.txt
#	src/lang/polish.txt
#	src/lang/spanish.txt
#	src/lang/spanish_MX.txt
#	src/lang/unfinished/urdu.txt
#	src/main_gui.cpp
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/road_cmd.cpp
#	src/settings_type.h
#	src/station_cmd.cpp
#	src/table/settings.ini
 2021-01-31 01:11:12 +00:00
Jonathan G Rennison
43b0ddc558 Use tile railtype for curve speed look ahead 
See: 0f91cb04
 2021-01-31 01:08:47 +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
Jonathan G Rennison
33d9e48bcf Add setting for inflation dates mode 2021-01-30 19:59:00 +00:00
Jonathan G Rennison
39df1c49a1 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/fileio.cpp
#	src/group_gui.cpp
#	src/industry.h
#	src/lang/korean.txt
#	src/linkgraph/linkgraphjob.cpp
#	src/linkgraph/linkgraphjob.h
#	src/linkgraph/linkgraphschedule.cpp
#	src/linkgraph/linkgraphschedule.h
#	src/openttd.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/town_cmd.cpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
 2021-01-30 18:27:35 +00:00
Jonathan G Rennison
7cf4621b1c Merge branch 'master' into jgrpp 2021-01-30 14:01:54 +00:00
Jonathan G Rennison
c4f63661bb Revert "Feature #7962: Improve rendering of large viewports" 
This reverts commit e82333cf77.
 2021-01-30 14:01:37 +00:00
Jonathan G Rennison
f7f28f6ebd Revert "Feature #7962: Significantly improve sprite sorter performance" 
This reverts commit 5ca8a0bda9.
 2021-01-30 14:01:33 +00:00
Jonathan G Rennison
cb69611248 Merge branch 'master' into jgrpp 
# Conflicts:
#	.github/changelog.sh
#	cmake/PackageDeb.cmake
#	src/network/network_client.cpp
#	src/settings_gui.cpp
 2021-01-29 18:27:36 +00:00
Jonathan G Rennison
dddcd6d441 Merge branch 'pr-213' into jgrpp 2021-01-29 18:18:39 +00:00
Jonathan G Rennison
09dc33022c Add client setting for vehicle naming scheme 2021-01-29 18:16:42 +00:00
Jonathan G Rennison
43980639de Merge branch 'master' into jgrpp 
# Conflicts:
#	.gitignore
#	CMakeLists.txt
#	src/3rdparty/optional/optional.hpp
#	src/group_cmd.cpp
#	src/industry_cmd.cpp
#	src/misc_gui.cpp
#	src/video/sdl2_v.cpp
 2021-01-29 17:45:15 +00:00
TELK
cd1fd5f352 Update: Korean translation for ed0ffb6 2021-01-29 14:59:30 +09:00
Jonathan G Rennison
4e0804b791 Fix const issues around GetTrainStopLocation/GetCurrentMaxSpeed 2021-01-29 02:13:08 +00:00
Jonathan G Rennison
b711f94d1c Fix FollowTrainReservation following outwards from end depot 2021-01-28 23:25:07 +00:00
Jonathan G Rennison
87c87649b8 Fix lookahead init inside a signalled tunnel/bridge only filling interior 2021-01-28 22:28:20 +00:00
Jonathan G Rennison
9506a33443 Don't treat loading trains specially when enabling realistic braking 2021-01-28 22:27:23 +00:00
Jonathan G Rennison
62fffddb3f Don't mark train stuck if no reachable track in TryPathReserve 2021-01-28 22:23:06 +00:00
Jonathan G Rennison
628077d0bb Fix missing stop due to speed when entering station with lookahead 2021-01-28 22:22:11 +00:00
Jonathan G Rennison
d913083c37 Print warning instead of asserting for invalid NewGRF string IDs 2021-01-28 19:03:18 +00:00
Jonathan G Rennison
ed0ffb6220 Add feature: realistic train braking 
Add setting to select train braking model.
 2021-01-28 19:03:18 +00:00
Jonathan G Rennison
2b02318c7e Add int64 cube root and square root functions 2021-01-26 00:00:35 +00:00
Jonathan G Rennison
ac5b0d8017 Fix crash in auto-separation when all orders removed 2021-01-25 02:21:02 +00:00
Jonathan G Rennison
1838e8939f Improve handling of reversing inside bidi signalled tunnel/bridge 
Avoid train crashes when reversing trains either side of entrance tile
 2021-01-25 02:20:38 +00:00
Jonathan G Rennison
2a82491a2e Fix reservation not cleared from far end of signalled tunnel when removing 2021-01-25 02:20:38 +00:00
Jonathan G Rennison
01c051793c Allow referencing waypoints in news items 2021-01-25 02:20:38 +00:00
Jonathan G Rennison
ac6581ac8f Lang: Fix string codes in german.txt 2021-01-24 22:42:40 +00:00
Jonathan G Rennison
8e825c8b0e Merge pull request #212 from kruemelmagic/kruemelchen-language-german 
Update: German translation by kruemelmagic
 2021-01-24 16:16:42 +00:00
kruemelmagic
7072bc2fac Update German language by Kruemelchen 
Update to be on par with v. 0.39.2
 2021-01-23 13:55:28 +01:00
Michael Lutz
a190b00af1 Fix #8589, 653e7fa548: Motion counter is NewGRF-visible but not saved, leading to desyncs. (#8591) 
(cherry picked from commit 7da224d29d)
 2021-01-18 20:59:54 +00:00
Jonathan G Rennison
e0893de5c3 Set tunnel/bridge PBS exit to red when leaving 2021-01-18 20:57:55 +00:00
Jonathan G Rennison
aacb70d371 Debug: Extend random debug logging to also include state checksum updates 2021-01-18 20:57:55 +00:00
Jonathan G Rennison
4f44540eb9 Fix false positive desync messages for vehicle cached weight/length 2021-01-15 18:56:51 +00:00
Jonathan G Rennison
fc012d4874 Add NewGRF debug window inspection for waypoints 2021-01-15 17:15:16 +00:00
Jonathan G Rennison
6a6d9f3773 Fix tunnel/bridge PBS start tile in TryPathReserve 2021-01-14 17:53:28 +00:00
Patric Stout
cd36e17160 Fix: don't allow free-wagon-chains to exceed max-train-length (#8533) 
This makes no sense, that a free-wagon-chain could be larger than
the maximum length of a train, as you cannot put an engine in
front of that anyway. And it prevents run-away AIs making very
silly long free-wagon-chains.
 2021-01-11 20:58:00 +01:00
Patric Stout
760b0cdc11 Change: change console command "restart" and add "reload" 
The current "restart" command is now called "reload", as that is
what it does.
The old "restart" command is now called "restart", as that is what
it did.

As this has not been in any official release yet, this shouldn't
harm any kitten.
 2021-01-11 20:11:08 +01:00
Patric Stout
ff89f5f4c6 Fix 8f3d1ec: "restart" did not always restart your current game 
In the sequence:
- Load a game
- Start a newgame (via console)
- Restart a game (via console)
Gave you the loaded game back, not the new game.
 2021-01-11 20:11:08 +01:00
Patric Stout
fe86bf8bf6 Fix #7619: nudge fast planes sooner towards their target (#8531) 
For non-NewGRF planes, "count" is never above 1. So planes can
smoothly be guided to their destination. For NewGRF planes, they
can go as quick as "count" values of 20. This easily overshoots
the target. So, calculate if the plane will overshoot, and start
nudging him to the destination earlier. You won't notice this
either way, as it all happens within a single tick.
 2021-01-11 20:10:53 +01:00
translators
eb23a6921b Update: Translations from eints 
arabic (egypt): 30 changes by AviationGamerX
indonesian: 30 changes by dimaspaf14
german: 12 changes by MagnumSociety
french: 5 changes by glx22
 2021-01-11 18:33:36 +00:00
SamuXarick
6298d9221a Fix 218f40e: Warning about 32-bit shift implicitly converted to 64 bits 2021-01-10 22:31:01 +01:00
frosch
f6abc81cf1 Fix: add missing variables to NewGRF inspect window. 2021-01-10 21:24:38 +01:00
Johannes E. Krause
f1bc4d8407 Add: [NewGRF] Vehicle variable 4A now also returns, whether the current tile has catenary. 2021-01-10 21:24:38 +01:00
frosch
868d84bbfc Add: [NewGRF] vehicle variable 63 to test the tracktype of the current tile against a given tracktype. 2021-01-10 21:24:38 +01:00
frosch
5b08960560 Fix: [NewGRF] industry variables 69 to 71 did not check, whether the queried cargo is valid. 2021-01-10 21:24:38 +01:00
frosch
0078554d6a Fix: GetCargoTranslation could return out-of-bounds index for old-style NewGRF using cargo-slots. 2021-01-10 21:24:38 +01:00