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.
4 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
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
42e20d3d99
Industry: Determine which tiles in industry layouts are not animated
...
Do not set these as animated tiles for new industries
2 years ago
d9b4413bc9
Codechange: rename sound ids to make more sense. ( #8701 )
3 years ago
13cc8a0cee
Cleanup: Removed SVN headers
5 years ago
53f8d0b815
Codechange: Use std::vector for industry tile layouts
5 years ago
7c8e7c6b6e
Codechange: Use null pointer literal instead of the NULL macro
5 years ago
8859381d30
Add: Industries can produce and accept up to 16 different cargoes
6 years ago
eff09c43cd
Fix #4109 : Add more water checks to the Oil Rig layout
...
Prevents Oil Rig docking tile from becoming unreachable by ships when spawning next to each other.
6 years ago
4846c7ed6b
(svn r27137) -Fix (r0): Oilrig empty-tile checks were incorrect due to wrong TileIndexDiff->TileIndexDiffC conversion.
9 years ago
c24374f99c
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
12 years ago
844dc8646f
(svn r22430) -Fix: COAL, RUBR, SUGR and the coalmine used windows palette colours in smallmap/legends etc..
13 years ago
54db5d60fb
(svn r22125) -Fix (r9162)[FS#4528]: The animation-ness of two goldmine tiles were swapped, causing the wheeltower to not work properly, and the bottom corner to show the wrong sprite.
13 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
fb9b833dc4
(svn r19053) -Codechange: Add an enum for the special flags of industry tiles. (based on andythenorth' work)
14 years ago
8da21d58a9
(svn r18282) -Codechange: Remove IndustrySpec::raw_industry_cost_multiplier and use 8 * cost_multiplier instead.
15 years ago
aa14dc48d0
(svn r18278) -Cleanup (r1): No need to set a cost multiplier for raw-industry-construction of banks. They have never been raw industries.
15 years ago
6c7f8fc8b4
(svn r17701) -Codechange: don't start line with a space if it's not inside comment
15 years ago
e8ddf001c8
(svn r17570) -Fix: a number of Doxygen warnings about missing parameters, which were sometimes missing and sometimes just typos
15 years ago
434693b838
(svn r17464) -Codechange: use C++0x mode when compiling with gcc >= 4.3 or icc >= 11.0
15 years ago
7fbc33dae1
(svn r17248) -Fix: add GPL license notice where appropriate
15 years ago
59d45a04d6
(svn r16118) -Change/cleanup: remove the hexadecimal 'in TTD the string had this ID' from 'some' strings and replace the string name with something more sensible.
15 years ago
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
00f0bf98ee
(svn r12751) -Codechange: do what has been done in r11862 in a different way so it uses less memory.
16 years ago
7cf2c83462
(svn r12041) -Codechange: Add the loader and the property for action 00 industries, prop 24, nearby station name.
...
No assignation yet, no real work either.
17 years ago
26c621945d
(svn r11862) -Fix [FS#1559]: when two NewGRFs 'fight' to define the same cargo it could happen that the strings are defined by one cargo and the 'action2' by another and when one assumes that both come from the same NewGRF... So store the GRF ID with the strings. To be extra sure add the same protection mechanism to industries and towns too.
17 years ago
b10eea628d
(svn r11534) -Feature(newgrf): Implement property 23h for Industries.
...
This will add a cost to the removal of an industry using the cheat magic bulldozer.
Note that the removal of regular or newgrf industries without specified removal cost will have no cost applied to.
This is a difference from original spec, where a default base cost is added.
17 years ago
63b36d9330
(svn r11402) -Fix [FS#1382]: incorrect handling of industry behaviour 'must be in town with population large than 1200'
17 years ago
3e8493c851
(svn r11394) -Fix: default value for input cargo multipliers is 256 even for invalid cargo. Exceptions are temperate banks and oil rigs, default value is 0 for them
17 years ago
1626ff3948
(svn r11384) -Fix: second and third accepted cargo were inverted in original industry tiles
17 years ago
116de48fdf
(svn r10961) -Codechange: Flag default substitutes of industry/tiles with a value that cannot be legal.
...
This avoids the forest of coal mine error in the futur
17 years ago
fe8e297995
(svn r10675) -Codechange: unhardcode the industry types used in several locations of the source code.
17 years ago
d87359a827
(svn r10670) -Fix: Use proper initialization for grf_prop override member
17 years ago
549893651c
(svn r10604) -Fix [FS#1044] (r9866): some industries produced cargo they should not be producing, which would result in the industry offering invalid cargo to a station resulting in crashes..
17 years ago
79d04412b0
(svn r10508) -Codechange: allow customizable animation schemes for industries.
17 years ago
0d68a919d9
(svn r10451) -Add: support for "prospecting" raw industries, i.e. you pay an amount of money and then it might (with a given chance) build a raw industry somewhere on the map.
17 years ago
2c38514a84
(svn r10424) -Fix : Toy shop seems to be working exactly like power stations, water tower and banks, i.e: they require cargo but do nothing with it.
...
So, make it an INDUSTRYLIFE_BLACK_HOLE, exactly like the above mentioned industries.
Thanks to glx who spotted, and Csaboka who confirmed it could very well be a CS bug.
17 years ago
b67cfd4825
(svn r10418) -Codechange: implement/resurrect the industry production flags.
17 years ago
40cea6c3ef
(svn r10054) -Codechange: make the industries cost modifier look more like the original one, so it's much easier to support industries that use this original format.
17 years ago
f8da1b6e1a
(svn r10001) -Codechange: Add support for removing dynamically allocated newgrf data
17 years ago
0cb8413a8f
(svn r9976) -Codechange: Declare a writable array of specs for industry and industry tiles.
...
It will be initialized by the original data upon game start.
Rename some enums to be more consistent too
17 years ago
0af97d4ab2
(svn r9975) -Codechange: Adjust the industry/tile spec arrays, moving the enabled member out of GRFFileProps (end of previous commit).
17 years ago
4726fdc0d0
(svn r9972) -Fix (r9969): silence a warning.
17 years ago
Jonathan G Rennison
Peter Nelson
Rubidium
frosch
S. D. Cloudt
Niels Martin Hansen
Henry Wilson
Samu
planetmaker
smatz
belugas
glx