06c458cb19
Merge branch 'newgrf-property-mapping' into jgrpp
...
# Conflicts:
# docs/newgrf-additions.html
# src/newgrf.cpp
6 years ago
9a6a66a054
Add general NewGRF Action 0 property mapping scheme to Action 14
6 years ago
cb459132ac
Merge branch 'master' into newgrf-feature-detection
6 years ago
c10f6f9abb
Fix incorrect method documentation of ChangeGRFFeatureSetPlatformVarBit
6 years ago
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
6 years ago
e66cec8f86
Add: NewGRF support for 16-in-16-out industries
6 years ago
e0c0394e37
Fix: Remove various dead or unnecessary assignments
6 years ago
f5b1115039
Doc: Lots and lots of doxymentation fixes
6 years ago
6bcc705c7c
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/saveload/saveload.cpp
6 years ago
4b0b4e0643
Feature: [NewGRF] Increase size of persistent storage to 256.
6 years ago
6391d49277
Fix: Variable 0x85 had no bounds checks.
6 years ago
97d6e3c90f
Fix: Variable 0x85 had no bounds checks.
6 years ago
f06c2e0475
Add NewGRF feature for varact2 station var 42
6 years ago
cb7eea8896
Add NewGRF features for more bridge types and Action 0 bridges prop 0x14
6 years ago
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)
6 years ago
b582ef8078
Add NewGRF feature: action0_station_prop1B
6 years ago
2735e7748c
Merge branch 'newgrf-feature-detection' into jgrpp
6 years ago
9f2515d793
Add general NewGRF feature detection scheme to Action 14
6 years ago
ef0a0b0f8e
Implement rail station property 1B, bridge clearance information
6 years ago
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
6 years ago
836d25e738
Codechange: Address some MSVC compiler warnings
6 years ago
c36c5ac851
Tag NewGRF unaligned memory load in StationChangeInfo
6 years ago
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
6 years ago
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
6 years ago
4cebebcf68
Change: Add CargoTypes type for cargo masks. ( #6790 )
6 years ago
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
6 years ago
1fe0bb76b9
Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp
6 years ago
4955996b35
Remove costly recalculation of a date format we already have.
...
(cherry picked from commit 6aca18d18252f1c2f6d4a215999b7d7afb7df813)
See #36
6 years ago
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.
6 years ago
385a2552e9
Merge branch 'enhanced_viewport_overlay' into jgrpp
6 years ago
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.
6 years ago
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.
6 years ago
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.
6 years ago
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.
6 years ago
dacd8d87ef
(svn r27974) -Fix (r27907) [FS#6627]: free() called on static airport rotation data (JGR)
6 years ago
5df8ac52d6
(svn r27974) -Fix (r27907) [FS#6627]: free() called on static airport rotation data (JGR)
6 years ago
86a9438070
Fix AirportSpec->rotation not being duplicated/freed correctly
...
Fixes crashes when resetting GRF data
7 years ago
6df5cac0df
Merge branch 'enhanced_viewport_overlay' into jgrpp
...
# Conflicts:
# src/vehicle.cpp
7 years ago
6dec889306
(svn r27908) -Codechange: Mark airport tile tables and FTAs "const" to be sure that they are really constant
7 years ago
13106675de
(svn r27908) -Codechange: Mark airport tile tables and FTAs "const" to be sure that they are really constant
7 years ago
b56453f93b
(svn r27907) -Fix: AirportSpec::rotation was memleaking
7 years ago
7757f5050a
(svn r27907) -Fix: AirportSpec::rotation was memleaking
7 years ago
f34833f111
Merge branch 'improved_breakdowns' into jgrpp
...
# Conflicts:
# src/vehiclelist.cpp
7 years ago
b4b98e5165
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
7 years ago
a47fb85cd8
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
7 years ago
ac69b746ab
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/gfxinit.cpp
# src/saveload/saveload.cpp
7 years ago
fa8d85b632
(svn r27769) -Change: [NewGRF] Extend the DCxx range to D800-DFFF.
7 years ago
bc2382af06
(svn r27769) -Change: [NewGRF] Extend the DCxx range to D800-DFFF.
7 years ago
5846aa5bfc
(svn r27768) -Codechange: Use if and IsInsideMM instead of switch-case sequences to test for consecutive values.
7 years ago
724f1f3b69
(svn r27768) -Codechange: Use if and IsInsideMM instead of switch-case sequences to test for consecutive values.
7 years ago
Jonathan G Rennison
Niels Martin Hansen
Charles Pigott
Michael Lutz
frosch
cirdan
PeterN
keldorkatarn
Patric Stout
peter1138
adf88