Jonathan G Rennison
|
55d78a23be
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/3rdparty/squirrel/include/squirrel.h
# src/blitter/32bpp_sse_func.hpp
# src/bridge_map.h
# src/clear_map.h
# src/company_manager_face.h
# src/console_func.h
# src/core/bitmath_func.hpp
# src/core/endian_func.hpp
# src/core/random_func.hpp
# src/depot_map.h
# src/elrail_func.h
# src/fontcache.h
# src/industry_map.h
# src/map_func.h
# src/newgrf_spritegroup.h
# src/object_map.h
# src/rail.h
# src/rail_map.h
# src/road_func.h
# src/road_map.h
# src/saveload/saveload.h
# src/saveload/saveload_error.hpp
# src/settings_gui.cpp
# src/sl/oldloader.h
# src/sprite.h
# src/spritecache.h
# src/station_func.h
# src/station_map.h
# src/story_base.h
# src/strings_func.h
# src/tile_cmd.h
# src/tile_map.h
# src/tile_type.h
# src/town.h
# src/town_map.h
# src/tree_map.h
# src/tunnel_map.h
# src/tunnelbridge_map.h
# src/vehicle_func.h
# src/viewport_func.h
# src/void_map.h
# src/water.h
# src/water_map.h
# src/widget_type.h
|
4 months ago |
Rubidium
|
3a676a5af0
|
Codechange: replace static inline with static for non-class functions
|
4 months ago |
|
Rubidium
|
580d0a6343
|
Codechange: make use of Tile in for all direct map accesses
|
1 year ago |
dP
|
b0542c8c49
|
Codechange: Don't store tree counter in the map array (#10018)
|
1 year ago |
|
Jonathan G Rennison
|
29a1e49c28
|
Change various asserts to not be included in release builds
|
2 years ago |
|
Jonathan G Rennison
|
12eb23f0ab
|
Clear old tree counter in map array on load of old savegames
See: https://github.com/OpenTTD/OpenTTD/pull/10018
|
2 years ago |
|
dP
|
30bc490292
|
Codechange: Don't store tree counter in the map array
(cherry picked from commit 6c3f351d5a4b0d19a1a265f04f44c70c24c19cd2)
See: https://github.com/OpenTTD/OpenTTD/pull/10018
|
2 years ago |
|
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
|
edfd378e93
|
Merge branch 'master' into jgrpp
# Conflicts:
# source.list
# src/blitter/32bpp_anim.cpp
# src/linkgraph/linkgraphjob.cpp
# src/order_cmd.cpp
# src/vehicle.cpp
# src/vehicle_type.h
|
5 years ago |
JMcKiern
|
04f659e768
|
Fix: Some typos found using codespell
|
5 years ago |
|
Jonathan G Rennison
|
ba34ec7ade
|
Merge branch 'master' into jgrpp
Replace build and refit, and group collapse implementations
Fix template creation build and refit
# Conflicts:
# Makefile.bundle.in
# config.lib
# src/animated_tile.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_base.hpp
# src/blitter/8bpp_base.hpp
# src/blitter/null.hpp
# src/build_vehicle_gui.cpp
# src/command.cpp
# src/command_func.h
# src/console_gui.cpp
# src/core/smallstack_type.hpp
# src/date.cpp
# src/debug.cpp
# src/genworld_gui.cpp
# src/ground_vehicle.hpp
# src/group_gui.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.h
# src/main_gui.cpp
# src/misc_gui.cpp
# src/network/core/game.h
# src/network/core/packet.cpp
# src/network/core/udp.cpp
# src/network/core/udp.h
# src/network/network_content.cpp
# src/network/network_type.h
# src/network/network_udp.cpp
# src/newgrf_house.h
# src/openttd.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/os/unix/crashlog_unix.cpp
# src/os/windows/crashlog_win.cpp
# src/osk_gui.cpp
# src/pathfinder/opf/opf_ship.cpp
# src/rail_cmd.cpp
# src/rail_gui.cpp
# src/saveload/saveload.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/smallmap_gui.h
# src/station_base.h
# src/station_cmd.cpp
# src/table/gameopt_settings.ini
# src/table/newgrf_debug_data.h
# src/table/settings.ini
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/vehiclelist.cpp
# src/viewport.cpp
# src/widgets/dropdown.cpp
# src/window_gui.h
|
5 years ago |
Peter Nelson
|
76e77aefad
|
Fix #7400: Water class for tree tiles was not converted for old saves preventing industry creation.
As the information is always available from the tree ground type, unconditionally
update the map array for tree tiles.
|
5 years ago |
|
Jonathan G Rennison
|
7ff252c58d
|
Merge branch 'master' into jgrpp
# Conflicts:
# Makefile.src.in
# findversion.sh
# projects/determineversion.vbs
# src/aircraft_cmd.cpp
# src/lang/dutch.txt
# src/linkgraph/linkgraph_gui.cpp
# src/linkgraph/linkgraph_gui.h
# src/order_cmd.cpp
# src/settings_gui.cpp
# src/smallmap_gui.cpp
# src/town_cmd.cpp
# src/viewport.cpp
# src/water_map.h
|
5 years ago |
Eddi-z
|
b242a04c7d
|
Fix #7307: Add WaterClass to MP_TREES, set when trees are on coast tiles (#7309)
This allows allows NewGRF object/industry placement rules to treat trees on coast tiles the same as regular bare coast.
|
5 years ago |
|
Jonathan G Rennison
|
9e1e074c2b
|
Update existing assertions to log tile information where suitable
|
6 years ago |
|
Jonathan G Rennison
|
e1fb35b16f
|
Fix undefined behaviour when left-shifting negative values by casting to unsigned
This silences warning spam from UndefinedBehaviorSanitizer.
|
6 years ago |
|
rubidium
|
f3b79480ed
|
(svn r26878) -Change: move m6 to TileExtended to keep Tile 8 bytes and thus better alignable
|
10 years ago |
|
rubidium
|
982f5a6aa2
|
(svn r26878) -Change: move m6 to TileExtended to keep Tile 8 bytes and thus better alignable
|
10 years ago |
planetmaker
|
f00d9976f9
|
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
|
12 years ago |
|
planetmaker
|
c24374f99c
|
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
|
12 years ago |
alberth
|
1743c86610
|
(svn r20266) -Doc: Mostly typo fixes, a few doxygen-related improvements.
|
14 years ago |
|
alberth
|
a825b4fa5f
|
(svn r20266) -Doc: Mostly typo fixes, a few doxygen-related improvements.
|
14 years ago |
|
alberth
|
29fd6ce0e4
|
(svn r19909) -Doc: Typo fixes, small doxygen improvements.
|
14 years ago |
|
alberth
|
51e67a40e0
|
(svn r19909) -Doc: Typo fixes, small doxygen improvements.
|
14 years ago |
|
rubidium
|
f09a74a996
|
(svn r19812) -Codechange: give some unnamed enums a name or, in case they consisted of unrelated values use static const (u)int
|
14 years ago |
|
rubidium
|
398418b8fa
|
(svn r19812) -Codechange: give some unnamed enums a name or, in case they consisted of unrelated values use static const (u)int
|
14 years ago |
|
rubidium
|
ef6817f62d
|
(svn r19724) -Fix [FS#3792]: random tree type did not build all sub-tropic trees (Krille)
|
14 years ago |
|
rubidium
|
bf638801c0
|
(svn r19724) -Fix [FS#3792]: random tree type did not build all sub-tropic trees (Krille)
|
14 years ago |
frosch
|
39a888a0e2
|
(svn r19634) -Codechange: Use TREE_INVALID more consistently.
|
14 years ago |
|
frosch
|
aea2252960
|
(svn r19634) -Codechange: Use TREE_INVALID more consistently.
|
14 years ago |
|
alberth
|
19dff3a6b2
|
(svn r19414) -Doc: Several doxygen additions and corrections.
|
14 years ago |
|
alberth
|
777123c228
|
(svn r19414) -Doc: Several doxygen additions and corrections.
|
14 years ago |
|
rubidium
|
9467b7c6d6
|
(svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header
|
15 years ago |
|
rubidium
|
82fc28f77f
|
(svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header
|
15 years ago |
yexo
|
2a6fc142de
|
(svn r18719) -Feature: don't delete the rough/rocky status of a tile when it's covered by snow, this allows rocky tiles under snow if you have a variable snowline
|
15 years ago |
|
yexo
|
b378e82676
|
(svn r18719) -Feature: don't delete the rough/rocky status of a tile when it's covered by snow, this allows rocky tiles under snow if you have a variable snowline
|
15 years ago |
|
rubidium
|
310465da07
|
(svn r17570) -Fix: a number of Doxygen warnings about missing parameters, which were sometimes missing and sometimes just typos
|
15 years ago |
|
rubidium
|
e8ddf001c8
|
(svn r17570) -Fix: a number of Doxygen warnings about missing parameters, which were sometimes missing and sometimes just typos
|
15 years ago |
|
rubidium
|
99d46e0ad7
|
(svn r17248) -Fix: add GPL license notice where appropriate
|
15 years ago |
|
rubidium
|
7fbc33dae1
|
(svn r17248) -Fix: add GPL license notice where appropriate
|
15 years ago |
smatz
|
e57699d8c0
|
(svn r15643) -Fix [FS#2711]: be more strict with zeroing unused map array bits
|
15 years ago |
|
smatz
|
e124aa8fd6
|
(svn r15643) -Fix [FS#2711]: be more strict with zeroing unused map array bits
|
15 years ago |
|
smatz
|
bad455f327
|
(svn r14614) -Codechange [FS#2423]: GetTreeCount() should behave as its name and documentation imply. Remove unused SetTreeCount() (PhilSophus)
|
16 years ago |
|
smatz
|
d0e4cc5ee0
|
(svn r14614) -Codechange [FS#2423]: GetTreeCount() should behave as its name and documentation imply. Remove unused SetTreeCount() (PhilSophus)
|
16 years ago |
|
rubidium
|
1ce0b03bf0
|
(svn r12971) -Documentation: add @file in files that missed them and add something more than whitespace as description of files that don't have a description.
|
16 years ago |
|
rubidium
|
d03994098b
|
(svn r12971) -Documentation: add @file in files that missed them and add something more than whitespace as description of files that don't have a description.
|
16 years ago |
|
frosch
|
23e6411fb7
|
(svn r12029) -Feature: Allow trees on shore.
|
17 years ago |
|
frosch
|
a1c543e064
|
(svn r12029) -Feature: Allow trees on shore.
|
17 years ago |
|
rubidium
|
8ebdfb258f
|
(svn r11674) -Codechange: refactor some functions out of macros.h into more logical locations.
|
17 years ago |