18a42664fc
Merge branch 'master' into jgrpp
...
Remove 'byte' typedef
2 weeks ago
a3cfd23cf9
Codechange: rename byte to uint8_t ( #12308 )
2 months ago
75dd135e8d
Merge tag '14.0-beta3' into jgrpp
...
# Conflicts:
# regression/regression/result.txt
# src/industrytype.h
# src/network/core/config.h
# src/network/core/network_game_info.cpp
# src/network/core/network_game_info.h
# src/network/core/packet.cpp
# src/network/core/packet.h
# src/network/core/tcp.cpp
# src/network/core/tcp.h
# src/network/core/tcp_admin.cpp
# src/network/core/tcp_content.cpp
# src/network/core/tcp_coordinator.cpp
# src/network/core/tcp_game.cpp
# src/network/core/tcp_game.h
# src/network/core/tcp_turn.cpp
# src/network/core/udp.cpp
# src/network/core/udp.h
# src/network/network_admin.cpp
# src/network/network_client.cpp
# src/network/network_client.h
# src/network/network_command.cpp
# src/network/network_content.cpp
# src/network/network_internal.h
# src/network/network_query.cpp
# src/network/network_query.h
# src/network/network_server.cpp
# src/network/network_server.h
# src/network/network_turn.cpp
# src/network/network_udp.cpp
# src/rail_gui.cpp
# src/road_gui.cpp
3 months ago
8581808952
Merge tag '14.0-beta2' into jgrpp
...
# Conflicts:
# CMakeLists.txt
# src/cargotype.cpp
# src/console_cmds.cpp
# src/graph_gui.cpp
# src/industry_cmd.cpp
# src/industrytype.h
# src/misc_gui.cpp
# src/network/network_client.cpp
# src/newgrf.cpp
# src/newgrf_town.cpp
# src/object_cmd.cpp
# src/openttd.cpp
# src/pathfinder/water_regions.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/table/build_industry.h
# src/table/engines.h
# src/vehicle.cpp
# src/vehicle_cmd.cpp
# src/vehicle_gui.cpp
3 months ago
5c630e10b7
Fix 2fd90960: Missing default vehicles and industry acceptance/production. ( #12000 )
...
* Fix 2fd90960: Missing default vehicles and industry acceptance/production.
Some default definitions are used across multiple climate types and relied on climate-independent cargo slot even though they specified a climate-dependent cargo type.
Add MixedCargoType that indirectly allows multiple labels to be specified for these.
3 months ago
2fd9096070
Change: Decouple and remove landscape-dependent cargo types. ( #11719 )
...
Cargo types of default engines, industries and houses are now specified in terms of label.
4 months ago
97e6f3062e
Adding of _t to (u)int types, and WChar to char32_t
...
See: eaae0bb5e
4 months ago
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
3a676a5af0
Codechange: replace static inline with static for non-class functions
5 months ago
61d65c9861
Use std::array for industry/industry spec input/output arrays
5 months ago
4fac6b295c
Merge branch 'master' into jgrpp
...
# Conflicts:
# .github/workflows/release-linux.yml
# src/base_consist.h
# src/blitter/32bpp_optimized.cpp
# src/blitter/32bpp_optimized.hpp
# src/blitter/32bpp_sse2.hpp
# src/blitter/8bpp_optimized.hpp
# src/gfx_func.h
# src/industry_cmd.cpp
# src/industrytype.h
# src/linkgraph/linkgraphjob.cpp
# src/mixer.cpp
# src/newgrf_callbacks.h
# src/openttd.cpp
# src/os/macosx/macos.mm
# src/os/windows/win32.cpp
# src/pathfinder/npf/npf.cpp
# src/road_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.h
# src/saveload/vehicle_sl.cpp
# src/sound.cpp
# src/spritecache.cpp
# src/spriteloader/spriteloader.hpp
# src/station_map.h
# src/timetable_cmd.cpp
# src/timetable_cmd.h
# src/timetable_gui.cpp
# src/town_cmd.cpp
# src/vehicle_cmd.cpp
# src/vehicle_gui_base.h
# src/video/opengl.cpp
# src/video/opengl.h
# src/viewport.cpp
5 months ago
e5aed24395
Codechange: Use std::array for industry tile cargo acceptance. ( #11498 )
...
This avoids use of memcpy/memset to copy or fill.
6 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
56085be9bd
Codechange: Move includes for common STL headers to stdafx.
1 year ago
68ff3fd062
Change: include fmt.h C++ headers in stdafx.h
...
This to prevent compilation issues between runs with and without precompiled
headers. Also remove the headers from the rest of the code base as they are
not needed there anymore, although they do relatively little harm.
1 year ago
29a1e49c28
Change various asserts to not be included in release builds
2 years ago
42e20d3d99
Industry: Determine which tiles in industry layouts are not animated
...
Do not set these as animated tiles for new industries
2 years ago
b3d048dfcf
Change: [NewGRF] industry special flag 19 now specifically targets only passenger production, instead of the second cargo of any water-based industry. ( #8590 )
...
This behavior is less surprising to NewGRF authors, and may even be intentional behavior for some industries.
3 years ago
c9fd85528a
Add: new economy "frozen" that stops production changes and industry closures ( #8282 )
3 years ago
6d3c2edc59
Add: [NewGRF] Industry behaviour flag to override second cargo production clamping for water industries when using smooth economy.
...
Smooth economy is only used when the corresponding setting is enabled and the industries does not use the production callback.
4 years ago
13cc8a0cee
Cleanup: Removed SVN headers
5 years ago
53f8d0b815
Codechange: Use std::vector for industry tile layouts
5 years ago
48f99fd980
Codechange: use std::array for _sorted_industry_types
5 years ago
e66cec8f86
Add: NewGRF support for 16-in-16-out industries
6 years ago
8859381d30
Add: Industries can produce and accept up to 16 different cargoes
6 years ago
c24374f99c
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
12 years ago
bcac3d16b6
(svn r24513) -Add: [Script] ScriptIndustryType::IsProcessingIndustry.
12 years ago
e40eb8177a
(svn r23735) -Codechange: remove ~50 includes from headers that weren't needed
13 years ago
4af8c2d5e1
(svn r23704) -Doc: Doxygen comment fixes and additions.
13 years ago
df16ebd730
(svn r23595) -Codechange: add comma after last enum to get a more uniform coding style
13 years ago
eaadd215be
(svn r23594) -Codechange: follow coding style with multi line comments
13 years ago
3d88c74389
(svn r23526) -Codechange: unify cargos vs cargoes
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
9d899b3758
(svn r21267) -Doc: Typo fixes.
14 years ago
b65f463e33
(svn r20850) -Codechange: Add IndustrySpec::UsesSmoothEconomy() to deduplicate code.
14 years ago
e2e26190d5
(svn r20623) -Codechange: unify the storing of animation related information
14 years ago
af9d8824bd
(svn r20398) -Codechange: move some variables of GRFFileProps into (the new) GRFFilePropsBase
14 years ago
ed4f806f1d
(svn r20283) -Codechange: Unify start of doygen comments.
14 years ago
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
217a98e69b
(svn r19521) -Codechange: Use a IndustryType array to sort industries by name instead of a LegendAndColour array.
14 years ago
53aaabe6e9
(svn r19507) -Codechange: remove semicolon after DECLARE_POSTFIX_INCREMENT and DECLARE_ENUM_AS_BIT_SET
14 years ago
116a5f56a4
(svn r19481) -Codechange: Turn _industry_counts into a static member of Industry.
14 years ago
683ad53d21
(svn r19193) -Codechange: increase the maximum number of airport tiles to 256 and introduce AirportTileOverrideManager
14 years ago
bb5261a075
(svn r19136) -Doc: Added Doxygen comments for industry checking procedures.
14 years ago
3c627747d3
(svn r19063) -Codechange: type in constant name (andythenorth)
14 years ago
fb9b833dc4
(svn r19053) -Codechange: Add an enum for the special flags of industry tiles. (based on andythenorth' work)
14 years ago
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
6803672c88
(svn r18563) -Document: some industry related functions
15 years ago
8da21d58a9
(svn r18282) -Codechange: Remove IndustrySpec::raw_industry_cost_multiplier and use 8 * cost_multiplier instead.
15 years ago
64bafcbe18
(svn r17534) -Codechange: unify the naming of callback masks/flags
15 years ago
Jonathan G Rennison
Patric Stout
Peter Nelson
Rubidium
frosch
Pavel Stupnikov
Michael Lutz
S. D. Cloudt
Niels Martin Hansen
glx
planetmaker
alberth
terkhen
smatz
yexo