dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
54,989 Commits 1 Branch 0 Tags
bac8f032da3b37e79778497c53ad1c953f9c4f8a
Commit Graph

2452 Commits

Author SHA1 Message Date
Jonathan G Rennison
bac8f032da Re-add company shares 2023-05-30 18:57:42 +01:00
Jonathan G Rennison
02fe4af934 Merge branch 'master' into jgrpp 
# Conflicts:
#	.github/workflows/release-windows.yml
#	src/company_base.h
#	src/company_cmd.cpp
#	src/company_gui.cpp
#	src/console_cmds.cpp
#	src/economy.cpp
#	src/economy_cmd.h
#	src/fios.h
#	src/goal.cpp
#	src/group_gui.cpp
#	src/network/core/config.h
#	src/network/network_admin.cpp
#	src/newgrf_config.cpp
#	src/os/windows/win32.cpp
#	src/saveload/afterload.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload_error.hpp
#	src/settings_gui.cpp
#	src/ship_cmd.cpp
#	src/stdafx.h
#	src/story.cpp
#	src/story_base.h
#	src/string.cpp
#	src/table/settings/economy_settings.ini
#	src/tests/CMakeLists.txt
#	src/tests/math_func.cpp
 2023-05-30 00:49:24 +01: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
Jonathan G Rennison
72dcdfafbd Add setting for server sent commands per frame limit 
Use higher of this and existing commands per frame limit setting
for server-originating commands, e.g. GS
 2023-05-23 22:21:19 +01:00
Jonathan G Rennison
37b8b59c85 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/date_type.h
#	src/linkgraph/linkgraphjob.cpp
#	src/linkgraph/linkgraphschedule.cpp
#	src/saveload/saveload.h
#	src/table/settings/linkgraph_settings.ini
 2023-05-22 19:50:45 +01:00
Jonathan G Rennison
9a4512f789 Remove linkgraph duration not day length scaled setting 
Now always enabled
 2023-05-22 19:38:52 +01:00
Jonathan G Rennison
5dd99fb046 Add setting for milliseconds per game tick mode 2023-05-22 18:40:46 +01:00
Jonathan G Rennison
3573571229 Allow changing tree placement algorithm setting in game 2023-05-14 09:58:44 +01:00
Jonathan G Rennison
e7f7cd06bd Simplify timetable time/duration string management 2023-05-10 18:51:49 +01:00
Jonathan G Rennison
f78fea4fbf Debug: Add introduction info to railtype debug info 2023-05-04 17:04:28 +01:00
Jonathan G Rennison
e26bea6ce4 Add setting to select cargo payment algorithm 
See: #506
 2023-04-29 13:00:33 +01:00
Patric Stout
36a0818bc5 Remove: buying/selling/owning company shares (#10709) 2023-04-29 10:16:49 +02:00
Tyler Trahan
930f0a16d8 Codechange: Define Date/Year/Month/Day within TimerGameCalendar class 2023-04-26 07:14:03 -04:00
Patric Stout
ed83c4b0da Change: replace per-AI "start_date" with a global "competitors_interval" (#10653) 
The per-AI "start_date" is a lot of custom code, and was rarely
used in the way it was meant.

While at it, also ported this part over to the new timer system.
 2023-04-16 20:14:22 +02:00
Tyler Trahan
646a7e625b Change: Use seconds for Linkgraph update settings (#10610) 2023-04-14 22:49:12 +02:00
Jonathan G Rennison
64925aedf8 Add town variable for town tile X and Y coordinates 2023-04-13 21:19:53 +01:00
Jonathan G Rennison
9fd01d57cc Rename town zone extended variable identifiers 2023-04-13 20:53:11 +01:00
Jonathan G Rennison
ac0c8c8cdd Debug: Show local GRF IDs for engines, stations, houses, objects and road stops 2023-04-13 20:48:59 +01:00
Jonathan G Rennison
1d947201d3 Debug: Fix expand/collapse for extra engine flags 2023-04-13 19:59:28 +01:00
Jonathan G Rennison
6297012ad6 Fix save/load and GUI for locale.units_velocity_nautical setting 2023-04-11 00:29:58 +01:00
Jonathan G Rennison
82803b98e0 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/game/game_gui.cpp
#	src/graph_gui.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/newgrf.cpp
#	src/order_gui.cpp
#	src/saveload/engine_sl.cpp
#	src/saveload/saveload.h
#	src/script/api/script_text.cpp
#	src/script/script_gui.cpp
#	src/settings_table.cpp
#	src/strings.cpp
#	src/table/settings/economy_settings.ini
#	src/table/settings/locale_settings.ini
#	src/timetable_gui.cpp
 2023-04-10 15:11:53 +01:00
Tyler Trahan
0de5eb53fa Codechange: Use constants for service interval max/min/default values (#10611) 2023-04-08 18:04:30 +00:00
Tyler Trahan
1691640603 Fix: Specify units for value of share trading age setting (#10612) 2023-04-08 17:51:52 +00:00
PeterN
f1144de509 Feature: Separate rail/road and sea/air velocity units, and add knots. (#10594) 
This is achieved by packing vehicle type along with the velocity so that
the string system can decode and pick the appropriate unit.
 2023-04-08 12:26:13 -04:00
Jonathan G Rennison
c9c0436e58 Add company setting for remain at station if next order for same station 
Set value on load for whether the save version had this enabled for trains
 2023-04-06 01:30:14 +01:00
Jonathan G Rennison
1d05637d45 Add setting for rail depot maximum speed 2023-04-06 01:30:14 +01:00
Jonathan G Rennison
e02585f68e Add railtype and signals variables for signal vertical clearance 2023-04-04 20:29:22 +01:00
Jonathan G Rennison
d30157a113 Debug: Show whether vehicle needs service in debug window 2023-03-24 11:44:58 +00:00
Jonathan G Rennison
5d5e005c5d Debug: Log aircraft target airport and movement state name 2023-03-22 21:15:46 +00:00
Jonathan G Rennison
bd3df161e4 Debug: Show whether vehicle is in tile hash in debug info 2023-03-22 19:38:53 +00:00
Jonathan G Rennison
0ab54b2992 Debug: Fix aliasing of show/hide toggles for aircraft in debug window 2023-03-22 19:38:53 +00:00
Jonathan G Rennison
664c486fea Add "very reduced" mode to the vehicle breakdowns setting 2023-03-21 17:30:16 +00:00
Jonathan G Rennison
1dce4a0bef Debug: Show reliability/breakdown values in vehicle debug window 2023-03-15 19:44:26 +00:00
Jonathan G Rennison
9c5f81790a Debug: Split industry produced cargo info across multiple lines 2023-03-12 13:35:37 +00:00
Jonathan G Rennison
ae99f667b0 NewGRF: Add generic town callback to set town zone radii 2023-03-11 22:23:40 +00:00
Jonathan G Rennison
93c34775e4 NewGRF: Add town variables for uncapped house count, population and zone radii 
Add feature name
 2023-03-11 22:23:40 +00:00
Jonathan G Rennison
2ea1766677 Merge branch 'master' into jgrpp 
# Conflicts:
#	.github/workflows/commit-checker.yml
#	src/industry_cmd.cpp
#	src/industry_gui.cpp
#	src/landscape.cpp
#	src/linkgraph/linkgraph_gui.cpp
#	src/order_base.h
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/saveload/afterload.cpp
#	src/saveload/league_sl.cpp
#	src/saveload/saveload.h
#	src/script/api/script_object.hpp
#	src/script/squirrel_helper.hpp
#	src/settings_table.cpp
#	src/station_cmd.cpp
#	src/table/settings.h.preamble
#	src/tree_cmd.cpp
#	src/tree_map.h
#	src/vehicle.cpp
#	src/waypoint_cmd.cpp
 2023-03-04 16:45:05 +00:00
Michael Lutz
178249e7cc Codechange: Saveload macros for entries with a custom table name. 2023-02-26 21:41:24 +01:00
Jonathan G Rennison
4c1406a4b5 Add: NewGRF road stops 2023-02-26 21:28:30 +01:00
Rubidium
a409e4b026 Add: documention to large functions that have too little documentation according to CodeQL 2023-02-25 23:57:36 +01:00
Jonathan G Rennison
e0a42b5945 Debug: Add dumping of rail and road/tram sprite groups 2023-02-25 16:16:49 +00:00
Jonathan G Rennison
5a877b49b4 Add railtype/signal variable to get signal side 2023-02-19 20:22:40 +00:00
Jonathan G Rennison
f7d62a1767 Add road/tram type flag to disallow collisions with trains 2023-02-19 18:05:11 +00:00
Jonathan G Rennison
663a3969a0 Add road/tram type flag to disallow tunnels 2023-02-19 15:21:35 +00:00
Jonathan G Rennison
3497d0dcdb Add road/tram type properties to set road vehicle collision mode 2023-02-19 14:30:21 +00:00
Jonathan G Rennison
796924ec32 Change type of extended feature versions arrays 2023-02-15 23:49:40 +00:00
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
 2023-02-12 20:35:18 +00:00
Jonathan G Rennison
ae9b416684 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/ai/ai_core.cpp
#	src/ai/ai_gui.cpp
#	src/ai/ai_instance.cpp
#	src/console_cmds.cpp
#	src/engine_type.h
#	src/game/game_gui.cpp
#	src/game/game_instance.cpp
#	src/goal.cpp
#	src/goal_cmd.h
#	src/lang/english.txt
#	src/lang/estonian.txt
#	src/network/network_client.cpp
#	src/newgrf.cpp
#	src/newgrf_generic.h
#	src/openttd.cpp
#	src/saveload/saveload.h
#	src/script/api/script_log.cpp
#	src/script/api/script_town.cpp
#	src/settings_table.cpp
#	src/station_cmd.cpp
#	src/station_cmd.h
#	src/station_map.h
#	src/strings.cpp
#	src/table/settings/difficulty_settings.ini
#	src/table/settings/gui_settings.ini
#	src/tbtr_template_gui_main.h
#	src/timetable_cmd.cpp
#	src/timetable_cmd.h
#	src/timetable_gui.cpp
#	src/town_gui.cpp
#	src/train_gui.cpp
#	src/water_cmd.cpp
 2023-02-11 23:05:22 +00:00
Michael Lutz
5daaa45e4a Add: [NewGRF] Second vehicle property for additional callback flags. 
(cherry picked from commit 2d73076056)
 2023-02-05 22:40:03 +00:00
glx22
b080f24bd8 Codechange: move windows common to AI and GS out of ai_gui 2023-02-05 19:27:25 +01:00