Jonathan G Rennison
ead18b2af2
Merge branch 'master' into jgrpp
...
# Conflicts:
# CMakeLists.txt
# src/3rdparty/md5/md5.h
# src/3rdparty/squirrel/squirrel/squtils.h
# src/animated_tile.cpp
# src/console_func.h
# src/core/CMakeLists.txt
# src/core/container_func.hpp
# src/core/smallstack_type.hpp
# src/crashlog.cpp
# src/crashlog.h
# src/debug.h
# src/economy.cpp
# src/gamelog.cpp
# src/industry_gui.cpp
# src/lang/catalan.txt
# src/misc_gui.cpp
# src/network/network_content.h
# src/newgrf.cpp
# src/newgrf.h
# src/newgrf_config.cpp
# src/newgrf_config.h
# src/newgrf_gui.cpp
# src/os/unix/font_unix.cpp
# src/os/windows/crashlog_win.cpp
# src/rail_cmd.cpp
# src/saveload/animated_tile_sl.cpp
# src/script/api/script_tilelist.cpp
# src/settings.cpp
# src/settingsgen/settingsgen.cpp
# src/sl/oldloader_sl.cpp
# src/station.cpp
# src/station_cmd.cpp
# src/stdafx.h
# src/strgen/strgen.cpp
# src/strgen/strgen_base.cpp
# src/table/settings/gui_settings.ini
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_base.h
# src/vehicle_cmd.cpp
# src/vehicle_gui_base.h
# src/viewport_sprite_sorter.h
11 months ago
Jonathan G Rennison
d09b504bc5
Merge branch 'master' into jgrpp
...
# Conflicts:
# .github/workflows/ci-build.yml
# .github/workflows/release-linux.yml
# .github/workflows/release-macos.yml
# .github/workflows/release-source.yml
# .github/workflows/release.yml
# CMakeLists.txt
# COMPILING.md
# src/ai/ai_core.cpp
# src/ai/ai_gui.cpp
# src/bridge_gui.cpp
# src/company_gui.cpp
# src/console_cmds.cpp
# src/core/CMakeLists.txt
# src/core/smallmap_type.hpp
# src/disaster_vehicle.h
# src/effectvehicle_base.h
# src/fontcache.cpp
# src/game/game_core.cpp
# src/game/game_gui.cpp
# src/gamelog.cpp
# src/gamelog_internal.h
# src/group_gui.cpp
# src/linkgraph/linkgraph.h
# src/misc.cpp
# src/network/core/config.h
# src/network/core/udp.cpp
# src/network/network_chat_gui.cpp
# src/network/network_content_gui.cpp
# src/network/network_gui.cpp
# src/newgrf.cpp
# src/newgrf_gui.cpp
# src/newgrf_profiling.cpp
# src/newgrf_profiling.h
# src/object_gui.cpp
# src/openttd.cpp
# src/openttd.h
# src/order_gui.cpp
# src/os/windows/font_win32.cpp
# src/rail_gui.cpp
# src/road.cpp
# src/road_gui.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.h
# src/script/api/script_controller.cpp
# src/script/api/script_roadtypelist.cpp
# src/script/script_config.cpp
# src/script/script_config.hpp
# src/script/script_instance.cpp
# src/script/script_scanner.cpp
# src/script/squirrel.cpp
# src/script/squirrel_helper.hpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/settings_type.h
# src/table/settings/network_private_settings.ini
# src/timetable_gui.cpp
# src/vehicle.cpp
# src/vehicle_base.h
# src/window_gui.h
11 months ago
Rubidium
3323402aaa
Codechange: rename smallvec_type to container_func and use only when needed
1 year ago
Patric Stout
199e41c762
Codechange: use default dtor instead of empty ( #10826 )
1 year ago
Peter Nelson
912eb68981
Change: Extend entity override manager and station spec lists to support 16 bit IDs.
1 year ago
Jonathan G Rennison
43d58ce6c8
GRF: Extend EntityIDMapping/OverrideManagerBase to 16 bit entity IDs
1 year ago
Jonathan G Rennison
ff0e779680
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/lang/czech.txt
# src/order_backup.h
# src/settings_internal.h
# src/string.cpp
# src/viewport.cpp
1 year ago
Rubidium
ae422be979
Cleanup: remove/replace trailing ; with . in comments
1 year ago
Jonathan G Rennison
32fe84cfdd
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/clear_cmd.cpp
# src/main_gui.cpp
# src/saveload/newgrf_sl.cpp
# src/water_cmd.cpp
1 year ago
Peter Nelson
ede1201b6a
Codechange: Rename override manager variables.
1 year ago
Peter Nelson
bcc53c5ad5
Codechange: Add missing `this->` in override manager.
...
Variable scope is also tweaked in a couple of cases reducing line count.
1 year ago
Peter Nelson
eedb786872
Codechange: Use vector for NewGRF spec overrides.
...
This replaces C-style memory management.
1 year ago
Jonathan G Rennison
41117a52d2
Signals: Add variable for signal context (track, tunnel, bridge, etc)
2 years ago
Jonathan G Rennison
7a61b5d820
VarAction2: Cache refit capacity callback results which depend only on cargo
2 years ago
Jonathan G Rennison
8eb86fa6c7
GRF: Use access mask when evaluating get nearby tile information variable
2 years ago
Jonathan G Rennison
502980ba61
Support railtype-dependant GRF train speed limits with realistic braking
...
See: #389
2 years ago
Jonathan G Rennison
62afd94b47
Merge branch 'master' into jgrpp-beta
...
# Conflicts:
# src/company_cmd.cpp
# src/economy.cpp
# src/lang/swedish.txt
# src/network/network_command.cpp
# src/news_gui.cpp
# src/saveload/saveload.h
# src/script/api/script_list.cpp
# src/video/cocoa/cocoa_v.mm
# src/video/sdl2_v.cpp
3 years ago
Rubidium
f904aef176
Cleanup: use nullptr instead of 0 or NULL
3 years ago
Jonathan G Rennison
55915d8d55
Elide vehicle random trigger callbacks
3 years ago
Jonathan G Rennison
a15e26f369
NewGRF: Elide unmasked vehicle callbacks where possible
...
This includes:
* CBID_VEHICLE_32DAY_CALLBACK
* CBID_VEHICLE_REFIT_COST
* CBID_VEHICLE_MODIFY_PROPERTY
This is on a per-property basis
The main benefit of this is to avoid callbacks not handled by the
vehicle's current sprite group from using the full graphics chain as
the "default" branch in the callback switch.
In the case where the graphics chain is long/expensive, a lot of work
had to be done before a callback failure result was eventually returned.
3 years ago
PeterN
66cac92028
Fix #9202 : Invalid test for unset NewGRF override mapping. ( #9226 )
...
(cherry picked from commit 3d9436bd75
)
3 years ago
PeterN
f52da3de3a
Codechange: Don't save unused NewGRF override mappings. ( #9202 )
...
(cherry picked from commit 69e5da0b54
)
3 years ago
PeterN
3d9436bd75
Fix #9202 : Invalid test for unset NewGRF override mapping. ( #9226 )
3 years ago
PeterN
69e5da0b54
Codechange: Don't save unused NewGRF override mappings. ( #9202 )
3 years ago
S. D. Cloudt
13cc8a0cee
Cleanup: Removed SVN headers
5 years ago
Henry Wilson
7c8e7c6b6e
Codechange: Use null pointer literal instead of the NULL macro
5 years ago
Henry Wilson
c01a2e2a81
Codechange: Removed SmallVector completely
5 years ago
Henry Wilson
ab711e6942
Codechange: Replaced SmallVector::[Begin|End]() with std alternatives
5 years ago
peter1138
b1fb3f4fb8
Codechange: More use of override keyword.
5 years ago
frosch
ebee9fa418
(svn r27534) -Fix [FS#6435]: [NewGRF] Station spritelayouts did not accept the var10 flag for the palette.
8 years ago
frosch
ba1779b978
(svn r26241) -Codechange: Remember the GRFFile which filled the TextRefStack in the TextRefStack.
11 years ago
frosch
73c6565cf2
(svn r26240) -Codechange: Pass the GRFFile to GetErrorMessageFromLocationCallbackResult instead of the GRFID.
11 years ago
rubidium
729d64d8d9
(svn r26071) -Fix: always initialise GRFFileProps
11 years ago
planetmaker
c24374f99c
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
12 years ago
rubidium
e40eb8177a
(svn r23735) -Codechange: remove ~50 includes from headers that weren't needed
13 years ago
rubidium
7fd1e1df81
(svn r23198) -Codechange: introduce a free that takes const pointers so we don't need to cast to void/non-const before being able to free
13 years ago
frosch
8f4c6d42f9
(svn r23154) -Change: [NewGRF v8] Use heightlevel units in nearby tile info variables. (rubidium)
13 years ago
frosch
30874b5e81
(svn r23147) -Change: [NewGRF v8] Unify the return values of boolean callbacks, and check the results for validity.
13 years ago
frosch
56e5144f71
(svn r23140) -Add: ErrorUnknownCallbackResult()
13 years ago
frosch
7f228d6909
(svn r22924) -Codechange: Enhance NewGRFSpriteLayout for drawing construction stages in spritelayouts with inconsistent number of sprites per spriteset.
13 years ago
frosch
de27360549
(svn r22923) -Codechange: Move application of the construction stage into TileLayoutSpriteGroup::ProcessRegisters().
13 years ago
frosch
c6e29a5b89
(svn r22848) -Add: The missing bits in station variable 43.
13 years ago
michi_cc
d579af11e8
(svn r22659) -Add: [NewGRF] Support for the land slope check callback for stations.
13 years ago
michi_cc
206ff68e65
(svn r22656) -Codechange: Deduplicate the custom error message of the industry shape and location callbacks.
13 years ago
terkhen
b7b0637a10
(svn r22575) -Fix (r22574): Compilation error.
13 years ago
terkhen
9f55abf51a
(svn r22566) -Codechange: Define and use OverrideManagerBase::GetGRFID function.
13 years ago
frosch
a241a4ce97
(svn r22518) -Feature: [NewGRF] Advanced sprite layouts with register modifiers.
13 years ago
frosch
7415b9cca2
(svn r22456) -Codechange: Derive NewGRFSpriteLayout from DrawTileSprites for spritelayouts allocated on the heap, and make use of constructors and destructors.
13 years ago
yexo
9373ee71d9
(svn r20996) -Change: [NewGRF] the X and Y offsets in the parameter for industry vars 60,61,62,63 are unsigned instead of signed
14 years ago
rubidium
1ec1f1ef37
(svn r20648) -Codechange: implement the NewGRF override manager for objects
14 years ago