Commit Graph

167 Commits (bb363695fc3abc59d42733071ea1ce3f1b842bba)

Author SHA1 Message Date
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
5 years ago
S. D. Cloudt 13cc8a0cee Cleanup: Removed SVN headers 5 years ago
Jonathan G Rennison 674732cd68 Merge: Codechange: Use null pointer literal instead of the NULL macro 5 years ago
Henry Wilson 7c8e7c6b6e Codechange: Use null pointer literal instead of the NULL macro 5 years ago
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
5 years ago
Gabda 37bb2c9308 Codechange: Make the style of MakeVoid calls uniform (#7192) 5 years ago
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
6 years ago
nikolas d8ccad91f9 Fix: Some code and comment typos
Found with codespell
6 years ago
Jonathan G Rennison f695ae025c Fix terrain generator limiting height to 0 when both edges > 4k. 9 years ago
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. 9 years ago
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. 9 years ago
frosch 2af1fa921a (svn r27331) -Cleanup (r26999): Make variety distribution curves more sane. 9 years ago
frosch be0b22c9bc (svn r27331) -Cleanup (r26999): Make variety distribution curves more sane. 9 years ago
frosch f16fc69e95 (svn r27330) -Fix [FS#6335]: Make variety distribution not assume that sea level is at height 0.2 / 3 * TGPGetMaxHeight(). 9 years ago
frosch a11ae39437 (svn r27330) -Fix [FS#6335]: Make variety distribution not assume that sea level is at height 0.2 / 3 * TGPGetMaxHeight(). 9 years ago
frosch 04e9978f1f (svn r27329) -Fix: Add more height_t type-correctness to TGP code. 9 years ago
frosch b303ba7505 (svn r27329) -Fix: Add more height_t type-correctness to TGP code. 9 years ago
frosch fc902d354f (svn r27328) -Codechange: Add an assertion to check for uninitialised variables when tracing variety distribution's control curves. 9 years ago
frosch 8437726cca (svn r27328) -Codechange: Add an assertion to check for uninitialised variables when tracing variety distribution's control curves. 9 years ago
alberth 684f6d4fcc (svn r27232) -Fix: Tweak noise generator more precisely for different map sizes (chillcore) 9 years ago
alberth 262c3c93c8 (svn r27232) -Fix: Tweak noise generator more precisely for different map sizes (chillcore) 9 years ago
alberth b611635c0e (svn r27230) -Fix: Tune down terrain generation to reduce amount of long slopes (chillcore) 9 years ago
alberth 9db21f6489 (svn r27230) -Fix: Tune down terrain generation to reduce amount of long slopes (chillcore) 9 years ago
alberth 80f6d6c644 (svn r27229) -Change: Generate more detailed curves at the coast (chillcore) 9 years ago
alberth f29842316e (svn r27229) -Change: Generate more detailed curves at the coast (chillcore) 9 years ago
alberth 01680f7415 (svn r27228) -Change: Slightly more water in the non-custom sea levels (chillcore) 9 years ago
alberth 79c3bc081b (svn r27228) -Change: Slightly more water in the non-custom sea levels (chillcore) 9 years ago
alberth bc6940dbbb (svn r27227) -Codechange: Initialise map at level 0 instead of -32k (chillcore) 9 years ago
alberth 8e2b3d170b (svn r27227) -Codechange: Initialise map at level 0 instead of -32k (chillcore) 9 years ago
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 10 years ago
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 10 years ago
rubidium 0efe811f74 (svn r27009) -Add: extra level of general map heightness (ChillCore) 10 years ago
rubidium 8d90e86c2c (svn r27009) -Add: extra level of general map heightness (ChillCore) 10 years ago
rubidium 1d685c9711 (svn r27008) -Change: extrapolate the amplitudes for the large wavelengths needed for much higher maps 10 years ago
rubidium fcdbdd6043 (svn r27008) -Change: extrapolate the amplitudes for the large wavelengths needed for much higher maps 10 years ago
rubidium cb64738f4c (svn r27007) -Codechange: allow for more frequencies (based on patch by ic111) 10 years ago
rubidium a1611de3a3 (svn r27007) -Codechange: allow for more frequencies (based on patch by ic111) 10 years ago
rubidium 4a497c1bbb (svn r27006) -Codechange: move getting of the amplitude to a seperate function 10 years ago
rubidium 344a7a0f16 (svn r27006) -Codechange: move getting of the amplitude to a seperate function 10 years ago
rubidium 325d2b419d (svn r27005) -Fix (r26999): variety distribution curve map scaling did one conversion to height_t too many 10 years ago
rubidium a200656534 (svn r27005) -Fix (r26999): variety distribution curve map scaling did one conversion to height_t too many 10 years ago
rubidium 660a95e5d2 (svn r27003) -Cleanup: fix the use of spaces and asterices "around" some comments 10 years ago
rubidium 771dcf3b7b (svn r27003) -Cleanup: fix the use of spaces and asterices "around" some comments 10 years ago
rubidium ffb443934a (svn r27000) -Fix (r26999): compilation error with some versions of GCC 10 years ago
rubidium b0c4a16e9d (svn r27000) -Fix (r26999): compilation error with some versions of GCC 10 years ago
rubidium a9de336295 (svn r26999) -Codechange: make the variety distribution automatically scale to the maximum height of the map 10 years ago
rubidium df5d5e2b8b (svn r26999) -Codechange: make the variety distribution automatically scale to the maximum height of the map 10 years ago
rubidium c44c6b0f9b (svn r26998) -Change: account for the map size when determining the maximum height of the landscape; a 24 high mountain at 64x64 leaves barely any usable space, but on a 4096x4096 it's just a "small" bump (ic111) 10 years ago
rubidium caf3bda626 (svn r26998) -Change: account for the map size when determining the maximum height of the landscape; a 24 high mountain at 64x64 leaves barely any usable space, but on a 4096x4096 it's just a "small" bump (ic111) 10 years ago
rubidium 5159d90e6c (svn r26997) -Fix/codechange: use signed integers for TGP's internal map size and X/Y variables due to X/Y in comparisons occasionally getting smaller than 0 due to subtractions 10 years ago