Commit Graph

86 Commits (23ad4ec8797044e11b96d222c3f97d4e96cb6b55)

Author SHA1 Message Date
Jonathan G Rennison 7ff252c58d Merge branch 'master' into jgrpp
# Conflicts:
#	Makefile.src.in
#	findversion.sh
#	projects/determineversion.vbs
#	src/aircraft_cmd.cpp
#	src/lang/dutch.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/order_cmd.cpp
#	src/settings_gui.cpp
#	src/smallmap_gui.cpp
#	src/town_cmd.cpp
#	src/viewport.cpp
#	src/water_map.h
5 years ago
frosch 39cda89e85
Add: Detect stable tags automatically, and set the 'stable' flag in '_openttd_newgrf_version' accordingly. (#7317) 5 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
5 years ago
Niels Martin Hansen 46d97239c4 Codechange: Include flag for whether a build is of a tagged revision 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
glx bf5898018f Fix #7171: incorrect modified status with determineversion.vbs 5 years ago
Niels Martin Hansen 67c6f945fb Change: Include the full raw git revision hash in rev.cpp 5 years ago
Jonathan G Rennison f42cc19aad Merge branch 'cpp-11' into crashlog_improvements
# Conflicts:
#	Makefile.src.in
#	src/crashlog.cpp
#	src/crashlog.h
6 years ago
frosch 192770e6da Change: Non-tag revisions are now named '<commitdate>-<branch>-g<shorthash><modified>'. 6 years ago
Jonathan G Rennison 0951cb320c Show ./configure invocation in crash log. 8 years ago
glx 510fe5f196 (svn r24826) -Fix: determineversion.vbs could hang in a git checkout 12 years ago
glx eda22e0595 (svn r24826) -Fix: determineversion.vbs could hang in a git checkout 12 years ago
michi_cc 28067c21d5 (svn r22435) -Fix: Git revision detection would return too much when tags are involved. 13 years ago
michi_cc 29357ef65c (svn r22435) -Fix: Git revision detection would return too much when tags are involved. 13 years ago
michi_cc 10a7678beb (svn r21857) -Add: Revision detection for hgsubversion repositories. 14 years ago
michi_cc 33d7f15a1e (svn r21857) -Add: Revision detection for hgsubversion repositories. 14 years ago
michi_cc 22922414eb (svn r21856) -Fix (r21840): Don't fail tag detection on hg repositories that use mercurial queues. Add some safety against tags and branches with spaces as well. 14 years ago
michi_cc 656431d3cb (svn r21856) -Fix (r21840): Don't fail tag detection on hg repositories that use mercurial queues. Add some safety against tags and branches with spaces as well. 14 years ago
michi_cc 5f28591610 (svn r21840) -Change: Support tags created by hgsubversion for the revision detection. 14 years ago
michi_cc 2f98ad38ba (svn r21840) -Change: Support tags created by hgsubversion for the revision detection. 14 years ago
michi_cc 73da045f50 (svn r21839) -Change: Support tags created by git-svn for the revision detection. 14 years ago
michi_cc b0a592a649 (svn r21839) -Change: Support tags created by git-svn for the revision detection. 14 years ago
rubidium 7cce507443 (svn r21630) -Fix (r20308, r21615): version detection of subversion branches and tags got broken 14 years ago
rubidium f6c28ecd1c (svn r21630) -Fix (r20308, r21615): version detection of subversion branches and tags got broken 14 years ago
rubidium 44937dfa5e (svn r21356) -Fix (r21351): sometimes versions wouldn't be correctly set for Windows builds 14 years ago
rubidium fafb971d84 (svn r21356) -Fix (r21351): sometimes versions wouldn't be correctly set for Windows builds 14 years ago
rubidium 4aa6a24d95 (svn r21351) -Change: read some metadata from (official) source tarballs so you'll more likely get the right version/revision out-of-the-box 14 years ago
rubidium 8b4d080817 (svn r21351) -Change: read some metadata from (official) source tarballs so you'll more likely get the right version/revision out-of-the-box 14 years ago
terkhen b416e7266f (svn r20488) -Fix [FS#4029]: Version detection for MSVC using mercurial failed (Hirundo). 14 years ago
terkhen 05f480af19 (svn r20488) -Fix [FS#4029]: Version detection for MSVC using mercurial failed (Hirundo). 14 years ago
rubidium 508fe537ff (svn r20309) -Fix [FS#3953]: Mercurial (trunk) revision detection fails when different heads are used 14 years ago
rubidium e408c2567b (svn r20309) -Fix [FS#3953]: Mercurial (trunk) revision detection fails when different heads are used 14 years ago
rubidium e8dc701cc4 (svn r20308) -Change: don't only look at only the src directory for the revision, but at the parent of the src directory. 14 years ago
rubidium 3658d79b0c (svn r20308) -Change: don't only look at only the src directory for the revision, but at the parent of the src directory. 14 years ago
michi_cc 848aa4472f (svn r20050) -Add: git revision detection for custom git-svn clones. 14 years ago
michi_cc 1a060b9ae4 (svn r20050) -Add: git revision detection for custom git-svn clones. 14 years ago
rubidium 0599cb67ce (svn r20029) -Fix: the 64 bits TortoiseSVN wasn't always properly detected 14 years ago
rubidium 0fe178a6ed (svn r20029) -Fix: the 64 bits TortoiseSVN wasn't always properly detected 14 years ago
michi_cc 3e7fc229ab (svn r19895) -Fix [FS#3836]: Git version detection would sometimes mistakenly identify a checkout as modified. 14 years ago
michi_cc 0974562d4e (svn r19895) -Fix [FS#3836]: Git version detection would sometimes mistakenly identify a checkout as modified. 14 years ago
rubidium bc8e66c202 (svn r17336) -Codechange: move some os specific files into src/os/ 15 years ago
rubidium 19b83eb5aa (svn r17336) -Codechange: move some os specific files into src/os/ 15 years ago
rubidium 7fbc33dae1 (svn r17248) -Fix: add GPL license notice where appropriate 15 years ago
rubidium 99d46e0ad7 (svn r17248) -Fix: add GPL license notice where appropriate 15 years ago
rubidium a34d5bb6ab (svn r16318) -Change: use !! instead of @@ in src/*.in too.
-Change: use @ instead of ~ in configure/Makefiles so Debian's build system(s) can also build RC binaries.
15 years ago
rubidium 5d2b6f8474 (svn r16318) -Change: use !! instead of @@ in src/*.in too.
-Change: use @ instead of ~ in configure/Makefiles so Debian's build system(s) can also build RC binaries.
15 years ago
glx bf16032308 (svn r14780) -Fix (r14777): of course VBS evaluates all parts of a boolean expression 16 years ago
glx 34b211ea99 (svn r14780) -Fix (r14777): of course VBS evaluates all parts of a boolean expression 16 years ago
glx 88e3ff5413 (svn r14777) -Fix: be sure to update ottdres.rc and rev.cpp when their .in changes (MSVC) 16 years ago
glx b8d31e962a (svn r14777) -Fix: be sure to update ottdres.rc and rev.cpp when their .in changes (MSVC) 16 years ago