763a2826b6
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/gamelog.cpp
4 years ago
0ed00ae111
Fix: Stop any gamelog action when recovering from SlError()
4 years ago
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
13cc8a0cee
Cleanup: Removed SVN headers
5 years ago
0f6c5ee622
Fix saveload exception handling when gamelog action in progress
5 years ago
674732cd68
Merge: Codechange: Use null pointer literal instead of the NULL macro
5 years ago
7c8e7c6b6e
Codechange: Use null pointer literal instead of the NULL macro
5 years ago
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
5 years ago
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.
5 years ago
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
cd757ecbf4
Change: Use git revision hash (with "modified" prefix) for gamelog
5 years ago
0f37a683a2
Codechange: Additional type safety for saveload version variables.
5 years ago
e735c1a51a
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/aircraft_cmd.cpp
# src/autoreplace_cmd.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/yapf/yapf_rail.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/script/api/ai/ai_station.hpp.sq
# src/script/api/game/game_station.hpp.sq
# src/script/api/script_station.hpp
# src/track_func.h
# src/vehicle_base.h
6 years ago
f5b1115039
Doc: Lots and lots of doxymentation fixes
6 years ago
db026ec8b0
No longer truncate savegame version in gamelog.
...
Add an extended feature for changed savegame format.
8 years ago
bbe4ea7f50
Log truncated revision strings at debug level 1 instead of 0.
9 years ago
034735a54c
(svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL)
10 years ago
9ed12b0f07
(svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL)
10 years ago
0b159549d4
(svn r26508) -Codechange: use seprintf instead of a custom vstrcatprintf hybrid
10 years ago
4227f495c5
(svn r26508) -Codechange: use seprintf instead of a custom vstrcatprintf hybrid
10 years ago
6ecc602050
(svn r26486) -Codechange: replace a number of snprintfs with seprintf
10 years ago
5b82822c12
(svn r26486) -Codechange: replace a number of snprintfs with seprintf
10 years ago
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
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
cbf64bbc6c
(svn r23901) -Fix: memory leak everytime one clicked a savegame in the load GUI
13 years ago
eb015cbfb6
(svn r23901) -Fix: memory leak everytime one clicked a savegame in the load GUI
13 years ago
047957487a
(svn r23065) -Add: -q option to read a savegame, write some general info and exit
13 years ago
433f74edd9
(svn r23065) -Add: -q option to read a savegame, write some general info and exit
13 years ago
9fc2798baf
(svn r22411) -Document: another bunch of bits
13 years ago
fb5ecb9499
(svn r22411) -Document: another bunch of bits
13 years ago
05199a641a
(svn r21890) -Cleanup: remove some unneeded includes
14 years ago
7eba2bf4d3
(svn r21890) -Cleanup: remove some unneeded includes
14 years ago
a7e486360d
(svn r20957) -Codechange: Add another parameter to FindGRFConfig() to define search restrictions.
14 years ago
3972c790c2
(svn r20957) -Codechange: Add another parameter to FindGRFConfig() to define search restrictions.
14 years ago
e1ebb3509a
(svn r20955) -Fix (r20952): Suppress bogus inconsistencies for games saved while Grfs were missing.
14 years ago
6063bbf321
(svn r20955) -Fix (r20952): Suppress bogus inconsistencies for games saved while Grfs were missing.
14 years ago
22da4b2a5c
(svn r20954) -Codechange (r20952, r20953): Don't make stuff more complicated than needed.
14 years ago
375be9a073
(svn r20954) -Codechange (r20952, r20953): Don't make stuff more complicated than needed.
14 years ago
7484da1abd
(svn r20953) -Add: Resolve Grf filenames from the gamelog also using the md5sum.
14 years ago
aa688689b1
(svn r20953) -Add: Resolve Grf filenames from the gamelog also using the md5sum.
14 years ago
2140031737
(svn r20952) -Add: When printing the gamelog keep track of added/removed Grfs and check them for consistency.
14 years ago
c64d7346f8
(svn r20952) -Add: When printing the gamelog keep track of added/removed Grfs and check them for consistency.
14 years ago
360d6daf34
(svn r20632) -Cleanup: remove "a few" unneeded includes, and add them to some headers
14 years ago
30f2afac9b
(svn r20632) -Cleanup: remove "a few" unneeded includes, and add them to some headers
14 years ago
5b86c79fce
(svn r20283) -Codechange: Unify start of doygen comments.
14 years ago
ed4f806f1d
(svn r20283) -Codechange: Unify start of doygen comments.
14 years ago
9fd2afb147
(svn r20192) -Cleanup: bye bye variables.h, bye bye VARDEF... you won't be missed :)
14 years ago
b8487afe54
(svn r20192) -Cleanup: bye bye variables.h, bye bye VARDEF... you won't be missed :)
14 years ago
6ef7b78c8b
(svn r20191) -Codechange: unVARDEF _tick_counter and move it to a more logical location
14 years ago
644deff9d2
(svn r20191) -Codechange: unVARDEF _tick_counter and move it to a more logical location
14 years ago
Jonathan G Rennison
glx
S. D. Cloudt
Henry Wilson
Niels Martin Hansen
Peter Nelson
Charles Pigott
rubidium
smatz
yexo
frosch