dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
51,387 Commits 1 Branch 0 Tags
40a6181a16302fbd9f96d6e1730ece0ca0cb2f0b
Commit Graph

179 Commits

Author SHA1 Message Date
Jonathan G Rennison
edfa04286b Merge branch 'master' into jgrpp 
# Conflicts:
#	.github/workflows/release.yml
#	bin/CMakeLists.txt
#	src/dock_gui.cpp
#	src/lang/brazilian_portuguese.txt
#	src/lang/catalan.txt
#	src/lang/czech.txt
#	src/lang/dutch.txt
#	src/lang/english.txt
#	src/lang/english_US.txt
#	src/lang/estonian.txt
#	src/lang/finnish.txt
#	src/lang/french.txt
#	src/lang/german.txt
#	src/lang/hungarian.txt
#	src/lang/indonesian.txt
#	src/lang/italian.txt
#	src/lang/japanese.txt
#	src/lang/korean.txt
#	src/lang/lithuanian.txt
#	src/lang/luxembourgish.txt
#	src/lang/norwegian_bokmal.txt
#	src/lang/polish.txt
#	src/lang/portuguese.txt
#	src/lang/romanian.txt
#	src/lang/russian.txt
#	src/lang/serbian.txt
#	src/lang/simplified_chinese.txt
#	src/lang/slovak.txt
#	src/lang/spanish.txt
#	src/lang/spanish_MX.txt
#	src/lang/swedish.txt
#	src/lang/tamil.txt
#	src/lang/ukrainian.txt
#	src/lang/vietnamese.txt
#	src/newgrf.cpp
#	src/newgrf_gui.cpp
#	src/object_gui.cpp
#	src/pathfinder/yapf/yapf_costrail.hpp
#	src/pathfinder/yapf/yapf_node_rail.hpp
#	src/rail_cmd.cpp
#	src/roadveh_cmd.cpp
#	src/town_cmd.cpp
#	src/vehicle.cpp
#	src/water_cmd.cpp
 2021-04-11 02:39:33 +01:00
Jonathan G Rennison
f39b6f4ba3 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/cheat_gui.cpp
#	src/genworld_gui.cpp
#	src/landscape.cpp
#	src/lang/english.txt
#	src/saveload/afterload.cpp
#	src/screenshot.cpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/settings_type.h
#	src/table/settings.ini
#	src/tile_type.h
#	src/widgets/genworld_widget.h
 2021-04-10 18:29:36 +01:00
Charles Pigott
dd798d688b Fix #8919: Release builds with asserts enabled (#8925) 2021-04-01 23:57:49 +01:00
Patric Stout
fece1c57ca Codechange: Suppress warnings when asserts are disabled (#8917) 2021-04-01 11:16:19 +02:00
Patric Stout
f05e2e0d40 Feature: allow setting a custom terrain type to define highest peak 
At least, TGP will try to reach it. It heavily depends on the map
if it is reachable at all. But for sure it will do its atmost to
get there!
 2021-03-26 12:22:32 +01:00
Patric Stout
422e132845 Feature: auto-detect map height limit based on generated map 
This opens up the true power of the TGP terrain generator, as it
is no longer constrainted by an arbitrary low map height limit,
especially for extreme terrain types.

In other words: on a 1kx1k map with "Alpinist" terrain type, the
map is now really hilly with default settings.

People can still manually limit the map height if they so wish,
and after the terrain generation the limit is stored in the
savegame as if the user set it.

Cheats still allow you to change this value.
 2021-03-26 12:22:32 +01:00
Patric Stout
1a1049bc0d Change: rename setting "max_heightlevel" to "map_height_limit" 
This better reflects what it is, and hopefully removes a bit of
the confusion people are having what this setting actually does.

Additionally, update the text on the setting to better inform
users what it is doing exactly, so they can make an educated
decision on how to change it.

Next commit will introduce an "auto" value, which should be the
new default. The rename has as added benefit that everyone will
start out on the "auto" value.
 2021-03-26 12:22:32 +01:00
Patric Stout
70bc55cfd6 Feature: setting to indicate desert coverage for tropic climate 
This is an indication value; the game tries to get as close as it
can, but due to the complex tropic rules, that is unlikely to be
exact.

In the end, it picks a height-level to base the desert/tropic
line on. This is strictly seen not needed, as we can convert any
tile to either. But it is the simplest way to get started with
this without redoing all related functions.
 2021-03-26 12:22:32 +01:00
Patric Stout
cafe4eed6e Feature: setting to indicate snow coverage for arctic climate (replaces snow line height) 
Setting the snow coverage (in % of the map) makes a lot more sense
to the human, while still allowing the niche player to set (by
finding the correct %) a snow line height they like. This makes for
easier defaults, as it decoupled terrain height from amount of snow.

Maps can never be 100% snow, as we do not have sprites for coastal
tiles.

Internally, this calculates the best snow line height to approach
this coverage as close as possible.
 2021-03-26 12:22:32 +01: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
Patric Stout
7463c46a54 Fix: for arctic and tropic, make sure we have at least a few hills (#8513) 
Without hills, not all industries can be generated, which means
that with a default configuration you get errors. This is far from
optimal, of course.

This now forces that there is at least some hills, even when you
are using very-flat. This is a stopgap solution, but a proper
solution requires a full rewrite of the terrain generator, which
is not a 2 minute (or even 2 week) job.

To make sure flat is still flat-ish, reduce the default
snow-line-height to 10, making it look a lot better on smaller maps.
This is a compromise between being able to have flat maps and
still having all industries on arctic.
 2021-01-08 12:02:38 +01:00
Charles Pigott
9b800a96ed Codechange: Remove min/max functions in favour of STL variants (#8502) 2021-01-08 11:16:18 +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
674732cd68 Merge: Codechange: Use null pointer literal instead of the NULL macro 2019-04-11 18:14:13 +01:00
Henry Wilson
7c8e7c6b6e Codechange: Use null pointer literal instead of the NULL macro 2019-04-10 23:22:20 +02:00
Jonathan G Rennison
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
 2019-02-13 19:09:06 +00:00
Gabda
37bb2c9308 Codechange: Make the style of MakeVoid calls uniform (#7192) 2019-02-08 23:05:25 +00:00
Jonathan G Rennison
191afd93c1 Merge branch 'save_ext' into jgrpp 
# Conflicts:
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/settings.cpp
#	src/station_cmd.cpp
#	src/table/settings.ini
#	src/vehicle_base.h
#	src/widgets/dropdown.cpp
 2019-01-21 19:28:29 +00:00
nikolas
d8ccad91f9 Fix: Some code and comment typos 
Found with codespell
 2019-01-17 22:01:07 +00:00
Jonathan G Rennison
f695ae025c Fix terrain generator limiting height to 0 when both edges > 4k. 2015-10-02 20:15:59 +01:00
frosch
80df194341 (svn r27334) -Revert (r27232) [FS#6342]: No idea what the plan was, but making the main noise coefficients the same for all smoothness types certainly wasn't. 2015-07-16 17:05:40 +00:00
frosch
d77935f788 (svn r27334) -Revert (r27232) [FS#6342]: No idea what the plan was, but making the main noise coefficients the same for all smoothness types certainly wasn't. 2015-07-16 17:05:40 +00:00
frosch
2af1fa921a (svn r27331) -Cleanup (r26999): Make variety distribution curves more sane. 2015-07-11 11:18:24 +00:00
frosch
be0b22c9bc (svn r27331) -Cleanup (r26999): Make variety distribution curves more sane. 2015-07-11 11:18:24 +00:00
frosch
f16fc69e95 (svn r27330) -Fix [FS#6335]: Make variety distribution not assume that sea level is at height 0.2 / 3 * TGPGetMaxHeight(). 2015-07-11 10:46:25 +00:00
frosch
a11ae39437 (svn r27330) -Fix [FS#6335]: Make variety distribution not assume that sea level is at height 0.2 / 3 * TGPGetMaxHeight(). 2015-07-11 10:46:25 +00:00
frosch
04e9978f1f (svn r27329) -Fix: Add more height_t type-correctness to TGP code. 2015-07-11 10:43:34 +00:00
frosch
b303ba7505 (svn r27329) -Fix: Add more height_t type-correctness to TGP code. 2015-07-11 10:43:34 +00:00
frosch
fc902d354f (svn r27328) -Codechange: Add an assertion to check for uninitialised variables when tracing variety distribution's control curves. 2015-07-11 10:41:20 +00:00
frosch
8437726cca (svn r27328) -Codechange: Add an assertion to check for uninitialised variables when tracing variety distribution's control curves. 2015-07-11 10:41:20 +00:00
alberth
684f6d4fcc (svn r27232) -Fix: Tweak noise generator more precisely for different map sizes (chillcore) 2015-04-11 18:46:01 +00:00
alberth
262c3c93c8 (svn r27232) -Fix: Tweak noise generator more precisely for different map sizes (chillcore) 2015-04-11 18:46:01 +00:00
alberth
b611635c0e (svn r27230) -Fix: Tune down terrain generation to reduce amount of long slopes (chillcore) 2015-04-11 18:44:26 +00:00
alberth
9db21f6489 (svn r27230) -Fix: Tune down terrain generation to reduce amount of long slopes (chillcore) 2015-04-11 18:44:26 +00:00
alberth
80f6d6c644 (svn r27229) -Change: Generate more detailed curves at the coast (chillcore) 2015-04-11 18:43:30 +00:00
alberth
f29842316e (svn r27229) -Change: Generate more detailed curves at the coast (chillcore) 2015-04-11 18:43:30 +00:00
alberth
01680f7415 (svn r27228) -Change: Slightly more water in the non-custom sea levels (chillcore) 2015-04-11 18:42:48 +00:00
alberth
79c3bc081b (svn r27228) -Change: Slightly more water in the non-custom sea levels (chillcore) 2015-04-11 18:42:48 +00:00
alberth
bc6940dbbb (svn r27227) -Codechange: Initialise map at level 0 instead of -32k (chillcore) 2015-04-11 18:41:41 +00:00
alberth
8e2b3d170b (svn r27227) -Codechange: Initialise map at level 0 instead of -32k (chillcore) 2015-04-11 18:41:41 +00:00
rubidium
4c6febee49 (svn r27018) -Fix [FS#6141] (r27008): the higher amplitudes needed for higher maps were not ignored properly causing much smoother maps than wanted 2014-10-14 17:49:32 +00:00
rubidium
b4b0b2750c (svn r27018) -Fix [FS#6141] (r27008): the higher amplitudes needed for higher maps were not ignored properly causing much smoother maps than wanted 2014-10-14 17:49:32 +00:00
rubidium
0efe811f74 (svn r27009) -Add: extra level of general map heightness (ChillCore) 2014-10-13 14:22:48 +00:00
rubidium
8d90e86c2c (svn r27009) -Add: extra level of general map heightness (ChillCore) 2014-10-13 14:22:48 +00:00
rubidium
1d685c9711 (svn r27008) -Change: extrapolate the amplitudes for the large wavelengths needed for much higher maps 2014-10-13 14:16:20 +00:00
rubidium
fcdbdd6043 (svn r27008) -Change: extrapolate the amplitudes for the large wavelengths needed for much higher maps 2014-10-13 14:16:20 +00:00
rubidium
cb64738f4c (svn r27007) -Codechange: allow for more frequencies (based on patch by ic111) 2014-10-13 14:14:04 +00:00
rubidium
a1611de3a3 (svn r27007) -Codechange: allow for more frequencies (based on patch by ic111) 2014-10-13 14:14:04 +00:00
rubidium
4a497c1bbb (svn r27006) -Codechange: move getting of the amplitude to a seperate function 2014-10-13 14:12:06 +00:00