Commit Graph

295 Commits

Author SHA1 Message Date
frosch
43dd41b4e4 (svn r27271) [1.5] -Backport from trunk:
- Fix: Invalid infrastructure counting when crossing tram tracks with railroads [FS#6281] (r27252)
- Fix: Broken error message in configure [FS#6286] (r27250)
- Fix: Town labels on smallmap and zoomed-out viewports were not centered [FS#6257] (r27248)
- Fix: Removing a rail waypoint used the remove-rail-station cost [FS#6251] (r27245)
2015-06-16 22:35:10 +03:00
frosch
960600af4f (svn r27270) [1.5] -Backport from trunk:
- Fix: Duplicate frees due to pool item classes not having copy constructors [FS#6285] (r27243)
- Fix: Crash when no AIs were installed due to improper handling of non-ASCII characters by the string pointer lexer [FS#6272] (r27233)
- Fix: Compilation on DragonflyBSD [FS#6274] (r27224, r27223)
- Fix: Use the current maximum speed as limited by bridges, orders etc. for all vehicle types alike when considering increased smoke emissions of vehicles [FS#6278] (r27222)
- Fix: Multi-value keys in the desktop entry shall end with a trailing separator (r27221)
- Fix: Draw path reservation on the whole bridge, not only on the bridge heads (r27209)
- Fix: Draw correct overlay sprites for path reservations on bridges and tunnels (r27208)
2015-06-16 22:35:10 +03:00
pelya
0d868d80bd Merge branch 'master' into 1.5
Conflicts:
	src/ai/ai_gui.cpp
	src/build_vehicle_gui.cpp
	src/cheat_gui.cpp
	src/company_gui.cpp
	src/depot_gui.cpp
	src/dock_gui.cpp
	src/genworld_gui.cpp
	src/misc_gui.cpp
	src/network/network_content_gui.cpp
	src/network/network_gui.cpp
	src/newgrf_gui.cpp
	src/news_gui.cpp
	src/rail_gui.cpp
	src/road_gui.cpp
	src/settings_gui.cpp
	src/settings_gui.h
	src/station_gui.cpp
	src/table/settings.ini
	src/toolbar_gui.cpp
	src/toolbar_gui.h
	src/vehicle_gui.cpp
	src/video/sdl_v.cpp
	src/widget.cpp
	src/widgets/settings_widget.h
2015-03-29 21:48:14 +03:00
planetmaker
2d3ad05aa7 (svn r27059) -Change: [Makefile] Make sure to use plain mercurial output unaltered by personal presets 2014-11-09 16:37:07 +00:00
rubidium
6592da4952 (svn r26869) -Add: support for an all black palette to prevent the need of having a black tile of all different slopes (ic111) 2014-09-21 07:57:45 +00:00
planetmaker
7836a487ae (svn r26850) -Fix: [Makefile] Compilation of strgen requires also defining variable in for platforms like Solaris 2014-09-19 09:28:23 +00:00
Sergii Pylypenko
2603e6b5e3 Merge remote-tracking branch 'upstream/master'
Conflicts:
	src/os/unix/unix.cpp
	src/widgets/dropdown.cpp
2014-08-19 19:21:47 +03:00
rubidium
a290f4a6fb (svn r26737) -Fix (r26735): one = too many... why can't all languages use the same basic definition for comparisons? 2014-08-16 10:31:24 +00:00
rubidium
bbe58ca737 (svn r26735) -Fix (rmakefilerewrite): for profiling CFLAGS got a -p (for prof) and LDFLAGS got -pg (for gprof), but in the end gprof would be used (via make run-prof). Furthermore -pg isn't compatible with -fomit-frame-pointer on certain architectures (most importantly x86(_64)), so simply don't enable that flag when profiling is enabled 2014-08-16 10:17:18 +00:00
Sergii Pylypenko
91ebce1a9c Merge remote-tracking branch 'upstream/master'
Conflicts:
	src/console_gui.cpp
	src/genworld_gui.cpp
	src/group_gui.cpp
	src/misc_gui.cpp
	src/settings_gui.cpp
	src/widgets/settings_widget.h
2014-06-04 17:09:23 +03:00
planetmaker
c10662e4cc (svn r26458) -Doc: Correct a few spelling mistakes (__ln__) 2014-04-12 15:59:56 +00:00
Sergii Pylypenko
7c024612f6 Merge remote-tracking branch 'upstream/master' 2014-04-02 22:54:47 +03:00
rubidium
3e4124695d (svn r26435) -Fix (r26434): linking issue on OS X 2014-03-28 19:18:36 +00:00
rubidium
07a9086ced (svn r26433) -Codechange: use pkg-config for libpng as well 2014-03-28 18:19:48 +00:00
rubidium
aa5f505b64 (svn r26432) -Codechange: deduplicate code for checking pkg-config dependencies 2014-03-28 18:12:21 +00:00
pelya
d7b18a8e2d Detect version from git submodule 2014-03-15 19:53:53 +02:00
rubidium
aca4b5bf37 (svn r26198) -Fix (r26195): some platforms leave an .exe around... 2014-01-02 09:07:50 +00:00
rubidium
bfd72d7a89 (svn r26194) -Change: add SSE detection to the configure script with the possibility to disable it (based on patch by MJP) 2014-01-02 08:35:45 +00:00
rubidium
108b65c967 (svn r26019) -Fix: copy-paste error in configure help 2013-11-16 22:17:02 +00:00
rubidium
7de6238e25 (svn r26011) -Fix: --help text of ./configure for packages that require pkg-config 2013-11-16 13:16:38 +00:00
rubidium
a77aa68f16 (svn r25975) -Feature [FS#5385]: XDG base directory support 2013-11-13 19:32:37 +00:00
rubidium
7d5aaf95c4 (svn r25960) -Fix-ish: make it less likely to trigger clang's hang with -D_FORTIFY_SOURCE=2 -O1 2013-11-09 07:15:01 +00:00
fonsinchen
c8d4e83909 (svn r25706) -Fix: don't pass -mmacosx-version-min to compilers that don't support it 2013-08-10 12:47:08 +00:00
michi_cc
1880c36405 (svn r25679) -Codechange: [Win32] Get the result string of an IME input directly without a trip through the window messaging system. 2013-08-05 20:37:06 +00:00
planetmaker
b1e2922a23 (svn r25642) -Fix (r25638): Compilation with static ICU 2013-07-31 18:09:21 +00:00
planetmaker
0727c3c76d (svn r25638) -Fix (r25470): Some icu_config are too stupid to separate two ldflags by spaces, thus only call it with one 2013-07-30 22:03:36 +00:00
michi_cc
ac583fc787 (svn r25480) -Codechange: [OSX] OS X SDK versions >= 10.5 always have a non-const iconv declaration. 2013-06-26 21:17:09 +00:00
rubidium
672ccbfde5 (svn r25470) -Feature-ish: use ICU's layout engine when that's available 2013-06-25 20:40:58 +00:00
glx
95552ba45b (svn r25266) -Fix: gcc4.6 removed -mno-cygwin option 2013-05-19 15:44:09 +00:00
planetmaker
5ed3969ab9 (svn r25209) -Doc: Mention --without-grfcodec in the help for configure and explain its use in the readme 2013-04-26 18:39:15 +00:00
frosch
e4c87948c5 (svn r25205) -Feature: Translations of baseset descriptions via lang files. 2013-04-24 20:30:02 +00:00
rubidium
a9af895fbb (svn r25107) -Change: be slightly more lenient with trying to detect a subversion repository in case someone has a sparse tags checkout. In that case the .svn folder misses from the $ROOT_DIR because it is in the $ROOT_DIR/.. (i.e. tags) folder 2013-03-18 06:18:06 +00:00
rubidium
c6ecb1f2f3 (svn r25054) -Document: the *FLAGS_BUILD in configure 2013-02-28 06:51:45 +00:00
rubidium
8b92707d7c (svn r24889) -Fix-ish: extra GRF was built with "broken" grfcodec 2013-01-06 13:01:46 +00:00
smatz
bc44866c59 (svn r24701) -Fix [FS#5246]: Workaround an overoptimisation done by GCC 4.5 2012-11-11 17:39:54 +00:00
rubidium
db460bc4e0 (svn r24601) -Fix: _BUILD flags were not properly parsed when reconfiguring 2012-10-17 18:48:12 +00:00
rubidium
6b9c131fab (svn r24598) -Fix: configure script failed to detect libfontconfig 2.10 as newer than 2.3 2012-10-17 15:23:51 +00:00
rubidium
cff01ec865 (svn r24573) -Fix: hopefully get packing right on Mingw's gcc 4.7 2012-10-04 15:44:09 +00:00
truebrain
863cd12c0f (svn r24471) -Feature: unbreak multiparam configure settings (--setting value), which clearly nobody uses, as it has been broken .... for a while 2012-08-14 15:51:28 +00:00
truebrain
4b4c058669 (svn r24470) -Feature [FS#5270]: be a tiny bit GNU autotools compatible, for those who expect all software to follow GNU guidelines 2012-08-14 15:47:44 +00:00
rubidium
3fc0196951 (svn r24431) -Fix: some old compilers didn't like some flag that isn't really needed anyway 2012-07-22 18:55:12 +00:00
rubidium
a3f56875c1 (svn r24429) -Change: add some hardening flags to the compiler for release builds 2012-07-22 05:33:09 +00:00
rubidium
12279e0aae (svn r24427) -Change: allow passing C(XX)- and LDFLAGS to the compilation of helper binaries such as depend, strgen and settingsgen 2012-07-21 15:49:26 +00:00
rubidium
762922e956 (svn r24365) -Fix-ish: add C(XX)FLAGS_BUILD to all the executables that are compiled for the build enviroment 2012-07-01 08:56:57 +00:00
planetmaker
f50de50aee (svn r24220) -Change: Adopt ICU version detection to also deal with the new versioning scheme since ICU 49 2012-05-09 19:13:34 +00:00
rubidium
3fb929005b (svn r23993) -Cleanup: remove some disable directives from the NFO as they aren't needed anymore with newer GRFCodec/NFORenum 2012-02-26 08:23:32 +00:00
rubidium
a28614d6d1 (svn r23981) -Codechange: reduce GRF size by a few percent by letting GRFCodec determine the best compression 2012-02-24 22:19:45 +00:00
michi_cc
a643719996 (svn r23954) -Fix (r23952): Update required grfcodec version. 2012-02-15 21:39:10 +00:00
smatz
bb9b240a86 (svn r23941) -Add: support for clang 2012-02-12 21:17:32 +00:00
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
2012-01-17 17:27:38 +00:00