18a42664fc
Merge branch 'master' into jgrpp
...
Remove 'byte' typedef
2 weeks ago
a3cfd23cf9
Codechange: rename byte to uint8_t ( #12308 )
2 months ago
86a6f63e2f
Merge branch 'master' into jgrpp
...
# Conflicts:
# .github/workflows/ci-build.yml
# .github/workflows/codeql.yml
# .github/workflows/commit-checker.yml
# .github/workflows/release-linux-legacy.yml
# .github/workflows/release-linux.yml
# .github/workflows/release-macos.yml
# .github/workflows/release-windows-store.yml
# .github/workflows/release-windows.yml
# .github/workflows/upload-cdn.yml
# .github/workflows/upload-gog.yml
# .github/workflows/upload-steam.yml
# src/console_cmds.cpp
# src/core/math_func.hpp
# src/fios.cpp
# src/fios.h
# src/intro_gui.cpp
# src/network/network_server.cpp
# src/openttd.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/settings_table.cpp
# src/settings_type.h
# src/table/settings.h.preamble
# src/table/settings/company_settings.ini
# src/table/settings/currency_settings.ini
# src/table/settings/difficulty_settings.ini
# src/table/settings/economy_settings.ini
# src/table/settings/game_settings.ini
# src/table/settings/gui_settings.ini
# src/table/settings/linkgraph_settings.ini
# src/table/settings/locale_settings.ini
# src/table/settings/misc_settings.ini
# src/table/settings/multimedia_settings.ini
# src/table/settings/network_private_settings.ini
# src/table/settings/network_settings.ini
# src/table/settings/news_display_settings.ini
# src/table/settings/old_gameopt_settings.ini
# src/table/settings/pathfinding_settings.ini
# src/table/settings/script_settings.ini
# src/table/settings/win32_settings.ini
# src/table/settings/window_settings.ini
# src/table/settings/world_settings.ini
# src/viewport.cpp
# src/viewport_func.h
# src/window.cpp
3 months ago
090616b4c9
Add: allow loading heightmaps from command-line ( #11870 )
...
If you want to load a file from tar, you have to give the file
inside the tar in order for it to work:
<tar-file>/<dir-in-tar>/<file>.png
4 months ago
55683c4350
Fix enabling map edge mode setting when void edge tiles were not flat
4 months ago
97e6f3062e
Adding of _t to (u)int types, and WChar to char32_t
...
See: eaae0bb5e
4 months ago
378a545dd4
Add setting for map edge behaviour, and how to display area outside map
5 months ago
eaae0bb5e7
Codechange: automatic adding of _t to (u)int types, and WChar to char32_t
...
for i in `find src -type f|grep -v 3rdparty/fmt|grep -v 3rdparty/catch2|grep -v 3rdparty/opengl|grep -v stdafx.h`; do sed 's/uint16& /uint16 \&/g;s/int8\([ >*),;[]\)/int8_t\1/g;s/int16\([ >*),;[]\)/int16_t\1/g;s/int32\([ >*),;[]\)/int32_t\1/g;s/int64\([ >*),;[]\)/int64_t\1/g;s/ uint32(/ uint32_t(/g;s/_uint8_t/_uint8/;s/Uint8_t/Uint8/;s/ft_int64_t/ft_int64/g;s/uint64$/uint64_t/;s/WChar/char32_t/g;s/char32_t char32_t/char32_t WChar/' -i $i; done
10 months ago
ac2f9a21e8
Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/
...
Leave afterload in src/saveload/
12 months ago
fe2bcd2a58
Codechange: migrate size related functions to Map structure
1 year ago
760cbcbb8b
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_base.hpp
# src/blitter/8bpp_base.hpp
# src/blitter/null.hpp
# src/cheat_gui.cpp
# src/gfx.cpp
# src/linkgraph/linkgraph.cpp
# src/spriteloader/grf.cpp
# src/station_cmd.cpp
1 year ago
1fb101eabb
Codechange: address CodeQL issue "Multiplication result converted to larger type" ( #10306 )
...
Most are very unlikely to ever be triggered in our codebase; two
stand out: linkgraph and money cheat. Those, potentially, could
wrap earlier than expected.
1 year ago
4042480806
Merge branch 'jgrpp' into jgrpp-beta
...
# Conflicts:
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/table/company_settings.ini
# src/table/currency_settings.ini
# src/table/gameopt_settings.ini
# src/table/misc_settings.ini
# src/table/settings.h.preamble
# src/table/settings.ini
# src/table/win32_settings.ini
# src/table/window_settings.ini
3 years ago
9299a29a52
Fix: limit heightmap sizes to something reasonable to prevent crafted heightmaps to OOM-crash the game
...
(cherry picked from commit 97c461d1e7
3 years ago
97c461d1e7
Fix: limit heightmap sizes to something reasonable to prevent crafted heightmaps to OOM-crash the game
3 years ago
44ca7d9377
Change: Use gender-neutral pronouns
3 years ago
45c2c29c35
Add: allow setting the highest mountain for heightmaps
...
It will add some slack to the map height limit if that was set
to auto.
3 years ago
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.
3 years ago
13cc8a0cee
Cleanup: Removed SVN headers
5 years ago
7c8e7c6b6e
Codechange: Use null pointer literal instead of the NULL macro
5 years ago
f5b1115039
Doc: Lots and lots of doxymentation fixes
6 years ago
597380e099
(svn r27650) -Codechange: Replace SaveOrLoadMode by FileOperation and DetailedFileType.
8 years ago
d98d4130bd
(svn r27044) -Change (r26905, r26984): Scale heightmap greyscales > 0 evenly to heightlevels > 0, instead of giving heightlevel 1 a bigger loading. Sea level remains at pure black only.
10 years ago
3836d83e8d
(svn r26984) -Fix (r26905) [FS#6134]: Heightlevels must be scaled by number of intervals, not by the value of the highest interval. Otherwise the highest interval becomes non-proportionally small.
10 years ago
26239c3d89
(svn r26905) -Change: account for the maximum map height when converting heightmaps
10 years ago
0463dbdc9e
(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values
10 years ago
b3e93d6520
(svn r26057) -Fix: a number of possibly uninitialised variables
11 years ago
b35b8aa5bb
(svn r25848) -Codechange: Refactor check for if a tile is not an edge tile to new IsInnerTile method (cirdan, LordAro)
11 years ago
c24374f99c
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
12 years ago
4af8c2d5e1
(svn r23704) -Doc: Doxygen comment fixes and additions.
13 years ago
58423b26d1
(svn r23474) -Codechange: move the declaration error related functions to error.h
13 years ago
160bfd8851
(svn r23376) -Remove: on popular demand, remove my (revoked) name from comments in the code. It was silly to name me like that to begin with ;) (based on patch by HackaLittleBit)
13 years ago
6c7cbb1d46
(svn r22873) -Fix [FS#4747]: Validate image dimensions before loading. (Based on patch by monoid)
13 years ago
b4edc30c64
(svn r22827) -Codechange: pass the/a more proper sub directory when opening (some) files instead of the default one
13 years ago
7efd7e19ed
(svn r21845) -Codechange: move documentation towards the code to make it more likely to be updates [d-m].
14 years ago
f051066bc4
(svn r19224) -Codechange: change parameters passed to ShowErrorMessage() a bit
14 years ago
6179198c65
(svn r18756) -Codechange: direct accesses to png_*_struct members are deprecated
15 years ago
44aacfc59f
(svn r17928) -Codechange: ShowErrorMessage() now takes the summary string before the details string.
...
Gentlemen, swap your string parameters.
15 years ago
d6cded5380
(svn r17693) -Cleanup: remove some unneeded includes
15 years ago
7fbc33dae1
(svn r17248) -Fix: add GPL license notice where appropriate
15 years ago
1fe3ad3288
(svn r17075) -Codechange: rename ~750 strings to be more uniform with their relatives
15 years ago
3d780608a2
(svn r15685) -Fix [FS#2720]: do not crash when someone substitutes the "map generation" sprites with garbage.
15 years ago
0d8da02ec1
(svn r15610) -Change: allow loading of heightmaps and savegames (any form) that are in .tar files
15 years ago
d73c1fa7bf
(svn r15568) -Cleanup: *allocT/AllocaM doesn't return NULL when allocating fails
15 years ago
c0a8d09ca7
(svn r15428) -Codechange: consistently use colour instead of having both color and colour.
15 years ago
d2a725ec94
(svn r15332) -Fix (r15190): terrain generated from heightmaps always was at sea level at both southern borders
16 years ago
0d3f5e6e74
(svn r15299) -Cleanup: remove many redundant includes
16 years ago
db3ee34b44
(svn r15190) -Feature: Allow terraforming of the tiles at the edges of the map.
16 years ago
7368c740a6
(svn r14828) -Codechange: move most of save/load-specific code to separate files
16 years ago
923e21129c
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
16 years ago
Jonathan G Rennison
Patric Stout
Rubidium
S. D. Cloudt
Henry Wilson
Charles Pigott
alberth
frosch
zuu
planetmaker
michi_cc
smatz
glx
Yexo