dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
50,874 Commits 1 Branch 0 Tags
253772e9af1d76d75191e59607fca81632abcb79
Commit Graph

555 Commits

Author SHA1 Message Date
Jonathan G Rennison
253772e9af Merge branch 'master' into jgrpp 
# Conflicts:
#	CMakeLists.txt
#	COMPILING.md
#	src/console.cpp
#	src/console_cmds.cpp
#	src/console_internal.h
#	src/rev.cpp.in
 2021-04-25 02:14:58 +01:00
Jonathan G Rennison
ba418f9d0d Merge branch 'master' into jgrpp 
# Conflicts:
#	src/lang/simplified_chinese.txt
#	src/network/core/tcp_content.cpp
#	src/network/core/udp.cpp
#	src/network/network_server.cpp
#	src/saveload/linkgraph_sl.cpp
#	src/table/gameopt_settings.ini
 2021-04-25 01:23:52 +01:00
Loïc Guilloux
888389c28d Codechange: Use std::string in console commands/aliases registration, and std::map instead our sorted linked list (#9057) 
* Codechange: Use std::string in console commands and aliases registration

* Codechange: Use std::map to register console commands

* Codechange: Use std::map to register console aliases

* Cleanup: Remove now unused function
 2021-04-24 15:19:57 +02:00
rubidium42
2e0f3799a8 Change: [Network] Prevent invalid client names being sent to the server when changing it using the console/settings 2021-04-24 08:02:54 +02:00
Patric Stout
31897eaa7d Codechange: split ParseConnectionString into two functions 
One also looks for a company, the other doesn't. There were more
uses of the latter than the first, leaving very weird code all
over the place.
 2021-04-20 17:34:04 +02:00
Jonathan G Rennison
6a62b94263 Add NewGRF railtype flag to disable realistic braking for vehs of that type 
See: #242
 2021-04-15 20:56:45 +01:00
Jonathan G Rennison
0422e2fe1e Add misc debug flag for water flooding states 2021-04-12 23:59:21 +01:00
Jonathan G Rennison
253d54ce05 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/lang/french.txt
#	src/network/network_udp.cpp
 2021-04-12 22:59:30 +01:00
rubidium42
c4bccd4f70 Fix #8874: show a warning when a NewGRF scan is requested multiple times from the console (#9022) 2021-04-12 20:53:04 +02:00
Jonathan G Rennison
8e92a6844f Add a "misc_debug" console command 
Add a flag to open veh window when TrainBrakesOverheatedBreakdown called
 2021-04-12 00:18:13 +01:00
Jonathan G Rennison
5e14b54a0c Merge branch 'master' into jgrpp 2021-04-05 17:51:45 +01:00
Patric Stout
5056e963ba Fix #8851: don't allow infinite "exec" depth in script, but limit to 10 deep 
This means if you execute a script from a script from a script, ..
for more than 10 times, it bails out now. This should be sufficient
for even the most complex scripts.
 2021-03-13 10:01:05 +01:00
Patric Stout
8230cd009d Fix: calling "exec" from script never returned 
Example:

exec other.script
echo hello

The "echo" was never executed.
 2021-03-13 10:01:05 +01:00
Jonathan G Rennison
4361a6dbf4 Avoid undefined behaviour const_casting std::string c_str() 
Use non-const data() instead

See: #224
 2021-03-11 01:33:06 +00:00
Patric Stout
970fedd78c Add: make modal windows update more smooth 
Basically, modal windows had their own thread-locking for what
drawing was possible. This is a bit nonsense now we have a
game-thread. And it makes much more sense to do things like
NewGRFScan and GenerateWorld in the game-thread, and not in a
thread next to the game-thread.

This commit changes that: it removes the threads for NewGRFScan
and GenerateWorld, and just runs the code in the game-thread.
On regular intervals it allows the draw-thread to do a tick,
which gives a much smoother look and feel.

It does slow down NewGRFScan and GenerateWorld ever so slightly
as it spends more time on drawing. But the slowdown is not
measureable on my machines (with 700+ NewGRFs / 4kx4k map and
a Debug build).

Running without a game-thread means NewGRFScan and GenerateWorld
are now blocking.
 2021-03-10 13:41:18 +01:00
Jonathan G Rennison
9bf6d1407f Add screenshot type: whole map at current zoom level 2021-03-06 02:33:02 +00:00
Jonathan G Rennison
d6e2b32132 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/screenshot.h
 2021-03-06 01:36:41 +00:00
Patric Stout
06a3c0cb26 Fix dddf885f: use IConsoleError to produce console errors 2021-03-04 22:23:05 +01:00
Patric Stout
8c6b5e52fd Add: allow making heightmap screenshot via console 2021-03-04 22:23:05 +01:00
Patric Stout
ac5e77ea3b Feature: allow custom width/height of screenshot via console 
Reworked how the screenshot command works while keeping it backwards
compatible. It can now more freely understand arguments, and has
the ability to make SC_DEFAULTZOOM screenshots.
 2021-03-04 22:23:05 +01:00
Jonathan G Rennison
b931df9934 Add debug console command to delete a vehicle ID 2021-02-27 20:36:47 +00:00
Jonathan G Rennison
0df3e785cb Debug: Add console command to dump tile info 2021-02-21 20:59:25 +00:00
Jonathan G Rennison
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
 2021-02-19 15:38:34 +00:00
Jonathan G Rennison
667ca4d0a7 Add help info for gfx_debug and viewport_debug console commands 2021-02-16 11:24:58 +00:00
SamuXarick
a4035af337 Codechange: Apply coding style (#8640) 
* Fix: Missing or needed spaces

* Codechange: Remove space

* Codechange: Remove space

* Codechange: More missing spaces

* Codechange: Missing spaces

* Codechange: Remove space

* Codechange: Remove space
 2021-02-05 11:00:36 +01:00
Jonathan G Rennison
650d5e014e Merge branch 'master' into jgrpp 
# Conflicts:
#	src/ai/ai_gui.cpp
#	src/company_cmd.cpp
#	src/lang/estonian.txt
#	src/lang/german.txt
#	src/lang/hungarian.txt
#	src/lang/korean.txt
#	src/lang/slovak.txt
#	src/main_gui.cpp
#	src/video/sdl2_v.cpp
 2021-02-01 19:34:30 +00:00
Jonathan G Rennison
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
 2021-02-01 18:58:36 +00: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
Jonathan G Rennison
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
 2021-01-31 01:08:35 +00:00
Jonathan G Rennison
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
 2021-01-30 18:27:35 +00:00
Jonathan G Rennison
ed0ffb6220 Add feature: realistic train braking 
Add setting to select train braking model.
 2021-01-28 19:03:18 +00:00
glx22
6b8ad5a9b1 Change: Apply some consistency to singleplayer related comments 2021-01-22 22:19:55 +01:00
glx22
07385c3662 Fix: Use the same safety checks as 'stop_ai' for 'reload_ai' 2021-01-22 22:19:55 +01:00
Jonathan G Rennison
1411f878ab Add: Console command to dump debugging information (#8548) 2021-01-13 21:16:47 +01:00
Patric Stout
760b0cdc11 Change: change console command "restart" and add "reload" 
The current "restart" command is now called "reload", as that is
what it does.
The old "restart" command is now called "restart", as that is what
it did.

As this has not been in any official release yet, this shouldn't
harm any kitten.
 2021-01-11 20:11:08 +01:00
Jonathan G Rennison
d0d2591900 Console: Use flag letters for dumped cargo classes 2021-01-09 19:56:34 +00:00
Jonathan G Rennison
4273ee4cec Console: Add flag summaries to dump road, tram, rail, bridge types 2021-01-09 19:30:16 +00:00
Charles Pigott
9b800a96ed Codechange: Remove min/max functions in favour of STL variants (#8502) 2021-01-08 11:16:18 +01:00
Charles Pigott
860c270c73 Codechange: Replace assert_compile macro with static_assert 2020-12-27 10:55:42 +00:00
Jonathan G Rennison
ad5a97b7a1 Add console command to dump cargo types 2020-12-27 00:44:55 +00:00
Jonathan G Rennison
3f3d5c106f Console: Add commands for conditional execution from game date 2020-12-26 12:06:31 +00:00
Jonathan G Rennison
5fe5884613 Debug: Add experimental command to switch baseset 2020-12-26 10:54:01 +00:00
Patric Stout
4319d31036 Fix #6468: don't store version of AIs-started-via-console in name 
You can do: "startai myai.3", which starts version 3 of "myai".
This is very useful for testing save/load code between different
versions of your AI.

However, when using this syntax, the AI got saved as "myai.3" as
name of the AI, instead of "myai". This caused several problems,
like indicating to the user the AI could not be found, but still
load the AI. But in all cases, the AI never got the chance to
load the saved data, making the whole reason this exists pointless.

By splitting the name and version already in the console command,
the code becomes simpler and AIs started this way now follow the
normal flow after initialization.
 2020-12-25 17:03:44 +01:00
Jonathan G Rennison
4da3cfcf56 Merge branch 'master' into jgrpp 
# Conflicts:
#	CMakeLists.txt
#	src/bootstrap_gui.cpp
 2020-12-07 17:56:44 +00:00
Patric Stout
dddf885fb4 Remove: console command "content select all" (#8363) 
The intention of this function was that you could download
everything after a filter was applied; but this never really
took off. Instead, a select few people used this functionality
to download every available package on BaNaNaS. This is not in
the spirit of this service. Additionally, these few people were
good for 70% of the consumed bandwidth of BaNaNaS.
 2020-12-07 14:48:13 +01:00
Jonathan G Rennison
a20112e48f Add console command to dump desync message log 2020-11-22 11:49:18 +00:00
Jonathan G Rennison
f5499852b6 Add debug console command to change rail type map colour 2020-11-21 16:48:20 +00:00
Jonathan G Rennison
b86f19c121 Add console command to dump bridge types 2020-11-01 19:40:15 +00:00
Jonathan G Rennison
39ace3bbe4 Add console command to dump road types 2020-11-01 00:34:30 +00:00
Jonathan G Rennison
d5cad68292 Add GRF details to dump road types console command 2020-11-01 00:34:20 +00:00