S. D. Cloudt
13cc8a0cee
Cleanup: Removed SVN headers
5 years ago
Jonathan G Rennison
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
Jonathan G Rennison
9519c5c1fb
Ensure town cargo bitmap correctly set after town creation
5 years ago
Charles Pigott
5b34c8019f
Codechange: Remove Company/OwnerByte types
6 years ago
Jonathan G Rennison
674732cd68
Merge: Codechange: Use null pointer literal instead of the NULL macro
6 years ago
Henry Wilson
7c8e7c6b6e
Codechange: Use null pointer literal instead of the NULL macro
6 years ago
Jonathan G Rennison
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
6 years ago
Michael Lutz
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.
6 years ago
Michael Lutz
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.
6 years ago
Jonathan G Rennison
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
6 years ago
Gabda
37bb2c9308
Codechange: Make the style of MakeVoid calls uniform ( #7192 )
6 years ago
damfr
5f6858c379
Add: Setting to save a unique id for each savegame
6 years ago
frosch
31f046bd9b
(svn r27670) -Add: [FS#6471] Assign descriptive names to (GNU pthread) threads. (JGR)
8 years ago
alberth
0adfb1ac6f
(svn r27653) -Fix(r27647): Rename FileOperation enum and values to SaveLoadOperation to avoid nameclash with windows compiler toolkit.
8 years ago
alberth
597380e099
(svn r27650) -Codechange: Replace SaveOrLoadMode by FileOperation and DetailedFileType.
8 years ago
frosch
4d1843a95e
(svn r27627) -Codechange: Deduplicate some cursor magic into SetMouseCursorBusy.
8 years ago
rubidium
b476086c39
(svn r26538) -Codechange: remove double accounting of the drivers
11 years ago
rubidium
aa5a570b0d
(svn r26518) -Change: make genworld messages on the dedicated server disable-able by using -dnet=0
11 years ago
rubidium
5b82822c12
(svn r26486) -Codechange: replace a number of snprintfs with seprintf
11 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
11 years ago
frosch
a32d18cbb9
(svn r26371) -Fix [FS#5831]: Calling DoCommandP during the gameloop cleared pending persistent storage changes.
11 years ago
frosch
eca86d1baf
(svn r26174) -Codechange: Rename BaseStorageArray to BasePersistentStorageArray
11 years ago
michi_cc
6f9668330e
(svn r24132) -Change [FS#4713]: Improve randomness of tile order in the tile loop. (monoid)
13 years ago
rubidium
6d6be50ae0
(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files
13 years ago
truebrain
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
truebrain
f239a61406
(svn r23609) -Add: save/load all GameScript related material
13 years ago
truebrain
561b25d031
(svn r23601) -Fix: fix the conflict in window number
13 years ago
rubidium
0ca25fb3af
(svn r23480) -Fix [FS#4594]: replace OS error messages with internal error messages when that's possible
13 years ago
rubidium
b231e80125
(svn r23470) -Codechange: move declaration of SwitchToMode to a header instead of declaring it in 6 other files
13 years ago
truebrain
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
rubidium
38ad276acc
(svn r22819) -Fix: include the header where it should be included
13 years ago
rubidium
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
rubidium
e99aec39ef
(svn r22789) -Codechange: rename generation window class to modal progress
13 years ago
rubidium
421053a694
(svn r22788) -Codechange: move modal progress related functions and variables to progress.cpp/h
13 years ago
rubidium
7b7869fba7
(svn r22786) -Codechange: rename genworld mutices to model_progress mutices
13 years ago
rubidium
7eba2bf4d3
(svn r21890) -Cleanup: remove some unneeded includes
14 years ago
rubidium
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
yexo
410d48cbb8
(svn r20822) -Fix [FS#3707]: deadlock when aborting map generation on windows
14 years ago
rubidium
30f2afac9b
(svn r20632) -Cleanup: remove "a few" unneeded includes, and add them to some headers
14 years ago
rubidium
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
rubidium
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
alberth
0e900039f3
(svn r20320) -Doc: Small Doxygen and normal comment fixes, and an missed addition.
14 years ago
rubidium
b8487afe54
(svn r20192) -Cleanup: bye bye variables.h, bye bye VARDEF... you won't be missed :)
14 years ago
rubidium
73527b7b45
(svn r20190) -Codechange: unVARDEF _generate_world and move it to genworld
14 years ago
frosch
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.
15 years ago
frosch
9e53f1e004
(svn r19933) -Fix [FS#3804]: Keep _current_company and _local_company in sync during GUI operation.
15 years ago
rubidium
d8baa1342c
(svn r19589) -Change: add some more useful information to the desync log and unify the formatting
15 years ago
smatz
a39a446e8f
(svn r18861) -Doc: more doxygen documentation in genworld files
15 years ago
smatz
11e3a00a23
(svn r18853) -Codechange: apply coding style to GenWorld's enums, structs and typedefs
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
rubidium
3e6c530e1e
(svn r18506) -Fix [FS#3368]: no error message was created for the first fatal NewGRF error.
15 years ago
rubidium
a274cc6a60
(svn r18207) -Fix [FS#3324] (r11961): [NewGRF] When starting a new game the values of action D variable 13 were incorrect
15 years ago
rubidium
d6cded5380
(svn r17693) -Cleanup: remove some unneeded includes
15 years ago
rubidium
e8ddf001c8
(svn r17570) -Fix: a number of Doxygen warnings about missing parameters, which were sometimes missing and sometimes just typos
15 years ago
rubidium
07d2af338e
(svn r17339) -Codechange: move thread related files to their own directory (like done for video, music, sound, etc)
15 years ago
rubidium
7fbc33dae1
(svn r17248) -Fix: add GPL license notice where appropriate
15 years ago
rubidium
ba4fd897b8
(svn r17097) -Fix [FS#3092] (r13256): make restart command work again and make the help show how it works and how it doesn't work
15 years ago
rubidium
2664f2a2d9
(svn r16242) -Codechange: rework pausing
...
-Fix [FS#2864]: autopause and manual pausing conflict with eachother
-Fix: new game + pause on new game + autopause make the game not unpause on the first join
16 years ago
rubidium
d685ca0619
(svn r16220) -Fix [FS#2862]: possible crashes when quiting OpenTTD or forcing resizes/redraws of the screen during map generation
16 years ago
rubidium
329cabab4f
(svn r16088) -Codechange: merge HighLightStyle and ViewportHighlightMode as they are basically the same thing
16 years ago
rubidium
d5a2dc1d0b
(svn r15689) -Fix [FS#2720]: do not crash when the generate map doesn't contain a suitable location for a town.
16 years ago
rubidium
9dbf8a163f
(svn r15688) -Codechange: unifiy cleaning up the map generation (normal and abort)
16 years ago
yexo
1f9ec758aa
(svn r15495) -Revert (r15383,r15422): Loading NewGRFs depends on correct settings, but the economy can only be started after loading NewGRFs. In short: r15383 causes more problems then it's worth.
16 years ago
rubidium
c0a8d09ca7
(svn r15428) -Codechange: consistently use colour instead of having both color and colour.
16 years ago
rubidium
7b8c13fa5c
(svn r15422) -Fix [FS#2623] (r15383): loading NewGRFs before copying the settings.
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
df2a387fc3
(svn r15342) -Feature: allow changing town layout in the 'Found new town' window
16 years ago
smatz
0d3f5e6e74
(svn r15299) -Cleanup: remove many redundant includes
16 years ago
Yexo
db3ee34b44
(svn r15190) -Feature: Allow terraforming of the tiles at the edges of the map.
16 years ago
rubidium
bb77071749
(svn r15158) -Cleanup: remove some unused/unneeded cruft from the thread generalisation.
16 years ago
truebrain
a3dd7506d3
(svn r15027) -Merge: tomatos and bananas left to be, here is NoAI for all to see.
...
NoAI is an API (a framework) to build your own AIs in. See:
http://wiki.openttd.org/wiki/index.php/AI:Main_Page
With many thanks to:
- glx and Rubidium for their syncing, feedback and hard work
- Yexo for his feedback, patches, and AIs which tested the system very deep
- Morloth for his feedback and patches
- TJIP for hosting a challenge which kept NoAI on track
- All AI authors for testing our AI API, and all other people who helped in one way or another
-Remove: all old AIs and their cheats/hacks
16 years ago
smatz
7368c740a6
(svn r14828) -Codechange: move most of save/load-specific code to separate files
16 years ago
rubidium
3c6add5293
(svn r14772) -Codechange: make the "dump log of game to reproduce" desync debug stuff a runtime configurable debug option instead of a compile time option.
16 years ago
rubidium
87e5a8b52b
(svn r14754) -Codechange: get rid of _cmd_text and just pass it as (optional) parameter.
16 years ago
rubidium
b650a86e58
(svn r14422) -Codechange: also reflect the changes of r14421 in the filenames.
16 years ago
rubidium
3b798599b6
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
16 years ago
rubidium
3a799389eb
(svn r13731) -Codechange: make a pool of the array of players.
16 years ago
rubidium
e43d050730
(svn r13417) -Fix (r12945, r13413): freeing the ThreadObjects in a manner that hopefully doesn't cause crashes.
17 years ago
truebrain
b95042b05c
(svn r13412) -Add: OTTDThreadTerminateFunc, for all thread systems, which is called when a thread is terminated. Now GenWorld- and SaveLoad-thread cleanup theirselves correctly, while Fibers don't (as that causes access-violations)
17 years ago
rubidium
96d7f87cc9
(svn r13411) -Codechange: remove the return value from the thread procs because it is never used.
17 years ago
rubidium
923e21129c
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
17 years ago
rubidium
34e2d8f1e1
(svn r13320) -Codechange: move some enums from openttd.h to more logical locations.
17 years ago
rubidium
4625695653
(svn r13251) -Codechange: rename _patches to _settings as that is more logic.
...
-Codechange: move all Settings into substructs of _settings in a way that they are logically grouped.
17 years ago
rubidium
3d5567ccf7
(svn r12987) -Codechange: split viewport and tile selection.
17 years ago
rubidium
d03994098b
(svn r12971) -Documentation: add @file in files that missed them and add something more than whitespace as description of files that don't have a description.
17 years ago
glx
a2884f0a3c
(svn r12755) -Fix (r12706): aborting map generation was not properly handled
17 years ago
rubidium
12188e7a5d
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
17 years ago
rubidium
ef2be7d0fc
(svn r12490) -Codechange: rename engine.h to engine_func.h and remove unneeded inclusions of engine.h and/or replace them with engine_type.h.
17 years ago
rubidium
3b2145aafe
(svn r12004) -Codechange: refactor the random functions to reduce code duplication.
17 years ago
frosch
49d2087d7f
(svn r11947) -Feature: Make use of new sprites added by Action5 type 0D.
...
Tiles which only consist of shore do not flood anymore, instead they get removed if they are no longer connected to flooding water.
17 years ago
rubidium
6891bc2011
(svn r11867) -Fix: do not reset changes to persistent storages during world generation.
...
-Fix: store changes to persistent storages after performing all the game logic instead of resetting them.
17 years ago
rubidium
dc87b05e8c
(svn r11834) -Codechange: only include settings_type.h if needed.
17 years ago
rubidium
d4e6a6bf57
(svn r11828) -Codechange: include table/* as the last includes and remove an unneeded include from openttd.h.
17 years ago
rubidium
ac528411df
(svn r11818) -Codechange: split player.h into smaller pieces.
17 years ago
rubidium
b4b3190b62
(svn r11788) -Fix (11787): makedepend doesn't mark delete files as changed...
17 years ago
rubidium
acc7c9eb01
(svn r11771) -Codechange: split settings.h into better separated headers.
17 years ago
rubidium
0b1d3e43e5
(svn r11704) -Codechange: remove another bunch of useless includes.
17 years ago
rubidium
b9046c97fb
(svn r11702) -Codechange: move all date related stuff to date*.
17 years ago
rubidium
2786d789a1
(svn r11701) -Codechange: removal unnecessary inclusions of map.h (and split map.h).
17 years ago
rubidium
aac835171e
(svn r11700) -Codechange: reduce the amount of unnecessary includes.
17 years ago