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
|
3 years ago |
Milek7
|
da55286c2c
|
Fix: Corrupted savegame could crash the game by providing invalid gamelog enums. (#9045)
|
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 |
Charles Pigott
|
860c270c73
|
Codechange: Replace assert_compile macro with static_assert
|
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
|
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
|
e6b788591d
|
Fix 1 byte buffer over-read in old gamelog loader
|
5 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
|
5 years ago |
Niels Martin Hansen
|
faee0737e0
|
Codechange: Separate gamelog revision length from network revision length
|
5 years ago |
Jonathan G Rennison
|
db026ec8b0
|
No longer truncate savegame version in gamelog.
Add an extended feature for changed savegame format.
|
8 years ago |
rubidium
|
2be4215f43
|
(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values
|
10 years ago |
rubidium
|
0463dbdc9e
|
(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values
|
10 years ago |
yexo
|
047957487a
|
(svn r23065) -Add: -q option to read a savegame, write some general info and exit
|
13 years ago |
yexo
|
433f74edd9
|
(svn r23065) -Add: -q option to read a savegame, write some general info and exit
|
13 years ago |
rubidium
|
360d6daf34
|
(svn r20632) -Cleanup: remove "a few" unneeded includes, and add them to some headers
|
14 years ago |
rubidium
|
30f2afac9b
|
(svn r20632) -Cleanup: remove "a few" unneeded includes, and add them to some headers
|
14 years ago |
frosch
|
fe063af382
|
(svn r19973) -Codechange: Add another procedure to chunk handlers for checking savegames (empty for now).
|
14 years ago |
frosch
|
62ac138154
|
(svn r19973) -Codechange: Add another procedure to chunk handlers for checking savegames (empty for now).
|
14 years ago |
rubidium
|
9467b7c6d6
|
(svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header
|
15 years ago |
rubidium
|
82fc28f77f
|
(svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header
|
15 years ago |
smatz
|
f85b8c4e09
|
(svn r17596) -Codechange: constify some tables
|
15 years ago |
smatz
|
114d48e492
|
(svn r17596) -Codechange: constify some tables
|
15 years ago |
rubidium
|
99d46e0ad7
|
(svn r17248) -Fix: add GPL license notice where appropriate
|
15 years ago |
rubidium
|
7fbc33dae1
|
(svn r17248) -Fix: add GPL license notice where appropriate
|
15 years ago |
smatz
|
769de62daf
|
(svn r16338) -Codechange: split loading of references to two phases
In the first phase, indexes are stored. In the second phase, indexes are checked for validity and converted to pointers
|
15 years ago |
smatz
|
570af0ce44
|
(svn r16338) -Codechange: split loading of references to two phases
In the first phase, indexes are stored. In the second phase, indexes are checked for validity and converted to pointers
|
15 years ago |
glx
|
ec704b21ca
|
(svn r15893) -Add: watermark crash.sav and don't generate crash information if a loaded crash.sav causes a crash
|
15 years ago |
glx
|
75c99d8b9b
|
(svn r15893) -Add: watermark crash.sav and don't generate crash information if a loaded crash.sav causes a crash
|
15 years ago |
rubidium
|
283b3d16ab
|
(svn r15410) -Cleanup: get rid of most of the references to the 'patches' except where it's used for backward compatability.
|
16 years ago |
rubidium
|
377ce6c5bf
|
(svn r15410) -Cleanup: get rid of most of the references to the 'patches' except where it's used for backward compatability.
|
16 years ago |
smatz
|
91233ea596
|
(svn r14828) -Codechange: move most of save/load-specific code to separate files
|
16 years ago |
smatz
|
7368c740a6
|
(svn r14828) -Codechange: move most of save/load-specific code to separate files
|
16 years ago |