e95216b59d
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/company_cmd.cpp
# src/core/geometry_func.cpp
# src/date.cpp
# src/genworld_gui.cpp
# src/gfx.cpp
# src/object_gui.cpp
# src/openttd.cpp
# src/settings_type.h
# src/video/allegro_v.cpp
# src/video/dedicated_v.cpp
# src/video/null_v.cpp
# src/video/sdl2_v.cpp
# src/video/sdl_v.cpp
# src/video/win32_v.cpp
4 years ago
91cc414588
Feature: [GS] Allow non-question type windows to have no buttons
4 years ago
f11dcb8478
Fix crash if AI attempts to set order flags of invalid vehicle's order
...
Fixes: 4c8b358f
4 years ago
7154f8859d
Merge tag '1.11.0-beta1' into jgrpp
...
# Conflicts:
# src/console_cmds.cpp
# src/gfx_func.h
# src/industry.h
# src/lang/czech.txt
# src/lang/estonian.txt
# src/lang/german.txt
# src/lang/indonesian.txt
# src/lang/japanese.txt
# src/lang/norwegian_bokmal.txt
# src/lang/russian.txt
# src/lang/slovak.txt
# src/saveload/saveload.h
# src/station_gui.cpp
# src/town_gui.cpp
# src/vehicle_gui.cpp
# src/video/sdl2_v.cpp
# src/waypoint_gui.cpp
4 years ago
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
4 years ago
6c3e5642f8
Merge branch 'master' into jgrpp
...
# Conflicts:
# cmake/CompileFlags.cmake
# src/crashlog.cpp
# src/fileio.cpp
# src/fileio_func.h
# src/fios_gui.cpp
# src/ini_load.cpp
# src/ini_type.h
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/network/network_client.cpp
# src/order_base.h
# src/order_cmd.cpp
# src/os/windows/win32.cpp
# src/road_cmd.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/settings.cpp
# src/station_cmd.cpp
# src/stdafx.h
# src/table/settings.ini
# src/tree_cmd.cpp
# src/tree_gui.cpp
# src/vehicle_base.h
# src/video/cocoa/cocoa_v.mm
# src/video/cocoa/event.mm
# src/video/cocoa/wnd_quartz.mm
# src/viewport.cpp
# src/widgets/tree_widget.h
4 years ago
39df1c49a1
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/fileio.cpp
# src/group_gui.cpp
# src/industry.h
# src/lang/korean.txt
# src/linkgraph/linkgraphjob.cpp
# src/linkgraph/linkgraphjob.h
# src/linkgraph/linkgraphschedule.cpp
# src/linkgraph/linkgraphschedule.h
# src/openttd.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/town_cmd.cpp
# src/vehicle_gui.cpp
# src/vehicle_gui_base.h
4 years ago
43980639de
Merge branch 'master' into jgrpp
...
# Conflicts:
# .gitignore
# CMakeLists.txt
# src/3rdparty/optional/optional.hpp
# src/group_cmd.cpp
# src/industry_cmd.cpp
# src/misc_gui.cpp
# src/video/sdl2_v.cpp
4 years ago
bab7de6cf2
Feature: Allow GameScripts to add additional text to Industry view window
4 years ago
4b42ecb0f6
Feature: Add tile parameter for GSCompany.ChangeBankBalance to show text effect if needed ( #8573 )
4 years ago
6298d9221a
Fix 218f40e: Warning about 32-bit shift implicitly converted to 64 bits
4 years ago
218f40eea2
Add: [Script] ScriptCargo::GetName, to get the human readable name of a cargo ( #8544 )
...
Of course this translates into AICargo.GetName() for AIs and
GSCargo.GetName() for GameScripts.
4 years ago
9b800a96ed
Codechange: Remove min/max functions in favour of STL variants ( #8502 )
4 years ago
f7e48cac87
Fix #8453 : [Script] Don't truncate loan variation to 32bit
4 years ago
f39a00d676
Feature: Set exclusive access to industry from GS ( #8115 )
...
(cherry picked from commit 9a45a0f535
4 years ago
4d97fbc814
Feature: Influence industry production changes from GS ( #7912 )
...
(cherry picked from commit b7751c483e
4 years ago
483ed2f468
Merge branch 'master' into jgrpp
...
# Conflicts:
# .github/workflows/ci-build.yml
# .github/workflows/commit-checker.yml
# src/openttd.cpp
4 years ago
dc5b8020cc
Fix #6452 : Reset only editable and visible settings from GUI ( #7890 )
...
Also enables the Reset button while in-game for AI configs.
4 years ago
b408fe77f7
Codechange: Use std::string in file scanners.
4 years ago
65f65ad2ad
Codechange: Convert some more FIO functions to take std::string.
4 years ago
f3326d34e7
Codechange: Use std::string in FIO search path handling.
4 years ago
d8605ad18d
Codechange: Replace FOR_VEHICLE_ORDERS with range-based for loops
4 years ago
f66baa444f
Codechange: use C++11 constructs for for-each loops ( #8432 )
4 years ago
29e3331055
Codechange: move block a bit lower to increase readability
...
It was rather confusing that "library_name" was calculated, and
then not used to do the FindLibrary() call. Flipping those two
blocks around makes it a bit more sane to read.
4 years ago
8c0e4ab07f
Doc: for over 10 years now, we do not load the exact AI version first ( #8431 )
...
See commit fae34ee7
4 years ago
9a45a0f535
Feature: Set exclusive access to industry from GS ( #8115 )
4 years ago
b7751c483e
Feature: Influence industry production changes from GS ( #7912 )
4 years ago
d1fa6b129c
Add: [CMake] Option to only build tools/docs
4 years ago
6fae0b83d9
Add: [CMake] targets to generate documentation
4 years ago
4da3cfcf56
Merge branch 'master' into jgrpp
...
# Conflicts:
# CMakeLists.txt
# src/bootstrap_gui.cpp
4 years ago
0b2dd2c5cd
Fix: [NoAI] don't notify caught exceptions
4 years ago
f094518f8e
Script: Add date methods for getting time in minutes
4 years ago
3a75f13874
Allow drive-through road stops to be one-way
4 years ago
e1aca1ab34
Extend Order::flags to 16 bits, fixes conditional order target field size
...
Adjust order packing and CmdInsertOrder
See: #198
4 years ago
6e17f9bf5d
Use p3 for order indices which don't fit into p1
...
Fix insert/modify order overflowing p1
Don't use text field for change timetable
4 years ago
bbbda0739b
Add third DoCommand parameter p3
4 years ago
159c709f04
Fix missing parentheses in ScriptRoadTypeList constructor
4 years ago
75a964acb0
GRF: Add extra road/tram type flag: not available to AI/GS
4 years ago
14adcbac80
Add NewGRF bridge property to prevent town or AI/GS building bridge type
4 years ago
d85a529f87
Merge branch 'master' into jgrpp
4 years ago
348c231e12
Codechange: Make codestyle for CMake files consistent for 'control' statements
4 years ago
45386efcd0
Script: Allow changing ops limit and memory limit settings in game
4 years ago
5b78090a61
Merge branch 'master' into jgrpp
...
# Conflicts:
# CMakeLists.txt
# src/saveload/town_sl.cpp
# src/screenshot.h
# src/script/api/ai/ai_date.hpp.sq
# src/script/api/ai/ai_marine.hpp.sq
# src/script/api/ai/ai_station.hpp.sq
# src/script/api/game/game_date.hpp.sq
# src/script/api/game/game_marine.hpp.sq
# src/script/api/game/game_station.hpp.sq
# src/script/api/game/game_window.hpp.sq
# src/script/api/script_window.hpp
# src/script/api/template/template_window.hpp.sq
# src/signal.cpp
# src/statusbar_gui.cpp
# src/toolbar_gui.cpp
# src/viewport.cpp
# src/viewport_func.h
4 years ago
4079c47b6c
Change: rewrote squirrel_export in CMake
4 years ago
8794c61f25
Change: rewrote generate_widget in CMake
4 years ago
7467051331
Merge branch 'master' into jgrpp
...
# Conflicts:
# .gitignore
# src/network/network_server.cpp
# src/vehicle_gui.cpp
4 years ago
c39d62c245
Update: Disuse of STR_ERROR_INCOMPATIBLE_ROAD
4 years ago
641e682e3f
Merge pull request #167 from internet-trains/gs-rivers
...
Gamescript river construction
4 years ago
3927ec08c6
Feature: GSMarine.BuildRiver function
4 years ago
c6f2edda06
Script: Increase verbosity of compat script not found error message
4 years ago
Jonathan G Rennison
dP
SamuXarick
Patric Stout
Charles Pigott
glx22
Niels Martin Hansen
Michael Lutz
Rasmus Jonsson
TrevorShelton
Yourself