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
6 years ago
39cda89e85
Add: Detect stable tags automatically, and set the 'stable' flag in '_openttd_newgrf_version' accordingly. ( #7317 )
6 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
6 years ago
46d97239c4
Codechange: Include flag for whether a build is of a tagged revision
6 years ago
0151fe998a
Fix 5f8354f3: Non-Windows builds did not get correct git hash
...
Effect is that gamelog and network revisions indicate a git revision of 0, potentially causing issues.
6 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
6 years ago
67c6f945fb
Change: Include the full raw git revision hash in rev.cpp
6 years ago
281d346fe2
Merge branch 'master' into jgrpp
...
# Conflicts:
# bin/baseset/no_sound.obs
# bin/baseset/orig_dos.obg
# bin/baseset/orig_dos.obs
# bin/baseset/orig_dos_de.obg
# bin/baseset/orig_win.obg
# bin/baseset/orig_win.obm
# bin/baseset/orig_win.obs
# src/aircraft_cmd.cpp
# src/blitter/32bpp_anim.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_base.cpp
# src/blitter/32bpp_base.hpp
# src/blitter/8bpp_base.cpp
# src/blitter/8bpp_base.hpp
# src/blitter/common.hpp
# src/group_gui.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.cpp
# src/saveload/saveload.cpp
# src/town_cmd.cpp
# src/viewport.cpp
# src/viewport_func.h
6 years ago
255fa6e1a8
Fix: enable DPI-awareness for MINGW builds
6 years ago
191afd93c1
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/settings.cpp
# src/station_cmd.cpp
# src/table/settings.ini
# src/vehicle_base.h
# src/widgets/dropdown.cpp
6 years ago
ee84f98f1e
Fix: deps calculation call could fail due to command line length
6 years ago
ad1c402ad8
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/debug.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/settings_type.h
# src/town_cmd.cpp
# src/window.cpp
6 years ago
0165fe1283
Codechange: remove endian_check in favour of __BYTE_ORDER macro (Rubidium) ( #6762 )
6 years ago
85adde7485
Remove: PSP support
6 years ago
f42cc19aad
Merge branch 'cpp-11' into crashlog_improvements
...
# Conflicts:
# Makefile.src.in
# src/crashlog.cpp
# src/crashlog.h
7 years ago
192770e6da
Change: Non-tag revisions are now named '<commitdate>-<branch>-g<shorthash><modified>'.
7 years ago
f7774415f2
Merge branch 'cpp-11' into crashlog_improvements
...
# Conflicts:
# src/stdafx.h
8 years ago
0951cb320c
Show ./configure invocation in crash log.
8 years ago
9a05a688a7
(svn r27558) -Fix: force sorting to be locale independent, so files are always ordered the same and by that token better diff-able
8 years ago
6da8fede43
(svn r27558) -Fix: force sorting to be locale independent, so files are always ordered the same and by that token better diff-able
8 years ago
6b3c1aa036
(svn r26194) -Change: add SSE detection to the configure script with the possibility to disable it (based on patch by MJP)
11 years ago
bfd72d7a89
(svn r26194) -Change: add SSE detection to the configure script with the possibility to disable it (based on patch by MJP)
11 years ago
aad9273248
(svn r25108) -Fix: Pass $LDFLAGS_BUILD to all endian_check compilations.
...
- In Makefile.{lang,setting}.in the flags were already passed since r24365.
12 years ago
5a5304fa6b
(svn r25108) -Fix: Pass $LDFLAGS_BUILD to all endian_check compilations.
...
- In Makefile.{lang,setting}.in the flags were already passed since r24365.
12 years ago
cf58d5d12c
(svn r23908) -Fix (r22910): [Makefile] Make sure bin/baseset/openttd.32.bmp is removed on make clean.
13 years ago
b9cbb4c03a
(svn r23908) -Fix (r22910): [Makefile] Make sure bin/baseset/openttd.32.bmp is removed on make clean.
13 years ago
4f62472fd9
(svn r23817) -Fix [FS#4962]: desync due to different NewGRF version. So reduce the chance that it happens significantly with betas/RCs/nightlies by doing the same as is done for stable releases: check the NewGRF version of server vs client.
...
Previously this check was not done for nightlies/betas/RCs due to missing versioning information in the source tarballs, but they have that for a while now. So just force the NewGRF version check for all versions, and remove the broken --revision configure option
13 years ago
82a3783fdd
(svn r23817) -Fix [FS#4962]: desync due to different NewGRF version. So reduce the chance that it happens significantly with betas/RCs/nightlies by doing the same as is done for stable releases: check the NewGRF version of server vs client.
...
Previously this check was not done for nightlies/betas/RCs due to missing versioning information in the source tarballs, but they have that for a while now. So just force the NewGRF version check for all versions, and remove the broken --revision configure option
13 years ago
79b82b56a8
(svn r23220) -Change: move the baseset files to their new location
13 years ago
57afd9e9e8
(svn r23220) -Change: move the baseset files to their new location
13 years ago
d61b90ac6f
(svn r23197) -Fix: -Wno-narrowing didn't have any effect anymore
13 years ago
aadbb9ed3f
(svn r23197) -Fix: -Wno-narrowing didn't have any effect anymore
13 years ago
39eaf0e10d
(svn r22913) -Fix [OSX]: make splash work again and make it work without needing to bundle it first
13 years ago
af9de6c95d
(svn r22913) -Fix [OSX]: make splash work again and make it work without needing to bundle it first
13 years ago
bffa93a4e9
(svn r22910) -Fix [FS#4617]: icon would (almost) never be shown for SDL builds
13 years ago
696e4eec2d
(svn r22910) -Fix [FS#4617]: icon would (almost) never be shown for SDL builds
13 years ago
ba28937b3d
(svn r22195) -Fix (r22188): make sure makedep picks up the newly generated settings.h so settings.cpp gets recompiled when needed
14 years ago
0a36c81834
(svn r22195) -Fix (r22188): make sure makedep picks up the newly generated settings.h so settings.cpp gets recompiled when needed
14 years ago
7f54c59a66
(svn r22188) -Add: Generate the settings as part of the MSVC build process, and enable it in Makefile too
14 years ago
b4466262b7
(svn r22188) -Add: Generate the settings as part of the MSVC build process, and enable it in Makefile too
14 years ago
c986325763
(svn r21662) -Codechange: use -flto=jobserver for GCC 4.6, it makes linking with LTO use number of processes passed to make -j
14 years ago
23bb300721
(svn r21662) -Codechange: use -flto=jobserver for GCC 4.6, it makes linking with LTO use number of processes passed to make -j
14 years ago
4a2efd136e
(svn r21606) -Fix (r14636): DOS binary was broken when not stripping
14 years ago
92f3e19b72
(svn r21606) -Fix (r14636): DOS binary was broken when not stripping
14 years ago
21bd2722cd
(svn r19081) -Codechange: make it possible to disable compilation of the AI+Squirrel
15 years ago
1c494c6f71
(svn r19081) -Codechange: make it possible to disable compilation of the AI+Squirrel
15 years ago
151ac000b0
(svn r18427) -Fix (r18423): ofcourse that broke the GCC build... not determining 'inclusion' using the relative path from the .rc that has the 'include' but from the include directories... how useful/sensible is that?
15 years ago
f3acd91a26
(svn r18427) -Fix (r18423): ofcourse that broke the GCC build... not determining 'inclusion' using the relative path from the .rc that has the 'include' but from the include directories... how useful/sensible is that?
15 years ago
434693b838
(svn r17464) -Codechange: use C++0x mode when compiling with gcc >= 4.3 or icc >= 11.0
15 years ago
4c342c6f76
(svn r17464) -Codechange: use C++0x mode when compiling with gcc >= 4.3 or icc >= 11.0
15 years ago
Jonathan G Rennison
frosch
Niels Martin Hansen
glx
Patric Stout
frosch
rubidium
matthijs
smatz