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
ab3a373c73
Merge branch 'master' into jgrpp
5 years ago
ddffe32f15
Fix #7646 : Incomplete cleanup for non-threaded world generation failure ( #7805 )
5 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
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
9519c5c1fb
Ensure town cargo bitmap correctly set after town creation
5 years ago
5b34c8019f
Codechange: Remove Company/OwnerByte types
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
361758b516
Merge branches 'crashlog_improvements', 'save_ext' into jgrpp
...
# Conflicts:
# Makefile.src.in
# 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/core/smallstack_type.hpp
# src/linkgraph/linkgraphjob.cpp
# src/linkgraph/linkgraphjob.h
# src/misc.cpp
# src/network/network_udp.cpp
# src/openttd.cpp
# src/saveload/saveload.cpp
5 years ago
05bc2ed7cb
Codechange: Replace custom thread code with C++11 thread objects.
...
We assume a conforming C++11 compiler environment that has a valid <thread>-header.
Failure to run a real thread is handled gracefully.
5 years ago
05f4e73608
Codechange: Replace custom mutex code with C++11 mutex'es.
...
A conforming compiler with a valid <mutex>-header is expected.
Most parts of the code assume that locking a mutex will never fail unexpectedly,
which is generally true on all common platforms that don't just pretend to
be C++11. The use of condition variables in driver code is checked.
5 years ago
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
5 years ago
37bb2c9308
Codechange: Make the style of MakeVoid calls uniform ( #7192 )
5 years ago
5f6858c379
Add: Setting to save a unique id for each savegame
6 years ago
31f046bd9b
(svn r27670) -Add: [FS#6471] Assign descriptive names to (GNU pthread) threads. (JGR)
8 years ago
0adfb1ac6f
(svn r27653) -Fix(r27647): Rename FileOperation enum and values to SaveLoadOperation to avoid nameclash with windows compiler toolkit.
8 years ago
597380e099
(svn r27650) -Codechange: Replace SaveOrLoadMode by FileOperation and DetailedFileType.
8 years ago
4d1843a95e
(svn r27627) -Codechange: Deduplicate some cursor magic into SetMouseCursorBusy.
8 years ago
b476086c39
(svn r26538) -Codechange: remove double accounting of the drivers
10 years ago
aa5a570b0d
(svn r26518) -Change: make genworld messages on the dedicated server disable-able by using -dnet=0
10 years ago
5b82822c12
(svn r26486) -Codechange: replace a number of snprintfs with seprintf
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
a32d18cbb9
(svn r26371) -Fix [FS#5831]: Calling DoCommandP during the gameloop cleared pending persistent storage changes.
10 years ago
eca86d1baf
(svn r26174) -Codechange: Rename BaseStorageArray to BasePersistentStorageArray
11 years ago
6f9668330e
(svn r24132) -Change [FS#4713]: Improve randomness of tile order in the tile loop. (monoid)
12 years ago
6d6be50ae0
(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files
13 years ago
83f2785f54
(svn r23611) -Add: run the begin of the script already while generating, and don't sleep on DoCommand while doing so
13 years ago
f239a61406
(svn r23609) -Add: save/load all GameScript related material
13 years ago
561b25d031
(svn r23601) -Fix: fix the conflict in window number
13 years ago
0ca25fb3af
(svn r23480) -Fix [FS#4594]: replace OS error messages with internal error messages when that's possible
13 years ago
b231e80125
(svn r23470) -Codechange: move declaration of SwitchToMode to a header instead of declaring it in 6 other files
13 years ago
160bfd8851
(svn r23376) -Remove: on popular demand, remove my (revoked) name from comments in the code. It was silly to name me like that to begin with ;) (based on patch by HackaLittleBit)
13 years ago
38ad276acc
(svn r22819) -Fix: include the header where it should be included
13 years ago
9fe4b959ac
(svn r22818) -Fix [FS#4742] (r22796, rlongago): don't spawn threads for world generation and NewGRF scanning when using the dedicated or null video driver regardless of the used blitter
13 years ago
e99aec39ef
(svn r22789) -Codechange: rename generation window class to modal progress
13 years ago
421053a694
(svn r22788) -Codechange: move modal progress related functions and variables to progress.cpp/h
13 years ago
7b7869fba7
(svn r22786) -Codechange: rename genworld mutices to model_progress mutices
13 years ago
7eba2bf4d3
(svn r21890) -Cleanup: remove some unneeded includes
14 years ago
6a17bf91e3
(svn r21833) -Fix [FS#4427]: desync debug savegames might not be actually saved in case threading is enabled, which is enabled by default
14 years ago
410d48cbb8
(svn r20822) -Fix [FS#3707]: deadlock when aborting map generation on windows
14 years ago
30f2afac9b
(svn r20632) -Cleanup: remove "a few" unneeded includes, and add them to some headers
14 years ago
56a263070f
(svn r20591) -Codechange: make sure _date_fract is set when SetDate is called. Some places wouldn't reset _date_fract correctly at all
14 years ago
3da3d131c6
(svn r20411) -Codechange: rename unmovables as quite a lot of them are actually movable; e.g. HQ and owned land are pretty movable.
14 years ago
0e900039f3
(svn r20320) -Doc: Small Doxygen and normal comment fixes, and an missed addition.
14 years ago
b8487afe54
(svn r20192) -Cleanup: bye bye variables.h, bye bye VARDEF... you won't be missed :)
14 years ago
73527b7b45
(svn r20190) -Codechange: unVARDEF _generate_world and move it to genworld
14 years ago
c5921a91ea
(svn r19934) -Fix [FS#3857]: When 'pause on new game' is set, pause the game before CleanupGeneration() to avoid conflicts with concurrent GUI code.
14 years ago
9e53f1e004
(svn r19933) -Fix [FS#3804]: Keep _current_company and _local_company in sync during GUI operation.
14 years ago
Jonathan G Rennison
glx22
S. D. Cloudt
Charles Pigott
Henry Wilson
Michael Lutz
Gabda
damfr
frosch
alberth
rubidium
michi_cc
truebrain
yexo