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
6 years ago
Henry Wilson
7c8e7c6b6e
Codechange: Use null pointer literal instead of the NULL macro
6 years ago
Jonathan G Rennison
f887b12be2
Add 3rd party mingw-std-threads headers to fix MinGW compilation
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
Miguel Horta
e00908f5e9
Fix #6898 : Replace atoi() with strtoul()
...
Normalize type and parsing of generation_seed across all files
Add assert_compile() to ensure correct type
6 years ago
alberth
a91f74dbb3
(svn r27231) -Codechange: Replace magic numbers for the smoothness setting (chillcore)
10 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
rubidium
421053a694
(svn r22788) -Codechange: move modal progress related functions and variables to progress.cpp/h
13 years ago
rubidium
a67cf6bae1
(svn r22787) -Codechange: rename genworld redraw constant
13 years ago
rubidium
7b7869fba7
(svn r22786) -Codechange: rename genworld mutices to model_progress mutices
13 years ago
rubidium
37415b9cf7
(svn r22785) -Codechange: rename IsGeneratingWorld to HasModalProgress
13 years ago
rubidium
11a4e402c6
(svn r22768) -Add: progress bar updates for river building
13 years ago
terkhen
bce6328ed0
(svn r20833) -Fix (r20832): Remove a warning.
14 years ago
terkhen
e90930e572
(svn r20832) -Feature: Allow to select a custom percentage of water in the map generation window (based on patch by CommanderZ).
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
rubidium
73527b7b45
(svn r20190) -Codechange: unVARDEF _generate_world and move it to genworld
14 years ago
yexo
9ed9aa9012
(svn r19871) -Fix [FS#3826]: update the landscape buttons in the main menu / newgame window correctly (planetmaker)
15 years ago
rubidium
398418b8fa
(svn r19812) -Codechange: give some unnamed enums a name or, in case they consisted of unrelated values use static const (u)int
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
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
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
b25a4f8231
(svn r15718) -Cleanup: apply some comment coding style on the rest of the sources too
16 years ago
rubidium
272b2ef0e9
(svn r14464) -Codechange: replace (uint)-1 with UINT_MAX (PhilSophus)
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
34e2d8f1e1
(svn r13320) -Codechange: move some enums from openttd.h to more logical locations.
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
rubidium
12188e7a5d
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
17 years ago
rubidium
ac528411df
(svn r11818) -Codechange: split player.h into smaller pieces.
17 years ago
rubidium
24c4d5b06d
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
18 years ago
rubidium
36bb92ae24
(svn r9050) -Codechange: Foo(void) -> Foo()
18 years ago
belugas
978d7da818
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
18 years ago
Darkvater
19c90a3bc0
(svn r8522) -Regression (r8512): The flat/random window moved the to scenario editor did not use the right settings for generating land
18 years ago
rubidium
f35ed4bbc2
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
18 years ago
rubidium
66bbf336c6
(svn r7759) -Merge: makefile rewrite. This merge features:
...
- A proper ./configure, so everything needs to be configured only once, not for every make.
- Usage of makedepend when available. This greatly reduces the time needed for generating the dependencies.
- A generator for all project files. There is a single file with sources, which is used to generate Makefiles and the project files for MSVC.
- Proper support for OSX universal binaries.
- Object files for non-MSVC compiles are also placed in separate directories, making is faster to switch between debug and release compiles and it does not touch the directory with the source files.
- Functionality to make a bundle of all needed files for for example a nightly or distribution of a binary with all needed GRFs and language files.
Note: as this merge moves almost all files, it is recommended to make a backup of your working copy before updating your working copy.
18 years ago