glx22
d1fa6b129c
Add: [CMake] Option to only build tools/docs
4 years ago
glx22
6fae0b83d9
Add: [CMake] targets to generate documentation
4 years ago
Jonathan G Rennison
4da3cfcf56
Merge branch 'master' into jgrpp
...
# Conflicts:
# CMakeLists.txt
# src/bootstrap_gui.cpp
4 years ago
Rasmus Jonsson
0b2dd2c5cd
Fix: [NoAI] don't notify caught exceptions
4 years ago
Jonathan G Rennison
f094518f8e
Script: Add date methods for getting time in minutes
4 years ago
Jonathan G Rennison
3a75f13874
Allow drive-through road stops to be one-way
4 years ago
Jonathan G Rennison
e1aca1ab34
Extend Order::flags to 16 bits, fixes conditional order target field size
...
Adjust order packing and CmdInsertOrder
See: #198
4 years ago
Jonathan G Rennison
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
Jonathan G Rennison
bbbda0739b
Add third DoCommand parameter p3
4 years ago
Jonathan G Rennison
159c709f04
Fix missing parentheses in ScriptRoadTypeList constructor
4 years ago
Jonathan G Rennison
75a964acb0
GRF: Add extra road/tram type flag: not available to AI/GS
4 years ago
Jonathan G Rennison
14adcbac80
Add NewGRF bridge property to prevent town or AI/GS building bridge type
4 years ago
Jonathan G Rennison
d85a529f87
Merge branch 'master' into jgrpp
4 years ago
Charles Pigott
348c231e12
Codechange: Make codestyle for CMake files consistent for 'control' statements
4 years ago
Jonathan G Rennison
45386efcd0
Script: Allow changing ops limit and memory limit settings in game
4 years ago
Jonathan G Rennison
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
glx
4079c47b6c
Change: rewrote squirrel_export in CMake
4 years ago
glx
8794c61f25
Change: rewrote generate_widget in CMake
4 years ago
Jonathan G Rennison
7467051331
Merge branch 'master' into jgrpp
...
# Conflicts:
# .gitignore
# src/network/network_server.cpp
# src/vehicle_gui.cpp
4 years ago
TrevorShelton
c39d62c245
Update: Disuse of STR_ERROR_INCOMPATIBLE_ROAD
4 years ago
Jonathan G Rennison
641e682e3f
Merge pull request #167 from internet-trains/gs-rivers
...
Gamescript river construction
4 years ago
Yourself
3927ec08c6
Feature: GSMarine.BuildRiver function
4 years ago
Jonathan G Rennison
c6f2edda06
Script: Increase verbosity of compat script not found error message
4 years ago
Jonathan G Rennison
8f964ee637
Add day length compatibility fixup for BeeRewards GS
4 years ago
Jonathan G Rennison
501f7458db
Script: Add method to get day length factor
4 years ago
Jonathan G Rennison
3adeff1883
Merge branch 'master' into jgrpp
...
# Conflicts:
# CMakeLists.txt
# cmake/CompileFlags.cmake
# src/bridge_gui.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/saveload/town_sl.cpp
# src/screenshot.cpp
# src/screenshot.h
# src/toolbar_gui.cpp
# src/town.h
# src/town_cmd.cpp
4 years ago
TechGeekNZ
cf8ea74733
Update: Merge branch 'jgrpp_master_cmake' into jgrpp_cmake
4 years ago
Charles Pigott
dc8d0089e9
Codechange: Make sure script enums are the same size as their normal counterparts
4 years ago
Charles Pigott
e5f931ef42
Fix: Warning about using the wrong enum type
4 years ago
Charles Pigott
64b1c70fdd
Codechange: Add WARN_FORMAT to vseprintf and fix the cascade of warnings that followed
4 years ago
Patric Stout
56d54cf60e
Add: introduce CMake for project management
...
CMake works on all our supported platforms, like MSVC, Mingw, GCC,
Clang, and many more. It allows for a single way of doing things,
so no longer we need shell scripts and vbs scripts to work on all
our supported platforms.
Additionally, CMake allows to generate project files for like MSVC,
KDevelop, etc.
This heavily reduces the lines of code we need to support multiple
platforms from a project perspective.
Addtiionally, this heavily improves our detection of libraries, etc.
4 years ago
Jonathan G Rennison
677940cfc6
Merge branch 'master' into jgrpp
4 years ago
Michael Lutz
1c0ba07c3c
Add: [Script] Native priority queue; useful e.g. for pathfinders.
4 years ago
TechGeekNZ
16e5f610f7
Cleanup: Correct typographic errors in code comments.
4 years ago
Jonathan G Rennison
f11cd8f2d0
Fix: Compilation warnings in story_gui and script_story_page
...
See: #7896
4 years ago
Jonathan G Rennison
14e7d43c62
Merge branch 'master' into jgrpp
4 years ago
TechGeekNZ
df0f9193da
Fix some typographical errors in comments
...
Fixes : #153
Applied from: #153
4 years ago
Niels Martin Hansen
800ade7702
Feature: Push-buttons on storybook pages ( #7896 )
...
Allow more direct player-initiated interaction for Game Scripts, by letting the GS put push-buttons on storybook pages. These buttons can either trigger an immediate event, or require the player to first select a tile on the map, or a vehicle.
Additionally this reworks how the storybook pages are layouted and rendered, to allow for slightly more complex layouts, and maybe speeding drawing up a bit.
4 years ago
Jonathan G Rennison
07c9621fcf
Merge branch 'master' into jgrpp
4 years ago
glx
e0d20a44d2
Codechange: Use a dynamic copyright year
4 years ago
Jonathan G Rennison
74b6981d97
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/os/macosx/macos.mm
# src/video/cocoa/cocoa_v.mm
# src/video/cocoa/fullscreen.mm
# src/video/cocoa/wnd_quartz.mm
# src/video/cocoa/wnd_quickdraw.mm
4 years ago
Michael Lutz
1f1345de09
Codechange: [Script] Improve copying a list into another empty list.
4 years ago
SamuXarick
93a7ff6709
Fix: [Script] ScriptMarine::AreWaterTilesConnected failed for aqueducts ( #8074 )
5 years ago
Jonathan G Rennison
3f68c73b09
GS: Charge 5000 opcodes to call ScriptTown::FoundTown
...
This call is very expensive and calling it in a loop when it fails
can consume all available CPU time
Add a further 50000 charge if a town name cannot be generated
5 years ago
Jonathan G Rennison
d210bc4d14
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/lang/korean.txt
# src/saveload/afterload.cpp
Recalculate docking tile cache due to 57553cd8
5 years ago
SamuXarick
e7b901462e
Doc: [Script] Make it clear random_deviation and CONFIG_RANDOM range upper bounds are inclusive
5 years ago
SamuXarick
8f9654c5c6
Fix: [Script] Random deviation upper bound range should be inclusive
5 years ago
SamuXarick
4d4005d8b7
Fix #8039 : [AI/GS] SetOrderFlags and GetOrderDestination didn't work for oil rigs
5 years ago
SamuXarick
424770d662
Fix: [AI/GS] Consider neutral station setting when creating tile lists
5 years ago
SamuXarick
971201b3b7
Fix: [AI/GS] CanBuildConnectedRoadPartsHere neighbours tiles were at times incorrect
5 years ago
Jonathan G Rennison
8fb0b638fa
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/network/network.cpp
5 years ago
frosch
0ade8b20fe
Fix #7998 : Crash when scripts tried to access companies with invalid IDs.
5 years ago
Jonathan G Rennison
b96e7f78fb
Merge branch 'master' into jgrpp
5 years ago
Charles Pigott
5c19668fdb
Doc: [Script] Add a note about how wagon connectivity works for scripts
5 years ago
Jonathan G Rennison
babe98cdb1
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/network/network_server.h
# src/pathfinder/yapf/yapf_road.cpp
# src/viewport.cpp
5 years ago
glx
2f264f2c92
Change: Heading for 1.11 now
5 years ago
Jonathan G Rennison
dd99fd646d
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/base_station_base.h
# src/industry.h
# src/industry_cmd.cpp
# src/industry_gui.cpp
# src/lang/korean.txt
# src/os/macosx/crashlog_osx.cpp
# src/station_cmd.cpp
# src/town.h
# src/town_cmd.cpp
# src/town_gui.cpp
5 years ago
Patric Stout
3b177af826
Add: [Doxygen] Add the current version of documentation in header ( #7940 )
...
While at it, renamed the project names to reflect how we currently
refer to them.
5 years ago
Pavel Stupnikov
d7a928a08b
Feature: GS method to control engine availability for a specific company ( #7791 )
...
* Feature: GS method to allow company to use an engine before its introduction date
* Feature: GS method to retire an engine early for a specific company
5 years ago
Jonathan G Rennison
4adfe0c9ae
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/industry_gui.cpp
# src/lang/korean.txt
# src/town.h
# src/town_gui.cpp
5 years ago
SamuXarick
fa71375ec2
Fix e04ca90: squirrel export script got forgotten
5 years ago
Jonathan G Rennison
7960db35f2
Merge branch 'master' into jgrpp
...
# Conflicts:
# config.lib
# projects/openttd_vs140.vcxproj
# projects/openttd_vs140.vcxproj.filters
# projects/openttd_vs141.vcxproj
# projects/openttd_vs141.vcxproj.filters
# projects/openttd_vs142.vcxproj
# projects/openttd_vs142.vcxproj.filters
# src/aircraft_cmd.cpp
# src/base_station_base.h
# src/core/pool_type.hpp
# src/disaster_vehicle.cpp
# src/economy.cpp
# src/engine.cpp
# src/group.h
# src/group_cmd.cpp
# src/group_gui.cpp
# src/lang/english.txt
# src/lang/german.txt
# src/linkgraph/linkgraph_gui.cpp
# src/network/network_command.cpp
# src/network/network_server.cpp
# src/openttd.cpp
# src/order_cmd.cpp
# src/road_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/cargopacket_sl.cpp
# src/saveload/linkgraph_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/station_sl.cpp
# src/saveload/town_sl.cpp
# src/saveload/vehicle_sl.cpp
# src/screenshot.cpp
# src/screenshot.h
# src/settings_gui.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/station.cpp
# src/station_cmd.cpp
# src/table/settings.ini
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/train.h
# src/train_cmd.cpp
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_base.h
# src/vehiclelist.cpp
# src/window_type.h
5 years ago
stormcone
70f9c3c655
Feature: Industry directory cargo filtering
5 years ago
Niels Martin Hansen
f401622149
Feature: Script API to change town rating of companies
5 years ago
TELK
e04ca904a9
Feature: Minimap screenshot
5 years ago
pnda
e558aa8ff4
Feature: Screenshot window
5 years ago
stormcone
798e9ee93e
Feature: Add a button to the vehicle advisory news window to open the group window.
5 years ago
glx
ee7a8eebca
Codechange: Replace FOR_ALL_TOWNS with range-based for loops
5 years ago
glx
0b489f9924
Codechange: Replace FOR_ALL_SUBSIDIES with range-based for loops
5 years ago
glx
847e5f33d4
Codechange: Replace story related FOR_ALL with range-based for loops
5 years ago
glx
869581eb23
Codechange: Replace FOR_ALL_SIGNS with range-based for loops
5 years ago
glx
d8a1be48cd
Codechange: Replace vehicle related FOR_ALL with range-based for loops
5 years ago
glx
41232f18c1
Codechange: Replace network related FOR_ALL with range-based for loops
5 years ago
glx
00c2a98cf3
Codechange: Replace FOR_ALL_INDUSTRIES with range-based for loops
5 years ago
glx
4ae829cb27
Codechange: Replace FOR_ALL_GROUPS with range-based for loops
5 years ago
glx
1f6b3a37f9
Codechange: Replace FOR_ALL_ENGINES with range-based for loops
5 years ago
glx
fa9769f81a
Codechange: Replace FOR_ALL_DEPOTS with range-based for loops
5 years ago
glx
ddabfed1cd
Codechange: Replace station related FOR_ALL with range-based for loops
5 years ago
glx
e001d87569
Add #7801 : [Script] more error mappings
5 years ago
Jonathan G Rennison
ab3a373c73
Merge branch 'master' into jgrpp
5 years ago
Charles Pigott
60cbddbb5f
Fix #7606 : Game crash when trying to clean up a crashed script
...
Also fix another possible memory leak
5 years ago
Charles Pigott
cf354f6668
Codechange: new instead of malloc
5 years ago
glx22
0bdbd509be
Fix #7673 : [Script] Allow removal of custom town text ( #7834 )
5 years ago
Jonathan G Rennison
cbdd9f84d8
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/console_gui.cpp
# src/lang/korean.txt
# src/video/sdl2_v.cpp
# src/video/sdl2_v.h
# src/window.cpp
# src/window_gui.h
5 years ago
S. D. Cloudt
13cc8a0cee
Cleanup: Removed SVN headers
5 years ago
Jonathan G Rennison
ca3c72438e
Merge branch 'master' into jgrpp
...
# Conflicts:
# Makefile.bundle.in
# src/os/macosx/string_osx.cpp
# src/station_cmd.cpp
5 years ago
Charles Pigott
85b517cd93
Fix #7606 : Game crash when trying to clean up a crashed script
...
Also fix another possible memory leak
(cherry picked from commit cdf9ff6f5f505517600dc487bc49d9e3cca90d9a)
5 years ago
James103
f1204f0d9d
Fix: spelling/grammar in script_tile.hpp ( #7804 )
5 years ago
glx
12e43c697d
Add: [Script] ScriptEventVehicleAutoReplaced.
5 years ago
Niels Martin Hansen
53f8d0b815
Codechange: Use std::vector for industry tile layouts
5 years ago
Jonathan G Rennison
edfd378e93
Merge branch 'master' into jgrpp
...
# Conflicts:
# source.list
# src/blitter/32bpp_anim.cpp
# src/linkgraph/linkgraphjob.cpp
# src/order_cmd.cpp
# src/vehicle.cpp
# src/vehicle_type.h
5 years ago
Jonathan G Rennison
0246d59c8d
FlowStat: Replace btree_map with flat map which is inlined in small case
...
Inline storage for size <= 2
Size = 1 is ~90%
Size = 2 is ~9%
Size >=3 is ~1% and gets a separate allocation
5 years ago
Jonathan G Rennison
90550d9642
FlowStatMap: Replace RB-tree with btree-indexed vector
5 years ago
Charles Pigott
fe9731d32c
Fix: clang and MSVC warnings (glx)
5 years ago
JMcKiern
04f659e768
Fix: Some typos found using codespell
5 years ago
Jonathan G Rennison
1f535915d1
Merge branch 'master' into jgrpp-nrt
...
# Conflicts:
# config.lib
# src/core/bitmath_func.hpp
# src/lang/korean.txt
# src/main_gui.cpp
# src/order_gui.cpp
# src/script/api/script_object.cpp
# src/station_cmd.cpp
# src/video/cocoa/wnd_quartz.mm
5 years ago
Max Maton
e4414471dd
Add: Allow GameScript to demolish without a company
...
This allows GameScripts to shrink towns as well as grow them.
5 years ago
Niels Martin Hansen
0549a81c30
Fix b3fd7879: Ignore command flags when verifying script commands
...
Multiplayer games has the server add some flags to the cmd value during the handling.
These flags should not be included in the verification, mask them out. Without this
masking out, scripts tend to die when executing their first command in multiplayer.
5 years ago
glx22
b3fd787959
Fix #7188 : check the validity of command callback for scripts ( #7701 )
5 years ago
glx22
cf86c39be5
Fix b870596f153c17d9aa915ca67b8f6414d73cb31f: forgotten squirrel_export run ( #7715 )
5 years ago
Jonathan G Rennison
6562937899
Merge branch 'master' into jgrpp-nrt
...
# Conflicts:
# src/console_cmds.cpp
# src/script/api/script_order.cpp
# src/station_cmd.cpp
# src/statusbar_gui.cpp
# src/town_gui.cpp
5 years ago
Gabda
b870596f15
Add #6887 : Option to show zone inside local authority boundary of towns
...
Can be found at town information > local authority window
Layout for button is same as Graph Keys
Turn on/off for every town individually
5 years ago
nikolas
10fe568f08
Fix: typo in ScriptList::Valuate param error ( #7687 )
5 years ago
TELK
196d586849
Feature: Town name filtering ( #7621 )
5 years ago
Jonathan G Rennison
d71a7c21da
Fix #7593 : Crash in ScriptOrder::GetOrderDistance in VT_AIR mode
...
Null pointer dereference occurred when either origin_tile or dest_tile
were waypoint tiles.
5 years ago
dP
36e4bd4023
Fix: Make GSGoal.QuestionClient work correctly at least for clients with ID < 2**16
5 years ago
Jonathan G Rennison
d3e0c3787f
Merge branch 'master' into jgrpp-nrt
...
Merge trunk multiple docks implementation
# Conflicts:
# docs/landscape_grid.html
# src/order_cmd.cpp
# src/pathfinder/npf/npf.cpp
# src/pathfinder/yapf/yapf_ship.cpp
# src/rail_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/oldloader_sl.cpp
# src/saveload/station_sl.cpp
# src/script/api/script_order.cpp
# src/ship_cmd.cpp
# src/station.cpp
# src/station_base.h
# src/station_cmd.cpp
# src/tunnelbridge_cmd.cpp
5 years ago
Jonathan G Rennison
dbc5f1baed
Merge branch 'master' into jgrpp-nrt
...
# Conflicts:
# src/fontcache.cpp
# src/game/game_text.cpp
# src/lang/korean.txt
# src/os/macosx/crashlog_osx.cpp
# src/os/windows/crashlog_win.cpp
# src/station_cmd.cpp
# src/viewport.cpp
5 years ago
Jonathan G Rennison
ba8ed880c1
Merge branch 'master' into jgrpp-nrt
...
Merge NRT feature
# Conflicts:
# docs/landscape.html
# docs/landscape_grid.html
# src/bridge_map.h
# src/build_vehicle_gui.cpp
# src/company_base.h
# src/company_cmd.cpp
# src/misc_gui.cpp
# src/newgrf.cpp
# src/newgrf_engine.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/npf/npf.cpp
# src/road_cmd.cpp
# src/road_func.h
# src/road_gui.cpp
# src/road_map.h
# src/road_type.h
# src/roadveh_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/company_sl.cpp
# src/script/api/script_bridge.cpp
# src/table/newgrf_debug_data.h
# src/tile_cmd.h
# src/town_cmd.cpp
# src/tunnel_map.h
# src/tunnelbridge_cmd.cpp
5 years ago
Jonathan G Rennison
36eb4165b8
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/bridge_map.h
# src/crashlog.cpp
# src/industry.h
# src/linkgraph/linkgraph_type.h
# src/order_type.h
# src/saveload/afterload.cpp
# src/settings.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/spritecache.cpp
# src/stdafx.h
# src/table/settings.h.preamble
# src/train.h
# src/vehicle.cpp
# src/viewport.cpp
# src/viewport_func.h
# src/widgets/station_widget.h
# src/zoom_func.h
# src/zoom_type.h
5 years ago
unknown
6f28a0c051
Fix #5685 : Check for free wagons in ScriptVehicleList
5 years ago
peter1138
f538179878
Feature: Multi-tile docks and docking points.
5 years ago
glx
09004f3697
Codechange: catch script exceptions by reference
5 years ago
glx
a82e7ec281
Fix #7590 : handle script exceptions during scanning
5 years ago
glx
aac4255d43
Fix #7590 : decrement allocated_size in ScriptAllocator::Free()
5 years ago
Niels Martin Hansen
e7f6f07599
Add: Show memory allocations by GS and AI in framerate window
5 years ago
Niels Martin Hansen
140a96b3a0
Change: Limit memory allocations for each Squirrel instance
...
This can avoid out-of-memory situations due to single scripts using up the entire address space.
Instead, scripts that go above the maximum are killed.
The maximum is default 1 GB per script, but can be configured by a setting.
5 years ago
Jonathan G Rennison
bdcafb38cc
Fix ScriptOrder::GetOrderDistance in VT_AIR mode on waypoint tiles
5 years ago
peter1138
3293f08e0b
Add: New RoadType API functions.
6 years ago
peter1138
c02ef3e456
Feature: Add NotRoadTypes (NRT)
6 years ago
Charles Pigott
5b34c8019f
Codechange: Remove Company/OwnerByte types
6 years ago
Charles Pigott
931d32f414
Codechange: Remove RailTypeByte type
6 years ago
peter1138
81d335b081
Feature: Add station coverage area display for towns.
6 years ago
peter1138
b6733edd17
Feature: Add coverage area display for existing stations.
6 years ago
Niels Martin Hansen
08284e005d
Fix: Automatic line breaking of the warning
6 years ago
Niels Martin Hansen
dcb2571888
Add: Warn players that company passwords are not truly secure
6 years ago
Jonathan G Rennison
0d93ecb6bf
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/core/alloc_type.hpp
# src/group_gui.cpp
# src/newgrf.cpp
# src/saveload/economy_sl.cpp
# src/saveload/map_sl.cpp
# src/station_cmd.cpp
6 years ago
PeterN
3bbd7ea2c1
Fix: Industry coverage area is no longer rectangular. ( #7464 )
...
AIs test station catchment in reverse to how players see station catchment.
This did not take account of non-rectangular station catchment areas, so AIs
could end up placing stations in locations that did not accept/deliver cargo.
6 years ago
PeterN
abe8cf4985
Codechange: Replace duplicated code with TileArea::Expand() ( #7467 )
6 years ago
peter1138
5bd2b15e86
Codechange: Replace NULL with nullptr in squirrel interface.
6 years ago
Jonathan G Rennison
674732cd68
Merge: Codechange: Use null pointer literal instead of the NULL macro
6 years ago
Henry Wilson
7c8e7c6b6e
Codechange: Use null pointer literal instead of the NULL macro
6 years ago
Jonathan G Rennison
4bf4862674
Add AI/game script DoCommand calls to command log
6 years ago
Jonathan G Rennison
a4a3a6a630
Merge branch 'master' into jgrpp
6 years ago
peter1138
f0336f1f17
Codechange: Remove ship max order distance from script API.
6 years ago
glx
d0e8060182
Fix 6fc60d8c4f: forgot to update API changelog
6 years ago
PeterN
e1069eee05
Codechange: Check airport layout would fit within map bounds before iterating tiles. ( #7429 )
6 years ago
Jonathan G Rennison
58433c7667
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/core/smallmap_type.hpp
# src/lang/korean.txt
# src/network/network_content.cpp
# src/smallmap_gui.cpp
# src/station_cmd.cpp
6 years ago
PeterN
b6e3e30d86
Codechange: Distance between town and airport has already just been found, so use it. ( #7427 )
...
Previously the distance was thrown away, only to be expensively recalculated again.
6 years ago
glx22
66dd7c3879
Fix: MSVC warnings ( #7423 )
6 years ago
Jonathan G Rennison
ba34ec7ade
Merge branch 'master' into jgrpp
...
Replace build and refit, and group collapse implementations
Fix template creation build and refit
# Conflicts:
# Makefile.bundle.in
# config.lib
# src/animated_tile.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_base.hpp
# src/blitter/8bpp_base.hpp
# src/blitter/null.hpp
# src/build_vehicle_gui.cpp
# src/command.cpp
# src/command_func.h
# src/console_gui.cpp
# src/core/smallstack_type.hpp
# src/date.cpp
# src/debug.cpp
# src/genworld_gui.cpp
# src/ground_vehicle.hpp
# src/group_gui.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.h
# src/main_gui.cpp
# src/misc_gui.cpp
# src/network/core/game.h
# src/network/core/packet.cpp
# src/network/core/udp.cpp
# src/network/core/udp.h
# src/network/network_content.cpp
# src/network/network_type.h
# src/network/network_udp.cpp
# src/newgrf_house.h
# src/openttd.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/os/unix/crashlog_unix.cpp
# src/os/windows/crashlog_win.cpp
# src/osk_gui.cpp
# src/pathfinder/opf/opf_ship.cpp
# src/rail_cmd.cpp
# src/rail_gui.cpp
# src/saveload/saveload.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/smallmap_gui.h
# src/station_base.h
# src/station_cmd.cpp
# src/table/gameopt_settings.ini
# src/table/newgrf_debug_data.h
# src/table/settings.ini
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/vehiclelist.cpp
# src/viewport.cpp
# src/widgets/dropdown.cpp
# src/window_gui.h
6 years ago
Henry Wilson
03ca3190c9
Codechange: Use range-based for-loop in Auto[Free|Delete]SmallVector
6 years ago
Henry Wilson
c01a2e2a81
Codechange: Removed SmallVector completely
6 years ago
Henry Wilson
ab711e6942
Codechange: Replaced SmallVector::[Begin|End]() with std alternatives
6 years ago
Henry Wilson
a0f36a50e6
Codechange: Replaced SmallVector::Append() with std::vector::[push|emplace]_back()
6 years ago
Henry Wilson
a690936ed7
Codechange: Replace SmallVector::Length() with std::vector::size()
6 years ago
Henry Wilson
4b349c0f90
Codechange: [core] Implement SmallVector using std::vector
...
The public and protected interface to SmallVector are unchanged
SmallVector now requires that items be default constructible
This isn't an issue since some contained items were previously created
uninitialized.
Temporary default constructors are added to the following structs
- SmallPair
- SmallStackItem
- GRFPresence
Where vector<bool> is required, transition immediately to std::vector
to avoid returning proxy object references.
6 years ago
glx
f8e6cd10ef
Add: script API functions for build with refit feature
6 years ago
peter1138
d54b6ac09b
Feature: When filtering purchase list by cargo type, make buy button perform a refit if required.
6 years ago
Henry Wilson
af7d9020a1
Codechange: Use override specifer for overriding member declarations
...
This is a C++11 feature that allows the compiler to check that a virtual
member declaration overrides a base-class member with the same signature.
Also src/blitter/32bpp_anim_sse4.hpp +38 is no longer erroneously marked
as virtual despite being a template.
6 years ago
Patric Stout
e3c639a09f
Remove: ENABLE_NETWORK switch
...
This switch has been a pain for years. Often disabling broke
compilation, as no developer compiles OpenTTD without, neither do
any of our official binaries.
Additionaly, it has grown so hugely in our codebase, that it
clearly shows that the current solution was a poor one. 350+
instances of "#ifdef ENABLE_NETWORK" were in the code, of which
only ~30 in the networking code itself. The rest were all around
the code to do the right thing, from GUI to NewGRF.
A more proper solution would be to stub all the functions, and
make sure the rest of the code can simply assume network is
available. This was also partially done, and most variables were
correct if networking was disabled. Despite that, often the #ifdefs
were still used.
With the recent removal of DOS, there is also no platform anymore
which we support where networking isn't working out-of-the-box.
All in all, it is time to remove the ENABLE_NETWORK switch. No
replacement is planned, but if you feel we really need this option,
we welcome any Pull Request which implements this in a way that
doesn't crawl through the code like this diff shows we used to.
6 years ago
Jonathan G Rennison
5e6d283463
Merge branch 'master' into jgrpp
...
Remove the viewport sign cache as this is now superseded by the kd tree
implementation
# Conflicts:
# src/crashlog.cpp
# src/lang/english.txt
# src/misc.cpp
# src/pathfinder/follow_track.hpp
# src/pbs.cpp
# src/rail_cmd.cpp
# src/saveload/vehicle_sl.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/ship_cmd.cpp
# src/station.cpp
# src/station_base.h
# src/station_cmd.cpp
# src/table/settings.ini
# src/thread/thread_morphos.cpp
# src/town_cmd.cpp
# src/train_cmd.cpp
# src/viewport.cpp
# src/waypoint.cpp
6 years ago
Peter Nelson
8b1b3fd0f9
Feature: Non-rectangular sparse station catchment area.
6 years ago
peter1138
ed6084523d
Codechange: Convert StationList from SmallVector to std::set.
6 years ago
glx22
dae35188ab
Fix 13962a847
, 00d28a500: forgotten squirrel_export run ( #7345 )
6 years ago
PeterN
41563a871b
Add: AI API for vehicle group colours ( #7336 )
6 years ago
Jonathan G Rennison
7ff252c58d
Merge branch 'master' into jgrpp
...
# Conflicts:
# Makefile.src.in
# findversion.sh
# projects/determineversion.vbs
# src/aircraft_cmd.cpp
# src/lang/dutch.txt
# src/linkgraph/linkgraph_gui.cpp
# src/linkgraph/linkgraph_gui.h
# src/order_cmd.cpp
# src/settings_gui.cpp
# src/smallmap_gui.cpp
# src/town_cmd.cpp
# src/viewport.cpp
# src/water_map.h
6 years ago
frosch
a67ee02529
Change: Heading for 1.10 now ( #7319 )
6 years ago
Peter Nelson
5a5944867d
Add: Add parent_group_id parameter to CreateGroup()
6 years ago
Peter Nelson
5d3ccae6c5
Add: AI function to get current usage of a group.
6 years ago
Peter Nelson
e0c2ad1b65
Add: AI functions to get/set company colours.
6 years ago
Peter Nelson
3c047b124e
Add: AI functions to get current and last year profit of a group.
6 years ago
Peter Nelson
b62452903a
Add: AI functions to set/get vehicle group parent.
6 years ago
Jonathan G Rennison
9b07287303
Add scope info logging to ScriptObject::DoCommand
6 years ago
Niels Martin Hansen
13962a8475
Change: Framerate window can now scroll and resize
6 years ago
Peter Nelson
fde5bd0ccf
Change: Add scrollbar to cargo legend in cargo payment rates window.
6 years ago
Greg Carlin
00d28a500d
Feature: Add option to adjust font size separately from GUI size. ( #7003 )
...
Adds an option in the "Game Options" next to "Interface Size" called "Font Size". Available options are normal, double, and quad.
6 years ago
Jonathan G Rennison
36ac643749
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/lang/afrikaans.txt
# src/lang/basque.txt
# src/lang/belarusian.txt
# src/lang/brazilian_portuguese.txt
# src/lang/bulgarian.txt
# src/lang/catalan.txt
# src/lang/croatian.txt
# src/lang/czech.txt
# src/lang/danish.txt
# src/lang/dutch.txt
# src/lang/english.txt
# src/lang/english_AU.txt
# src/lang/english_US.txt
# src/lang/estonian.txt
# src/lang/finnish.txt
# src/lang/french.txt
# src/lang/gaelic.txt
# src/lang/galician.txt
# src/lang/german.txt
# src/lang/greek.txt
# src/lang/hebrew.txt
# src/lang/hungarian.txt
# src/lang/icelandic.txt
# src/lang/indonesian.txt
# src/lang/irish.txt
# src/lang/italian.txt
# src/lang/japanese.txt
# src/lang/korean.txt
# src/lang/latin.txt
# src/lang/latvian.txt
# src/lang/lithuanian.txt
# src/lang/luxembourgish.txt
# src/lang/norwegian_bokmal.txt
# src/lang/norwegian_nynorsk.txt
# src/lang/polish.txt
# src/lang/portuguese.txt
# src/lang/romanian.txt
# src/lang/russian.txt
# src/lang/serbian.txt
# src/lang/simplified_chinese.txt
# src/lang/slovak.txt
# src/lang/slovenian.txt
# src/lang/spanish.txt
# src/lang/spanish_MX.txt
# src/lang/swedish.txt
# src/lang/tamil.txt
# src/lang/thai.txt
# src/lang/traditional_chinese.txt
# src/lang/turkish.txt
# src/lang/ukrainian.txt
# src/lang/unfinished/persian.txt
# src/lang/vietnamese.txt
# src/lang/welsh.txt
# src/rail_cmd.cpp
# src/station_cmd.cpp
6 years ago
Samu
ba55f93f41
Doc: [AI] UnshareOrders empties the orders list of the vehicle.
6 years ago
Jonathan G Rennison
4c8b358ffe
Add game setting to allow only non-stop orders for ground vehicles
6 years ago
PeterN
5dc377244d
Fix #7224 : AI could no longer create groups. ( #7233 )
6 years ago
Jonathan G Rennison
2fdcc52321
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# Makefile.src.in
# findversion.sh
# projects/determineversion.vbs
# src/lang/dutch.txt
# src/lang/korean.txt
# src/network/network.cpp
# src/network/network_client.cpp
# src/rail.cpp
# src/rail_cmd.cpp
# src/saveload/afterload.cpp
# src/ship_cmd.cpp
# src/toolbar_gui.cpp
# src/vehicle.cpp
6 years ago
glx
70e1c57f81
Fix: line ending issues with MSYS2
6 years ago
Peter Nelson
bfdad9ad1b
Fix #7108 : Missed generate_widget script run for livery changes.
6 years ago
Jonathan G Rennison
2142452305
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# Makefile.src.in
# findversion.sh
# projects/determineversion.vbs
# src/gamelog.cpp
# src/gamelog_internal.h
# src/lang/german.txt
# src/lang/korean.txt
# src/network/core/config.h
# src/network/network.cpp
# src/network/network_udp.cpp
# src/rev.h
# src/saveload/afterload.cpp
# src/saveload/company_sl.cpp
# src/saveload/depot_sl.cpp
# src/saveload/gamelog_sl.cpp
# src/saveload/misc_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/saveload.cpp
# src/saveload/station_sl.cpp
# src/saveload/town_sl.cpp
# src/saveload/vehicle_sl.cpp
# src/table/settings.ini
# src/viewport.cpp
6 years ago
Samu
011257dc88
Change: Allow AI companies to start immediately.
...
Allow multiple AIs to possibly start in the same tick.
start_date = 0 becomes a special case, where random deviation does not occur.
If start_date was not already 0, then a minimum value of 1 must apply.
6 years ago
Jonathan G Rennison
9d3b77c5a2
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/fios_gui.cpp
# src/lang/english.txt
# src/lang/german.txt
6 years ago
SamuXarick
1e5a6765d9
Change: Give AI/GSBridge::GetName an extra parameter to refer the vehicle type ( #6988 )
6 years ago
Jonathan G Rennison
ddf31702a2
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/group_gui.cpp
# src/lang/english.txt
# src/saveload/saveload.cpp
# src/widgets/group_widget.h
6 years ago
PeterN
23960d0f2c
Feature: Group liveries, and livery window usability enhancements. ( #7108 )
...
* Change: Replace checkbox in livery selection window with Default option in drop down selection.
This reduces clutter in the UI and allows for primary/secondary colours to independently follow the default scheme if desired.
* Feature: Add vehicle group liveries.
6 years ago
Jonathan G Rennison
281d346fe2
Merge branch 'master' into jgrpp
...
# Conflicts:
# bin/baseset/no_sound.obs
# bin/baseset/orig_dos.obg
# bin/baseset/orig_dos.obs
# bin/baseset/orig_dos_de.obg
# bin/baseset/orig_win.obg
# bin/baseset/orig_win.obm
# bin/baseset/orig_win.obs
# src/aircraft_cmd.cpp
# src/blitter/32bpp_anim.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_base.cpp
# src/blitter/32bpp_base.hpp
# src/blitter/8bpp_base.cpp
# src/blitter/8bpp_base.hpp
# src/blitter/common.hpp
# src/group_gui.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.cpp
# src/saveload/saveload.cpp
# src/town_cmd.cpp
# src/viewport.cpp
# src/viewport_func.h
6 years ago
glx22
b28a678436
Fix #7112 , fef8b831a9: incorrect precondition check ( #7127 )
6 years ago
glx
7292591967
Add: generate_widget.vbs to allow script_window.hpp enums generation for users unable to run bash/gawk scripts
6 years ago
glx
636fcc2cc0
Fix: keep the line ending when generating widget enums with bash/gawk on windows
6 years ago
Jonathan G Rennison
7c539267ed
Merge branch 'master' into jgrpp
6 years ago
glx
9f0ad7e269
Fix: BSD find used by OSX requires explicit path
6 years ago
glx
3f28e0cf53
Add: squirrel_export.vbs for users unable to run bash/gawk scripts
6 years ago
glx
8e5a8d3ec3
Cleanup: remove svn references in squirrel_export.sh
6 years ago
glx
2cf9405aa2
Fix: remove manual single file generation in squirrel_export.sh as it's broken
6 years ago
glx
34c438d7ad
Fix: keep line endings when running squirrel_export.sh on windows
6 years ago
Jonathan G Rennison
0e7519f33e
Merge branch 'more_cond_orders-sx' into jgrpp
...
# Conflicts:
# config.lib
# projects/openttd_vs100.vcxproj
# projects/openttd_vs100.vcxproj.filters
# projects/openttd_vs80.vcproj
# projects/openttd_vs90.vcproj
# src/order_gui.cpp
# src/order_type.h
# src/saveload/afterload.cpp
# src/saveload/extended_ver_sl.cpp
6 years ago
Eddi-z
13056aedbc
Add: Conditional order for max. reliability (patch by Cirdan, #6360 ) ( #7017 )
6 years ago
Niels Martin Hansen
12ba56c5a3
Fix 6accbf9: Silence warnings about unused fread() result
6 years ago
Jonathan G Rennison
4f1d54564e
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/debug.cpp
6 years ago
Alberth
4a255e879a
Fix #6966 : Only allow switching to a valid company.
6 years ago
glx
c540d72445
Fix: [Win32] WIN32 may not be defined, always prefer the compiler predefined macro _WIN32
6 years ago
Joan Josep
8890926b0d
Fix #6974 : Add save-load filter widget to api
6 years ago
Jonathan G Rennison
ccf13467db
Prevent AIs from creating or adding to rail custom bridge heads
6 years ago
Jonathan G Rennison
2003a86932
Merge remote-tracking branch 'origin/master' into jgrpp
...
# Conflicts:
# src/string.cpp
6 years ago
comicsads
b93fad7481
Fix: Spelling in code comment ( #6984 )
6 years ago