Commit Graph

149 Commits (281d346fe2a87928340b7964cc1b743a0257d1fe)

Author SHA1 Message Date
Jonathan G Rennison 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
5 years ago
glx 255fa6e1a8 Fix: enable DPI-awareness for MINGW builds 5 years ago
Jonathan G Rennison 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
5 years ago
glx ee84f98f1e Fix: deps calculation call could fail due to command line length 6 years ago
Jonathan G Rennison 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
Patric Stout 0165fe1283
Codechange: remove endian_check in favour of __BYTE_ORDER macro (Rubidium) (#6762) 6 years ago
Patric Stout 85adde7485 Remove: PSP support 6 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 f7774415f2 Merge branch 'cpp-11' into crashlog_improvements
# Conflicts:
#	src/stdafx.h
8 years ago
Jonathan G Rennison 0951cb320c Show ./configure invocation in crash log. 8 years ago
rubidium 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
rubidium 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
rubidium 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
rubidium 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
matthijs aad9273248 (svn r25108) -Fix: Pass $LDFLAGS_BUILD to all endian_check compilations.
- In Makefile.{lang,setting}.in the flags were already passed since r24365.
11 years ago
matthijs 5a5304fa6b (svn r25108) -Fix: Pass $LDFLAGS_BUILD to all endian_check compilations.
- In Makefile.{lang,setting}.in the flags were already passed since r24365.
11 years ago
matthijs cf58d5d12c (svn r23908) -Fix (r22910): [Makefile] Make sure bin/baseset/openttd.32.bmp is removed on make clean. 13 years ago
matthijs b9cbb4c03a (svn r23908) -Fix (r22910): [Makefile] Make sure bin/baseset/openttd.32.bmp is removed on make clean. 13 years ago
rubidium 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
rubidium 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
rubidium 79b82b56a8 (svn r23220) -Change: move the baseset files to their new location 13 years ago
rubidium 57afd9e9e8 (svn r23220) -Change: move the baseset files to their new location 13 years ago
smatz d61b90ac6f (svn r23197) -Fix: -Wno-narrowing didn't have any effect anymore 13 years ago
smatz aadbb9ed3f (svn r23197) -Fix: -Wno-narrowing didn't have any effect anymore 13 years ago
rubidium 39eaf0e10d (svn r22913) -Fix [OSX]: make splash work again and make it work without needing to bundle it first 13 years ago
rubidium af9de6c95d (svn r22913) -Fix [OSX]: make splash work again and make it work without needing to bundle it first 13 years ago
rubidium bffa93a4e9 (svn r22910) -Fix [FS#4617]: icon would (almost) never be shown for SDL builds 13 years ago
rubidium 696e4eec2d (svn r22910) -Fix [FS#4617]: icon would (almost) never be shown for SDL builds 13 years ago
rubidium ba28937b3d (svn r22195) -Fix (r22188): make sure makedep picks up the newly generated settings.h so settings.cpp gets recompiled when needed 13 years ago
rubidium 0a36c81834 (svn r22195) -Fix (r22188): make sure makedep picks up the newly generated settings.h so settings.cpp gets recompiled when needed 13 years ago
glx 7f54c59a66 (svn r22188) -Add: Generate the settings as part of the MSVC build process, and enable it in Makefile too 13 years ago
glx b4466262b7 (svn r22188) -Add: Generate the settings as part of the MSVC build process, and enable it in Makefile too 13 years ago
smatz 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
smatz 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
smatz 4a2efd136e (svn r21606) -Fix (r14636): DOS binary was broken when not stripping 14 years ago
smatz 92f3e19b72 (svn r21606) -Fix (r14636): DOS binary was broken when not stripping 14 years ago
rubidium 21bd2722cd (svn r19081) -Codechange: make it possible to disable compilation of the AI+Squirrel 15 years ago
rubidium 1c494c6f71 (svn r19081) -Codechange: make it possible to disable compilation of the AI+Squirrel 15 years ago
rubidium 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
rubidium 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
smatz 434693b838 (svn r17464) -Codechange: use C++0x mode when compiling with gcc >= 4.3 or icc >= 11.0 15 years ago
smatz 4c342c6f76 (svn r17464) -Codechange: use C++0x mode when compiling with gcc >= 4.3 or icc >= 11.0 15 years ago
smatz 6e3591700f (svn r17454) -Codechange: some alignment in Makefile*.in 15 years ago
smatz 6a944f06b3 (svn r17454) -Codechange: some alignment in Makefile*.in 15 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
glx bf82142053 (svn r17250) -Fix (r17249): I forgot depend.exe was affected too 15 years ago
glx 6cb8e5c18d (svn r17250) -Fix (r17249): I forgot depend.exe was affected too 15 years ago
rubidium 7fbc33dae1 (svn r17248) -Fix: add GPL license notice where appropriate 15 years ago