Commit Graph

1511 Commits

Author SHA1 Message Date
Jonathan G Rennison
a26db59349 Add Action 5 support for programmable signals graphics 2018-11-28 02:53:51 +00:00
Jonathan G Rennison
5b0cca4b57 Merge branch 'newgrf-property-mapping' into jgrpp
# Conflicts:
#	docs/newgrf-additions.html
#	src/newgrf.cpp
2018-11-28 02:41:52 +00:00
Jonathan G Rennison
7f87e3d61c Add an action 5 type ID remapping mechanism 2018-11-27 04:06:21 +00:00
Jonathan G Rennison
26ec41ebd5 Refactor Action 14 property mapping to make it more generic 2018-11-26 22:48:32 +00:00
Jonathan G Rennison
2ab0a9611b Rename Action0RemapFallbackMode to GRFPropertyMapFallbackMode 2018-11-26 17:11:26 +00:00
Jonathan G Rennison
9608912d29 Merge branch 'newgrf-property-mapping' into jgrpp 2018-11-22 19:29:53 +00:00
Jonathan G Rennison
2e539dfeca Fix typo in static assert message 2018-11-22 19:14:02 +00:00
Jonathan G Rennison
8b37e5aac2 Implement custom bridge pillar flag support
Add bridge NewGRF property to set bridge pillars
Add station NewGRF property to disallow bridge pillars

Set values for default bridges and stations
2018-11-17 19:49:05 +00:00
Jonathan G Rennison
2c88645bac Merge branch 'newgrf-property-mapping' into jgrpp 2018-11-11 23:51:30 +00:00
Jonathan G Rennison
04536952ee Fix Action 0 mapped property length handling
Fix case when Num-info != 1
2018-11-11 23:50:09 +00:00
Jonathan G Rennison
2bb6877f18 Fix syntax of static_assert 2018-11-11 23:49:32 +00:00
Jonathan G Rennison
ceae4516ca Add remappable properties for station min bridge height and bridge menu icon 2018-11-11 11:28:10 +00:00
Jonathan G Rennison
06c458cb19 Merge branch 'newgrf-property-mapping' into jgrpp
# Conflicts:
#	docs/newgrf-additions.html
#	src/newgrf.cpp
2018-11-11 11:27:41 +00:00
Jonathan G Rennison
9a6a66a054 Add general NewGRF Action 0 property mapping scheme to Action 14 2018-11-11 11:26:05 +00:00
Jonathan G Rennison
cb459132ac Merge branch 'master' into newgrf-feature-detection 2018-11-10 12:24:53 +00:00
Jonathan G Rennison
c10f6f9abb Fix incorrect method documentation of ChangeGRFFeatureSetPlatformVarBit 2018-11-10 12:24:32 +00:00
Jonathan G Rennison
e735c1a51a Merge branch 'master' into jgrpp
# Conflicts:
#	src/aircraft_cmd.cpp
#	src/autoreplace_cmd.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/yapf/yapf_rail.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/script/api/ai/ai_station.hpp.sq
#	src/script/api/game/game_station.hpp.sq
#	src/script/api/script_station.hpp
#	src/track_func.h
#	src/vehicle_base.h
2018-11-05 12:53:36 +00:00
Niels Martin Hansen
e66cec8f86 Add: NewGRF support for 16-in-16-out industries 2018-11-03 21:43:54 +01:00
Charles Pigott
e0c0394e37 Fix: Remove various dead or unnecessary assignments 2018-10-31 12:41:49 +01:00
Charles Pigott
f5b1115039 Doc: Lots and lots of doxymentation fixes 2018-10-31 12:35:54 +01:00
Jonathan G Rennison
6bcc705c7c Merge branch 'master' into jgrpp
# Conflicts:
#	src/saveload/saveload.cpp
2018-09-20 08:32:56 +01:00
Michael Lutz
4b0b4e0643 Feature: [NewGRF] Increase size of persistent storage to 256. 2018-09-02 21:31:15 +02:00
frosch
6391d49277 Fix: Variable 0x85 had no bounds checks. 2018-09-02 21:15:54 +02:00
frosch
97d6e3c90f Fix: Variable 0x85 had no bounds checks. 2018-08-14 19:42:31 +01:00
Jonathan G Rennison
f06c2e0475 Add NewGRF feature for varact2 station var 42 2018-08-08 23:03:08 +01:00
Jonathan G Rennison
cb7eea8896 Add NewGRF features for more bridge types and Action 0 bridges prop 0x14 2018-08-07 22:58:05 +01:00
cirdan
1aa13c9ea3 Allow NewGRFs to set the selection sprite for a bridge
Allow NewGRFs to define the sprite to use for a bridge in the bridge
selection window through Action0 property 14.

(cherry picked from commit 8434809a5b57477908e8d5f663e950546c7c8408)
2018-08-07 22:42:07 +01:00
Jonathan G Rennison
b582ef8078 Add NewGRF feature: action0_station_prop1B 2018-08-06 02:33:35 +01:00
Jonathan G Rennison
2735e7748c Merge branch 'newgrf-feature-detection' into jgrpp 2018-08-06 02:33:17 +01:00
Jonathan G Rennison
9f2515d793 Add general NewGRF feature detection scheme to Action 14 2018-08-06 02:29:26 +01:00
Jonathan G Rennison
ef0a0b0f8e Implement rail station property 1B, bridge clearance information 2018-08-02 08:27:20 +01:00
Jonathan G Rennison
4d1bd8e4b4 Merge branch 'master' into jgrpp
# Conflicts:
#	src/genworld_gui.cpp
#	src/gfx.cpp
#	src/lang/korean.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/music.cpp
#	src/table/settings.ini
#	src/town_cmd.cpp
#	src/train_cmd.cpp
2018-06-25 18:57:48 +01:00
Niels Martin Hansen
836d25e738 Codechange: Address some MSVC compiler warnings 2018-06-15 22:36:55 +02:00
Jonathan G Rennison
c36c5ac851 Tag NewGRF unaligned memory load in StationChangeInfo 2018-06-06 08:22:33 +01:00
Jonathan G Rennison
641e877441 Change grfmsg to be a macro which checks the debug level first
This is to avoid doing a sprintf when the result will be thrown away
2018-05-27 22:28:07 +01:00
Jonathan G Rennison
56be293107 Merge branch 'master' into jgrpp
# Conflicts:
#	src/blitter/32bpp_anim.cpp
#	src/blitter/32bpp_anim.hpp
#	src/blitter/32bpp_anim_sse2.cpp
#	src/blitter/32bpp_base.cpp
#	src/blitter/32bpp_base.hpp
#	src/ground_vehicle.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/main_gui.cpp
#	src/newgrf_house.cpp
#	src/newgrf_house.h
#	src/town_cmd.cpp
#	src/vehicle_base.h
#	src/viewport_gui.cppp
2018-05-25 18:29:17 +01:00
PeterN
4cebebcf68 Change: Add CargoTypes type for cargo masks. (#6790) 2018-05-21 22:08:39 +01:00
Jonathan G Rennison
6342099c4d Allow 256 NewGRFs in multiplayer
Add extended network format for server info
Add general UDP packet fragmentation system
Fix map dimensions >= 64k
Increase length of server revision string
Maintain backwards compatibility with trunk for advertisement/server listing
2018-05-12 09:11:41 +01:00
Jonathan G Rennison
1fe0bb76b9 Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp 2018-04-27 02:42:20 +01:00
keldorkatarn
4955996b35 Remove costly recalculation of a date format we already have.
(cherry picked from commit 6aca18d18252f1c2f6d4a215999b7d7afb7df813)

See #36
2018-04-17 16:35:22 +01:00
Patric Stout
88be2413ce Codechange #6729: mute bogus GCC 7 warning (#6733)
We do a memset of (byte - byte), which strictly seen ranges from -254 .. 255, for which GCC warns.
But just before this memset is an if() which says the first byte has to be bigger than the second.
So this is a bogus warning.
2018-04-16 23:48:19 +02:00
Jonathan G Rennison
385a2552e9 Merge branch 'enhanced_viewport_overlay' into jgrpp 2018-03-11 22:21:39 +00:00
frosch
55a503e6f2 (svn r27989) -Fix (r27985): VA2 optimisation failed in various special cases:
- nvar=0 is meant to return the calculated result.
  - Missing references resolve to NULL and got identified with the default result.
  - Missing 'break' broke overlapping cases.
  - Splitting into non-overlapping cases could result in more than 256 cases.
2018-03-11 15:08:51 +00:00
frosch
a537fd5d0e (svn r27989) -Fix (r27985): VA2 optimisation failed in various special cases:
- nvar=0 is meant to return the calculated result.
  - Missing references resolve to NULL and got identified with the default result.
  - Missing 'break' broke overlapping cases.
  - Splitting into non-overlapping cases could result in more than 256 cases.
2018-03-11 15:08:51 +00:00
frosch
07d841d0ef (svn r27985) -Codechange: Convert VA2 switches into ones with non-overlapping ranges, sort them and resolve them using binary search. Speedup sprite resolving by about 7 percent. 2018-03-11 13:21:27 +00:00
frosch
30f73d907a (svn r27985) -Codechange: Convert VA2 switches into ones with non-overlapping ranges, sort them and resolve them using binary search. Speedup sprite resolving by about 7 percent. 2018-03-11 13:21:27 +00:00
peter1138
dacd8d87ef (svn r27974) -Fix (r27907) [FS#6627]: free() called on static airport rotation data (JGR) 2018-03-06 07:48:29 +00:00
peter1138
5df8ac52d6 (svn r27974) -Fix (r27907) [FS#6627]: free() called on static airport rotation data (JGR) 2018-03-06 07:48:29 +00:00
Jonathan G Rennison
86a9438070 Fix AirportSpec->rotation not being duplicated/freed correctly
Fixes crashes when resetting GRF data
2017-10-12 01:50:28 +01:00
Jonathan G Rennison
6df5cac0df Merge branch 'enhanced_viewport_overlay' into jgrpp
# Conflicts:
#	src/vehicle.cpp
2017-09-04 01:24:10 +01:00