Jonathan G Rennison
|
5a28405ced
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/company_gui.cpp
# src/group_gui.cpp
# src/newgrf.cpp
# src/newgrf_debug_gui.cpp
# src/saveload/saveload.cpp
|
2023-08-19 01:28:36 +01:00 |
|
Jonathan G Rennison
|
3a47b421b0
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/company_cmd.cpp
# src/core/overflowsafe_type.hpp
# src/economy.cpp
# src/engine_base.h
# src/ground_vehicle.cpp
# src/group_gui.cpp
# src/industry_cmd.cpp
# src/industry_gui.cpp
# src/newgrf_commons.cpp
# src/newgrf_engine.cpp
# src/newgrf_industries.cpp
# src/newgrf_object.cpp
# src/newgrf_roadstop.cpp
# src/newgrf_station.cpp
# src/rail_gui.cpp
# src/road_cmd.h
# src/road_gui.cpp
# src/saveload/afterload.cpp
# src/script/api/script_log.cpp
# src/script/api/script_log.hpp
# src/settings_gui.cpp
# src/settingsgen/settingsgen.cpp
# src/station_cmd.cpp
# src/station_cmd.h
# src/station_gui.cpp
# src/strgen/strgen.cpp
# src/string_func.h
# src/string_type.h
# src/table/settings/network_private_settings.ini
# src/tests/math_func.cpp
# src/textfile_gui.cpp
# src/timetable_gui.cpp
# src/town_cmd.cpp
# src/vehicle.cpp
# src/waypoint_cmd.cpp
# src/waypoint_cmd.h
# src/widgets/dropdown.cpp
|
2023-06-03 19:16:57 +01:00 |
|
Jonathan G Rennison
|
fc80a93672
|
Fix object town variables when no town is present
|
2023-06-02 22:19:54 +01:00 |
|
PeterN
|
0b663f709d
|
Codechange: Sprite mapping for objects doesn't involve cargo types. (#10905)
Objects have a default sprite group and an optional purchase list sprite
group. There is no need to pretend that these are cargo IDs.
|
2023-06-02 08:25:13 +00:00 |
|
Jonathan G Rennison
|
fd4d4d341d
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/animated_tile.cpp
# src/cargopacket.h
# src/cheat_gui.cpp
# src/company_cmd.cpp
# src/company_gui.cpp
# src/date.cpp
# src/disaster_vehicle.cpp
# src/dock_gui.cpp
# src/economy.cpp
# src/engine.cpp
# src/error_gui.cpp
# src/fontcache/spritefontcache.cpp
# src/game/game_gui.cpp
# src/game/game_text.cpp
# src/gfx.cpp
# src/graph_gui.cpp
# src/highscore_gui.cpp
# src/industry_cmd.cpp
# src/lang/dutch.txt
# src/lang/english_AU.txt
# src/lang/english_US.txt
# src/lang/finnish.txt
# src/lang/french.txt
# src/lang/italian.txt
# src/lang/portuguese.txt
# src/lang/russian.txt
# src/lang/turkish.txt
# src/lang/vietnamese.txt
# src/main_gui.cpp
# src/misc_gui.cpp
# src/network/network_gui.cpp
# src/network/network_server.cpp
# src/newgrf.cpp
# src/newgrf.h
# src/newgrf_generic.cpp
# src/news_gui.cpp
# src/openttd.cpp
# src/os/unix/unix.cpp
# src/os/windows/font_win32.cpp
# src/os/windows/win32.cpp
# src/rail_gui.cpp
# src/road_gui.cpp
# src/saveload/afterload.cpp
# src/saveload/misc_sl.cpp
# src/saveload/oldloader_sl.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/script/script_gui.cpp
# src/settings_table.cpp
# src/signs_gui.cpp
# src/smallmap_gui.cpp
# src/smallmap_gui.h
# src/spritecache.cpp
# src/spritecache.h
# src/spriteloader/grf.cpp
# src/station_cmd.cpp
# src/statusbar_gui.cpp
# src/stdafx.h
# src/strgen/strgen_base.cpp
# src/subsidy.cpp
# src/table/settings/difficulty_settings.ini
# src/texteff.cpp
# src/timetable_cmd.cpp
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/town_gui.cpp
# src/townname.cpp
# src/vehicle.cpp
# src/waypoint_cmd.cpp
# src/widgets/dropdown.cpp
# src/window.cpp
|
2023-05-26 19:36:48 +01:00 |
|
Rubidium
|
fb856e16c1
|
Codechange: replace some min/clamp constructs to ClampTo
|
2023-05-06 21:26:13 +02:00 |
|
Patric Stout
|
7aa2b9ab0a
|
Codechange: move all date-related variables inside the timer (#10706)
|
2023-04-24 15:56:01 +00:00 |
|
Peter Nelson
|
d0c71f2a9e
|
Codechange: Use reserve/emplace when initializing object definitions.
This avoids unnecessary initialization of objects.
|
2023-04-23 15:58:27 +01:00 |
|
Rubidium
|
7088f5b7c7
|
Codechange: use string/fmt instead of printf for grfmsg
|
2023-04-18 23:21:08 +02:00 |
|
Peter Nelson
|
82c70ed3b8
|
Change: Expose ObjectSpec vector to simplify iteration.
|
2023-04-02 22:42:38 +01:00 |
|
Peter Nelson
|
1f46f080f0
|
Codechange: Store objectspecs in std::vector instead of flat array.
|
2023-04-02 22:42:38 +01:00 |
|
Peter Nelson
|
93197f58b7
|
Codechange: Bind objectspecs to classes once all finalised.
|
2023-04-02 22:42:38 +01:00 |
|
Jonathan G Rennison
|
4c1406a4b5
|
Add: NewGRF road stops
|
2023-02-26 21:28:30 +01:00 |
|
Jonathan G Rennison
|
c0c9c66f7b
|
GRF: Initial support for > 255 objects per GRF
|
2023-02-11 16:22:25 +00:00 |
|
Peter Nelson
|
c95a3be243
|
Change: Expose ObjectSpec vector to simplify iteration.
(cherry picked from commit 51b112139235c66c3adb2c3a75919fc1d3eff9fc)
|
2023-02-11 00:30:40 +00:00 |
|
Peter Nelson
|
74e4556a85
|
Codechange: Store objectspecs in std::vector instead of flat array.
(cherry picked from commit 1ae263c5467105820e4d770b3d57d25ba01e22b1)
|
2023-02-11 00:30:40 +00:00 |
|
Peter Nelson
|
d34e1bbbc1
|
Codechange: Bind objectspecs to classes once all finalised.
(cherry picked from commit 5f4a8f730b8982cbec7eec5e2331f0bc9217e69e)
|
2023-02-11 00:30:40 +00:00 |
|
Jonathan G Rennison
|
1bfd96c7f2
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/3rdparty/fmt/core.h
# src/command_type.h
# src/console_cmds.cpp
# src/core/overflowsafe_type.hpp
# src/landscape.cpp
# src/network/network.cpp
# src/newgrf_object.h
# src/object_cmd.cpp
# src/order_gui.cpp
# src/saveload/vehicle_sl.cpp
# src/script/api/script_industrytype.cpp
# src/script/api/script_object.hpp
# src/script/api/script_town.cpp
# src/table/object_land.h
# src/timetable_cmd.cpp
# src/tree_cmd.cpp
# src/vehicle_gui.cpp
# src/window.cpp
|
2023-01-15 19:28:37 +00:00 |
|
PeterN
|
2355882ec1
|
Codechange: Remove object enabled flag and shuffle members. (#10358)
`enabled` flag is replaced with IsEnabled() which checks if views is
non-zero.
ObjectSpec is shuffled to reduce its memory footprint.
|
2023-01-15 10:58:03 +00:00 |
|
Jonathan G Rennison
|
6d4da8afd4
|
Add setting to ignore object introduction dates
|
2022-06-02 14:06:21 +01:00 |
|
Jonathan G Rennison
|
6fce46304a
|
Add setting to disable object expiry after a given year
|
2022-06-02 13:29:03 +01:00 |
|
Jonathan G Rennison
|
564d7e5029
|
Debug: Allow clicking to highlight group in sprite group dump window
|
2022-06-01 21:31:05 +01:00 |
|
Jonathan G Rennison
|
8eb86fa6c7
|
GRF: Use access mask when evaluating get nearby tile information variable
|
2022-05-31 01:32:18 +01:00 |
|
Jonathan G Rennison
|
23c472d2a0
|
Add support for road stop animation, availability callback
Add animation, callback mask, general flags properties
Add animation frame variables
|
2022-02-15 00:22:18 +00:00 |
|
Jonathan G Rennison
|
acc9dffab7
|
Add object mapped variables for slope after foundation applied
|
2022-01-24 02:01:09 +00:00 |
|
Jonathan G Rennison
|
33dc6c9688
|
Add NewGRF VarAction2 variable remapping infrastructure
|
2022-01-24 02:01:09 +00:00 |
|
Jonathan G Rennison
|
06fa1ae332
|
Add object shore/flooding support, adjust handling of foundations
Add info to debug window
|
2021-12-05 21:46:09 +00:00 |
|
Jonathan G Rennison
|
d9116106ca
|
Add NewGRF object property for new edge foundation mode
|
2021-12-05 21:33:56 +00:00 |
|
Jonathan G Rennison
|
924ffb013f
|
Add NewGRF object property/flag to use land as object ground sprite
This handles variable ground densities, snow/desert, etc.
|
2021-12-05 11:54:13 +00:00 |
|
Jonathan G Rennison
|
76fcfd3efd
|
Debug: Add sprite dump support to NewGRF objects
|
2021-12-03 18:13:58 +00:00 |
|
Jonathan G Rennison
|
0b0d154788
|
Merge branch 'master' into jgrpp-beta
# Conflicts:
# .github/workflows/ci-build.yml
# src/lang/german.txt
# src/lang/romanian.txt
# src/lang/slovak.txt
# src/lang/turkish.txt
# src/network/core/address.cpp
# src/network/core/tcp.h
# src/network/core/udp.cpp
# src/network/network.cpp
# src/network/network_client.cpp
# src/network/network_server.cpp
# src/network/network_server.h
# src/network/network_udp.cpp
# src/openttd.cpp
# src/saveload/newgrf_sl.cpp
# src/tree_cmd.cpp
# src/video/video_driver.hpp
# src/window.cpp
# src/window_gui.h
|
2021-09-22 21:50:02 +01:00 |
|
rubidium42
|
55a11710a6
|
Codechange: convert printf DEBUG statements to fmt Debug statements
|
2021-06-13 12:45:45 +02:00 |
|
glx22
|
38c97e1492
|
Codechange: Replace TILE_AREA_LOOP with range-based for loops
|
2021-05-13 00:13:54 +02:00 |
|
frosch
|
e856d3f8fe
|
Fix: [NewGRF] industry variable 66 and object variable 46 clamped the squared-euclidian distance to 16 bit, when they should not.
(cherry picked from commit 2cf5df2a50)
|
2021-05-06 20:52:00 +01:00 |
|
frosch
|
2cf5df2a50
|
Fix: [NewGRF] industry variable 66 and object variable 46 clamped the squared-euclidian distance to 16 bit, when they should not.
|
2021-05-02 13:45:43 +01:00 |
|
Jonathan G Rennison
|
b7ddd486cf
|
Merge branch 'master' into jgrpp
# Conflicts:
# cmake/CompileFlags.cmake
# src/aircraft_cmd.cpp
# src/blitter/32bpp_anim.cpp
# src/cargopacket.cpp
# src/cheat_gui.cpp
# src/company_cmd.cpp
# src/company_gui.cpp
# src/core/pool_func.hpp
# src/date.cpp
# src/economy.cpp
# src/error_gui.cpp
# src/ground_vehicle.cpp
# src/ground_vehicle.hpp
# src/group_gui.cpp
# src/industry_cmd.cpp
# src/lang/dutch.txt
# src/lang/french.txt
# src/lang/german.txt
# src/linkgraph/linkgraph_gui.cpp
# src/linkgraph/mcf.cpp
# src/network/network_content.cpp
# src/network/network_server.cpp
# src/network/network_udp.cpp
# src/newgrf_engine.cpp
# src/newgrf_station.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/yapf/yapf_common.hpp
# src/saveload/saveload.cpp
# src/settings_gui.cpp
# src/station_cmd.cpp
# src/station_kdtree.h
# src/string_func.h
# src/table/settings.ini
# src/tgp.cpp
# src/timetable_cmd.cpp
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/train_cmd.cpp
# src/train_gui.cpp
# src/tree_gui.cpp
# src/tunnelbridge_cmd.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/video/sdl2_v.cpp
# src/video/sdl_v.cpp
# src/video/win32_v.cpp
# src/viewport.cpp
# src/viewport_sprite_sorter_sse4.cpp
# src/window.cpp
|
2021-02-01 17:07:34 +00:00 |
|
Charles Pigott
|
9b800a96ed
|
Codechange: Remove min/max functions in favour of STL variants (#8502)
|
2021-01-08 11:16:18 +01:00 |
|
Jonathan G Rennison
|
2ad446369d
|
Cache animated tile speed, use btree map for animated tiles
|
2020-11-26 00:19:51 +00:00 |
|
Jonathan G Rennison
|
810bfd276e
|
Add several NewGRF variables to vehicle image callback whitelist
Add vehicle flags to control cached image invalidation
Various refactorings
|
2020-08-25 01:26:44 +01:00 |
|
Niels Martin Hansen
|
c8779fb311
|
Feature: NewGRF callback profiling (#7868)
Adds a console command newgrf_profile to collect some profiling data about NewGRF action 2 callbacks and produce a CSV file.
|
2020-01-26 13:45:51 +01:00 |
|
glx
|
514565fad6
|
Codechange: Replace FOR_ALL_OBJECTS with range-based for loops
|
2019-12-21 20:13:03 +01:00 |
|
S. D. Cloudt
|
13cc8a0cee
|
Cleanup: Removed SVN headers
|
2019-11-10 17:59:20 +00:00 |
|
Henry Wilson
|
7c8e7c6b6e
|
Codechange: Use null pointer literal instead of the NULL macro
|
2019-04-10 23:22:20 +02:00 |
|
Charles Pigott
|
f5b1115039
|
Doc: Lots and lots of doxymentation fixes
|
2018-10-31 12:35:54 +01:00 |
|
Charles Pigott
|
5f86e1a390
|
Codechange: Silence -Wclass-memaccess warnings with GCC8
|
2018-06-27 22:54:46 +02:00 |
|
frosch
|
d9d669dcf8
|
(svn r27984) -Codechange: Make ScopeResolver constructors/destructors inlineable. Speedup sprite resolving by about 8 percent.
|
2018-03-11 13:19:41 +00:00 |
|
frosch
|
b4b98e5165
|
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
|
2017-08-13 18:38:42 +00:00 |
|
rubidium
|
0463dbdc9e
|
(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values
|
2014-04-23 20:13:33 +00:00 |
|
frosch
|
6b61c4608f
|
(svn r26388) -Codechange: Move resolving of Action 3 into ResolverObject constructor.
|
2014-03-03 20:02:31 +00:00 |
|
frosch
|
50c6b2486b
|
(svn r26316) -Feature [FS#5696]: Extend object variable 0x60 to also return the view.
|
2014-02-07 22:55:33 +00:00 |
|