Jonathan G Rennison
|
86a6f63e2f
|
Merge branch 'master' into jgrpp
# Conflicts:
# .github/workflows/ci-build.yml
# .github/workflows/codeql.yml
# .github/workflows/commit-checker.yml
# .github/workflows/release-linux-legacy.yml
# .github/workflows/release-linux.yml
# .github/workflows/release-macos.yml
# .github/workflows/release-windows-store.yml
# .github/workflows/release-windows.yml
# .github/workflows/upload-cdn.yml
# .github/workflows/upload-gog.yml
# .github/workflows/upload-steam.yml
# src/console_cmds.cpp
# src/core/math_func.hpp
# src/fios.cpp
# src/fios.h
# src/intro_gui.cpp
# src/network/network_server.cpp
# src/openttd.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/settings_table.cpp
# src/settings_type.h
# src/table/settings.h.preamble
# src/table/settings/company_settings.ini
# src/table/settings/currency_settings.ini
# src/table/settings/difficulty_settings.ini
# src/table/settings/economy_settings.ini
# src/table/settings/game_settings.ini
# src/table/settings/gui_settings.ini
# src/table/settings/linkgraph_settings.ini
# src/table/settings/locale_settings.ini
# src/table/settings/misc_settings.ini
# src/table/settings/multimedia_settings.ini
# src/table/settings/network_private_settings.ini
# src/table/settings/network_settings.ini
# src/table/settings/news_display_settings.ini
# src/table/settings/old_gameopt_settings.ini
# src/table/settings/pathfinding_settings.ini
# src/table/settings/script_settings.ini
# src/table/settings/win32_settings.ini
# src/table/settings/window_settings.ini
# src/table/settings/world_settings.ini
# src/viewport.cpp
# src/viewport_func.h
# src/window.cpp
|
3 months ago |
Patric Stout
|
a1487ce620
|
Add: list_[scenario|heightmap] and load_[scenario|height] console commands (#11867)
|
4 months ago |
|
Patric Stout
|
090616b4c9
|
Add: allow loading heightmaps from command-line (#11870)
If you want to load a file from tar, you have to give the file
inside the tar in order for it to work:
<tar-file>/<dir-in-tar>/<file>.png
|
4 months ago |
|
Jonathan G Rennison
|
97e6f3062e
|
Adding of _t to (u)int types, and WChar to char32_t
See: eaae0bb5e
|
4 months ago |
|
Jonathan G Rennison
|
5a28405ced
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/company_gui.cpp
# src/group_gui.cpp
# src/newgrf.cpp
# src/newgrf_debug_gui.cpp
# src/saveload/saveload.cpp
|
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
|
10 months ago |
|
Jonathan G Rennison
|
c6c69fa3da
|
Add setting for long-term autosaves
A second set of autosaves for whenever the main set wraps around to 0
|
11 months ago |
|
Jonathan G Rennison
|
d75c489466
|
Add various missing includes
|
11 months ago |
|
Jonathan G Rennison
|
0bf41dc1ff
|
Change gamelog to use std::vector
Move LoadCheckData to its own header
|
11 months ago |
|
Jonathan G Rennison
|
d09b504bc5
|
Merge branch 'master' into jgrpp
# Conflicts:
# .github/workflows/ci-build.yml
# .github/workflows/release-linux.yml
# .github/workflows/release-macos.yml
# .github/workflows/release-source.yml
# .github/workflows/release.yml
# CMakeLists.txt
# COMPILING.md
# src/ai/ai_core.cpp
# src/ai/ai_gui.cpp
# src/bridge_gui.cpp
# src/company_gui.cpp
# src/console_cmds.cpp
# src/core/CMakeLists.txt
# src/core/smallmap_type.hpp
# src/disaster_vehicle.h
# src/effectvehicle_base.h
# src/fontcache.cpp
# src/game/game_core.cpp
# src/game/game_gui.cpp
# src/gamelog.cpp
# src/gamelog_internal.h
# src/group_gui.cpp
# src/linkgraph/linkgraph.h
# src/misc.cpp
# src/network/core/config.h
# src/network/core/udp.cpp
# src/network/network_chat_gui.cpp
# src/network/network_content_gui.cpp
# src/network/network_gui.cpp
# src/newgrf.cpp
# src/newgrf_gui.cpp
# src/newgrf_profiling.cpp
# src/newgrf_profiling.h
# src/object_gui.cpp
# src/openttd.cpp
# src/openttd.h
# src/order_gui.cpp
# src/os/windows/font_win32.cpp
# src/rail_gui.cpp
# src/road.cpp
# src/road_gui.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.h
# src/script/api/script_controller.cpp
# src/script/api/script_roadtypelist.cpp
# src/script/script_config.cpp
# src/script/script_config.hpp
# src/script/script_instance.cpp
# src/script/script_scanner.cpp
# src/script/squirrel.cpp
# src/script/squirrel_helper.hpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/settings_type.h
# src/table/settings/network_private_settings.ini
# src/timetable_gui.cpp
# src/vehicle.cpp
# src/vehicle_base.h
# src/window_gui.h
|
11 months ago |
|
Rubidium
|
fbd71a9d72
|
Codechange: replace C-style string processing with C++-style for the listing callbacks
|
12 months ago |
|
Rubidium
|
324c43eeb2
|
Codechange: let FiosGetDiskFreeSpace only return disk space and split FiosGetCurrentPath off
|
12 months ago |
|
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
|
12 months ago |
Peter Nelson
|
91e140c722
|
Codechange: Use unique_ptr for fios company properties.
This is the data used to show company names in the saveload window.
|
1 year ago |
|
Peter Nelson
|
c38df2d589
|
Codechange: Use std::map instead of custom SmallMap.
|
1 year ago |
|
Jonathan G Rennison
|
4ed0c23644
|
Add text to warning dialog when overwriting a non-extended version save
|
1 year ago |
|
Peter Nelson
|
00bf42353a
|
Codechange: Place gamelog into its own class, along with internal data.
Data is now stored in vectors to avoid manual memory management and
passing lengths around.
|
1 year ago |
|
Rubidium
|
1f3b7e2efd
|
Codechange: use std::string instead of stredup for saveload error messages
|
1 year ago |
|
Rubidium
|
3a822fcd01
|
Codechange: Make FiosItem's name and title std::string
|
1 year ago |
|
Rubidium
|
f0a1ddd81c
|
Codechange: let FiosBrowseTo return a bool
|
1 year ago |
Tyler Trahan
|
930f0a16d8
|
Codechange: Define Date/Year/Month/Day within TimerGameCalendar class
|
1 year ago |
|
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
|
1 year ago |
|
Rubidium
|
4e65ec1dc4
|
Codechange: do not declare functions in blocks
|
1 year ago |
|
Jonathan G Rennison
|
69b6b388d6
|
On dedicated servers, save copy of last autosave on crash
This is to avoid all autosaves being overwritten when the server
is auto-restarted with a new map
|
2 years ago |
|
Jonathan G Rennison
|
faf32200cf
|
Merge tag '12.0-beta1' into jgrpp-beta
# Conflicts:
# CMakeLists.txt
# bin/ai/CMakeLists.txt
# bin/game/CMakeLists.txt
# src/build_vehicle_gui.cpp
# src/console_cmds.cpp
# src/core/overflowsafe_type.hpp
# src/fios.cpp
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/lang/polish.txt
# src/network/core/game_info.cpp
# src/network/core/game_info.h
# src/network/core/tcp_game.cpp
# src/network/core/tcp_game.h
# src/network/network.cpp
# src/network/network_client.cpp
# src/network/network_client.h
# src/network/network_coordinator.cpp
# src/network/network_gui.cpp
# src/network/network_server.cpp
# src/network/network_server.h
# src/newgrf_engine.cpp
# src/openttd.cpp
# src/rev.cpp.in
# src/settings_type.h
# src/train.h
# src/train_cmd.cpp
|
3 years ago |
Loïc Guilloux
|
460991ecf4
|
Feature: Persistant rotation of numbered auto/netsave after restart (#9397)
It was always starting from 0 on openttd restart.
Now the most recent auto/netsave number will be used as a base to generate the next filename.
|
3 years ago |
|
Rubidium
|
e227bbaff0
|
Cleanup: remove the old FIO slot functions
(cherry picked from commit fa6abe1646)
|
3 years ago |
|
Rubidium
|
525f6adcd0
|
Codechange: let NewGRF sounds make use of RandomAccessFile instead of the FIO slot functions
(cherry picked from commit c097bc9d7d)
|
3 years ago |
|
Rubidium
|
fa6abe1646
|
Cleanup: remove the old FIO slot functions
|
3 years ago |
|
Rubidium
|
c097bc9d7d
|
Codechange: let NewGRF sounds make use of RandomAccessFile instead of the FIO slot functions
|
3 years ago |
|
PeterN
|
9d72eb02f5
|
Cleanup: Remove old FiosList helper methods. (#9139)
(cherry-picked from commit f018471b36)
|
3 years ago |
|
Jonathan G Rennison
|
a9515456cb
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/network/core/os_abstraction.h
# src/network/core/tcp_content.h
# src/network/core/udp.cpp
# src/table/currency_settings.ini
# src/table/settings.h.preamble
|
3 years ago |
|
PeterN
|
f018471b36
|
Cleanup: Remove old FiosList helper methods. (#9139)
|
3 years ago |
|
rubidium42
|
84985c1223
|
Codechange: [Network] Do not leak os_abstraction.h via fios.h
|
3 years ago |
|
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
|
3 years ago |
|
Jonathan G Rennison
|
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
|
3 years ago |
Michael Lutz
|
b408fe77f7
|
Codechange: Use std::string in file scanners.
|
3 years ago |
|
Michael Lutz
|
65f65ad2ad
|
Codechange: Convert some more FIO functions to take std::string.
|
3 years ago |
|
Michael Lutz
|
79240eab1e
|
Codechange: Make use of the improved C++17 emplace_back function.
|
3 years ago |
|
Jonathan G Rennison
|
e2de103d82
|
Skip GRF compatibility check when using -K/-q switches
|
4 years ago |
|
Jonathan G Rennison
|
eef6ad7b2a
|
Crash log: Save config file in new crash save chunk
|
4 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
|
6792495705
|
Add -K switch to write savegame debug data and exit
|
5 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
|
5 years ago |
glx
|
5b77102b63
|
Codechange: use std::sort() to sort file lists
|
5 years ago |
|
Jonathan G Rennison
|
674732cd68
|
Merge: Codechange: Use null pointer literal instead of the NULL macro
|
5 years ago |
Henry Wilson
|
7c8e7c6b6e
|
Codechange: Use null pointer literal instead of the NULL macro
|
5 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
|
5 years ago |
|
glx22
|
66dd7c3879
|
Fix: MSVC warnings (#7423)
|
5 years ago |