Jonathan G Rennison
|
a98a56669b
|
Merge branch 'master' into jgrpp
# Conflicts:
# regression/regression/result.txt
# src/autoreplace_cmd.cpp
# src/industry_gui.cpp
# src/landscape.cpp
# src/network/network_content.cpp
# src/newgrf_roadstop.cpp
# src/pathfinder/yapf/yapf_ship.cpp
# src/road_gui.cpp
# src/saveload/ai_sl.cpp
# src/saveload/saveload.h
# src/saveload/vehicle_sl.cpp
# src/station.cpp
# src/station_gui.cpp
# src/video/cocoa/cocoa_ogl.h
# src/video/sdl2_opengl_v.h
# src/video/video_driver.hpp
# src/video/win32_v.h
# src/widget_type.h
# src/widgets/dropdown.cpp
# src/widgets/dropdown_type.h
# src/window.cpp
|
4 months ago |
Jonathan G Rennison
|
fdd666f66a
|
Merge tag '14.0-beta1' into jgrpp
# Conflicts:
# src/3rdparty/squirrel/squirrel/sqcompiler.cpp
# src/aircraft.h
# src/animated_tile.h
# src/base_consist.h
# src/cargotype.h
# src/company_gui.cpp
# src/console_cmds.cpp
# src/core/overflowsafe_type.hpp
# src/engine_gui.cpp
# src/industry_gui.cpp
# src/lang/english.txt
# src/music/extmidi.cpp
# src/network/core/network_game_info.cpp
# src/network/network_server.cpp
# src/newgrf.cpp
# src/newgrf_industries.cpp
# src/order_base.h
# src/order_cmd.cpp
# src/order_gui.cpp
# src/order_type.h
# src/os/macosx/misc_osx.cpp
# src/os/windows/crashlog_win.cpp
# src/rail_gui.cpp
# src/rail_gui.h
# src/roadveh.h
# src/roadveh_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/company_sl.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/saveload/saveload_error.hpp
# src/script/api/script_town.cpp
# src/settingsgen/settingsgen.cpp
# src/ship.h
# src/ship_cmd.cpp
# src/smallmap_gui.cpp
# src/spritecache.cpp
# src/stdafx.h
# src/strgen/strgen.cpp
# src/strgen/strgen.h
# src/table/settings/script_settings.ini
# src/timetable_cmd.cpp
# src/timetable_gui.cpp
# src/town.h
# src/town_cmd.cpp
# src/town_cmd.h
# src/town_gui.cpp
# src/train.h
# src/train_cmd.cpp
# src/tree_cmd.cpp
# src/vehicle.cpp
# src/vehicle_base.h
# src/vehicle_cmd.cpp
# src/vehicle_gui.cpp
# src/vehiclelist.cpp
# src/waypoint_base.h
# src/widget.cpp
|
4 months ago |
Peter Nelson
|
a64ca2e0c5
|
Cleanup: Remove declaration of non-existent function. (#12091)
|
4 months ago |
Peter Nelson
|
4ffe1da540
|
Fix: NewGRF roadstops were ignored if only in default class. (#12089)
If a NewGRF defines roadstops in the default class and no other classes are defined, they would be ignored and not selectable.
|
4 months ago |
frosch
|
b1718478c8
|
Codechange: Replace old non-standard attributes with C++17/20 standard attributes.
|
4 months ago |
Jonathan G Rennison
|
3050620189
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/autoreplace_cmd.cpp
# src/build_vehicle_gui.cpp
# src/cargotype.cpp
# src/economy.cpp
# src/engine_gui.cpp
# src/industry_cmd.cpp
# src/industry_gui.cpp
# src/linkgraph/linkgraph_gui.h
# src/linkgraph/refresh.cpp
# src/linkgraph/refresh.h
# src/newgrf.cpp
# src/newgrf_airporttiles.h
# src/newgrf_roadstop.cpp
# src/newgrf_station.cpp
# src/newgrf_station.h
# src/order_base.h
# src/order_cmd.cpp
# src/order_func.h
# src/order_gui.cpp
# src/pathfinder/pathfinder_type.h
# src/saveload/afterload.cpp
# src/subsidy_base.h
# src/vehicle_cmd.cpp
# src/vehicle_gui.cpp
# src/vehicle_gui_base.h
|
5 months ago |
Peter Nelson
|
952d111b94
|
Codechange: Split CT_INVALID into CT_INVALID and INVALID_CARGO.
INVALID_CARGO is a CargoID and should be used for most purposes in game.
CT_INVALID is a CargoType used for defining default properties.
|
5 months ago |
Jonathan G Rennison
|
97e6f3062e
|
Adding of _t to (u)int types, and WChar to char32_t
See: eaae0bb5e
|
5 months ago |
Jonathan G Rennison
|
7f6b1d6b94
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/company_cmd.cpp
# src/company_func.h
# src/core/overflowsafe_type.hpp
# src/engine.cpp
# src/music/midifile.cpp
# src/network/network_command.cpp
# src/newgrf_debug_gui.cpp
# src/newgrf_roadstop.h
# src/newgrf_spritegroup.cpp
# src/os/macosx/crashlog_osx.cpp
# src/os/unix/crashlog_unix.cpp
# src/pathfinder/yapf/yapf_common.hpp
# src/road_gui.cpp
# src/saveload/engine_sl.cpp
# src/script/api/script_depotlist.cpp
# src/script/api/script_roadtypelist.cpp
# src/settings_gui.cpp
# src/settings_type.h
# src/strings.cpp
# src/table/settings/game_settings.ini
|
5 months ago |
Rubidium
|
e3f49ee7a0
|
Codechange: coding style fixes
|
5 months ago |
frosch
|
b6c8f301be
|
Codechange: Silence warnings about intentionally unused parameters.
|
9 months ago |
Rubidium
|
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
|
11 months ago |
Jonathan G Rennison
|
1dbbbed9e5
|
NewGRF: Only extend value of road stops variable 68 if feature tested for
|
1 year ago |
Peter Nelson
|
0b72297d57
|
Feature: Increase number of stations/roadstops per NewGRF.
|
1 year ago |
PeterN
|
9910240f0e
|
Cleanup: Remove obsolete (Make)EnumPropsT. (#10697)
This was used by the command system to help extract p1/p2 parameters, which no longer happens.
|
1 year ago |
Jonathan G Rennison
|
62053779b5
|
Road stops: Add flag to read draw mode from register 0x100
|
1 year ago |
Jonathan G Rennison
|
2e7545f85f
|
Road stops: Add flag to use custom graphics for disabled views in build window
|
1 year ago |
Jonathan G Rennison
|
5718730d68
|
VarAction2: Add support for more varaction2 types
Add CB failure and deterministic relative types
|
1 year ago |
Jonathan G Rennison
|
4c1406a4b5
|
Add: NewGRF road stops
|
1 year ago |
Jonathan G Rennison
|
dceafaf2db
|
GRF: Initial support for > 255 road stop specs per GRF
Add new variable for road stop info of nearby tiles
Bump roadstops version
|
1 year ago |
Jonathan G Rennison
|
1272bec13b
|
Road stops: Add height property for build window preview
|
1 year ago |
Jonathan G Rennison
|
8020f6d481
|
Add road stop flags to only show in the road or tram build menus
|
2 years ago |
Jonathan G Rennison
|
50965bbce7
|
Add road stops flag to disable auto road connections
Bump road stops version
|
2 years ago |
Jonathan G Rennison
|
8a9afd4621
|
Add road stops flag for drive-through stops only
|
2 years ago |
Jonathan G Rennison
|
ad0dc6dc87
|
Add road stops flag to disable drawing catenary
|
2 years ago |
Jonathan G Rennison
|
e24d7c88bc
|
Add road stop flag to not show one-way road overlays
|
2 years ago |
Jonathan G Rennison
|
cb573a1523
|
Add road stop property to set cost multipliers
|
2 years ago |
Jonathan G Rennison
|
ad046bdf22
|
Add a waypoint ground draw flag to NewGRF road stops
Adjust overlay draw conditions
|
2 years ago |
Jonathan G Rennison
|
742b42cff6
|
Remove unused road stop constant
|
2 years ago |
Jonathan G Rennison
|
650a359a16
|
Fix road stop road/tram type variables when not present and in GUI
|
2 years ago |
Jonathan G Rennison
|
2cbbae16da
|
Add roadstop GRF properties to set bridge heights and disallowed pillars
|
2 years ago |
Jonathan G Rennison
|
23c472d2a0
|
Add support for road stop animation, availability callback
Add animation, callback mask, general flags properties
Add animation frame variables
|
2 years ago |
Jonathan G Rennison
|
a69eba31fe
|
Implement NewGRF road stop root sprite group selection
|
2 years ago |
Jonathan G Rennison
|
1084bb8566
|
Initial support for NewGRF road stops (bus and lorry stops)
|
2 years ago |