Commit Graph

109 Commits

Author SHA1 Message Date
Jonathan G Rennison
69f3844d2e Merge branch 'tracerestrict-sx' into jgrpp
Conflicts:
	src/lang/english.txt
	src/settings_gui.cpp
	src/settings_type.h
	src/table/settings.ini
2015-12-09 01:03:37 +00:00
Jonathan G Rennison
a93714a720 Add setting to show restricted electric signals using the default sprites.
This is to improve visual distinctiveness of restricted signals when
using signal GRFs.
This defaults to off.
2015-12-09 01:01:37 +00:00
Jonathan G Rennison
f2d0c3a441 Merge branch 'tracerestrict-sx' into jgrpp
Conflicts:
	src/gfxinit.cpp
	src/rail_cmd.cpp
	src/table/sprites.h
2015-08-20 00:39:26 +01:00
Jonathan G Rennison
8faead7e7a Graphically indicate restricted signals by recolouring the signal post.
Recolour signal posts from grey to blue for restricted signals which
are not semaphores and are not custom sprites.
2015-08-19 21:56:22 +01:00
Jonathan G Rennison
7ed93f9211 Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
town_gui.cpp updated due to struct CommandContainer change.

Conflicts:
	src/command.cpp
	src/command_type.h
	src/gfxinit.cpp
	src/openttd.cpp
	src/pbs.cpp
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/saveload/saveload.cpp
	src/stdafx.h
	src/train_cmd.cpp
	src/viewport_type.h
	src/window_type.h
2015-08-05 21:54:11 +01:00
patch-import
536a95dfd0 Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch
https://www.tt-forums.net/viewtopic.php?f=33&t=53394
2015-08-05 21:24:30 +01:00
Jonathan G Rennison
6596ba216c Merge branch 'zoning' into jgrpp
Conflicts:
	src/table/sprites.h
2015-08-02 18:20:23 +01:00
Jonathan G Rennison
03373c7ef4 Zoning: Remove unimplemented modes, fix some whitespace and style issues,
add missing licence headers, move/rename some declarations, fix sprite
ID allocation, update to build on trunk.
2015-08-02 13:17:42 +01:00
patch-import
6de087786c Import and rebase zoning patch
Fix some of the whitespace issues

http://www.tt-forums.net/viewtopic.php?p=888801#p888801
2015-08-02 13:17:42 +01:00
patch-import
fc0efe599e Port of the programmable signals patch to recent trunk
Also add some additional changes from the SpringPP patch,
and make some other minor changes/fixes.
2015-08-01 17:06:43 +01:00
rubidium
0c2f4bdc2b (svn r27020) -Cleanup: some coding style consistency improvements (mostly spaces) 2014-10-15 18:31:37 +00:00
peter1138
ee266b9b9d (svn r26965) -Codechange: Add palette bit to indicate that palette is actually a text colour remap, and draw closebox as a sprite, using said bit. Change news popup to use closebox widget for its closebox. 2014-10-05 21:18:37 +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
frosch
0d5ab589fe (svn r25916) -Add: GUI sprite for the smallmap cargoflow button. (frosch, planetmaker, V453000) 2013-10-27 15:09:41 +00:00
zuu
7a5cedf078 (svn r25344) -Feature: GUI for viewing story pages 2013-06-09 12:48:27 +00:00
frosch
f61a2c0273 (svn r25293) -Add: GUI sprite for default window size button. 2013-05-26 19:29:43 +00:00
planetmaker
f00d9976f9 (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 2013-01-08 22:46:42 +00:00
frosch
dbeb31860b (svn r24748) -Add: Clear button to all editboxes. 2012-11-14 22:50:56 +00:00
michi_cc
3e5dc26ded (svn r24141) -Feature: Display rating in the town directory window. (Inspired by patch from MagicBuzz) 2012-04-17 19:44:41 +00:00
michi_cc
ff73fdb4b0 (svn r23952) -Feature: [NewGRF] Customisable tunnel portals for rail types (sprites by Snail). 2012-02-15 21:23:48 +00:00
smatz
cf54bc425f (svn r23706) -Codechange: prevent 'unknown command' doxygen errors 2012-01-01 17:36:19 +00:00
frosch
37301ea23d (svn r22985) -Feature: Display autoreplace status in group GUI. 2011-10-03 17:26:37 +00:00
planetmaker
9a8285b0f5 (svn r22765) -Cleanup: Remove unused constants and name a magic constant 2011-08-20 05:35:03 +00:00
planetmaker
a82acadba1 (svn r22535) -Cleanup: Remove uneeded constants, update and unify some comments relating to sprite numbers 2011-06-03 20:41:30 +00:00
frosch
facd1301fc (svn r22383) -Codechange: Rename PALETTE_TO_STRUCT_GREY to PALETTE_NEWSPAPER as it does not belong to the other PALETTE_TO_STRUCT_xxx recolourings. 2011-04-29 20:47:36 +00:00
terkhen
9df9575e72 (svn r21806) -Codechange: Correct additional appearances of the same typo. 2011-01-15 16:27:04 +00:00
terkhen
98e0a17c47 (svn r21805) -Codechange: Correct a typo. 2011-01-15 15:58:03 +00:00
rubidium
8ad1726679 (svn r21423) -Codechange: replace some magic numbers by slightly less magic numbers 2010-12-07 20:40:50 +00:00
alberth
063931d435 (svn r21060) -Doc: Improved wording of comments (mostly by __ln__) 2010-10-30 17:51:07 +00:00
frosch
46acb837eb (svn r20720) -Add: separate GUI icons for vehicle/company profit, exclusive rights and unread news. 2010-09-02 20:00:48 +00:00
rubidium
03c5a93809 (svn r20671) -Add: feature F (not action F as written mistakenly in the previous message) support for the scenario editor 2010-08-28 19:45:56 +00:00
rubidium
1f2276b785 (svn r20411) -Codechange: rename unmovables as quite a lot of them are actually movable; e.g. HQ and owned land are pretty movable. 2010-08-08 10:59:30 +00:00
yexo
f9f141c480 (svn r20370) -Add: [NewGRF] new action 5 block to add airport preview sprites 2010-08-05 12:03:58 +00:00
frosch
c18839704b (svn r20286) -Codechange: Unify end of doxygen comments. 2010-08-01 19:44:49 +00:00
frosch
5b86c79fce (svn r20283) -Codechange: Unify start of doygen comments. 2010-08-01 19:22:34 +00:00
rubidium
35ba356ed3 (svn r19804) -Fix (r19802): Compile before commit, or at least triple check :) 2010-05-12 21:39:56 +00:00
belugas
2ef7ec4309 (svn r19803) -Fix(r19802): Compile before commit, or at least double check... 2010-05-12 21:07:31 +00:00
belugas
6ef9f85cb6 (svn r19802) -Codechange: Replace some more magic numbers by corresponding constants 2010-05-12 20:59:39 +00:00
terkhen
74a7508777 (svn r19715) -Codechange: Rename all appareances of shiplift to lock. 2010-04-24 21:03:40 +00:00
rubidium
02363447a6 (svn r19697) -Add: sprite for NewGRF some debuging features 2010-04-23 14:31:10 +00:00
rubidium
6c1bebfa5d (svn r19005) -Codechange: make animated cursors have a bit set instead of using negative numbers that are passed as uints, then cast again to be compared as ints before being inverted to be actually used. Also fixes a couple of 'integer conversion resulted in truncation' warnings ICC spewed. 2010-02-04 15:42:38 +00:00
frosch
04090dc6ab (svn r18888) -Codechange: Rename PALETTE_59[EF] to something more meaningful. 2010-01-22 18:47:29 +00:00
rubidium
ab46479d64 (svn r18874) -Codechange: Change enum Sprites { to static const StringID = for each SPR_ entry and similar for cursors and palettes. This avoids the need for a cast in some places and thus provides better type-safety. 2010-01-21 01:46:40 +00:00
frosch
9bbabadd29 (svn r18842) -Codechange: Rename SPRITE_MODIFIER_USE_OFFSET to SPRITE_MODIFIER_CUSTOM_SPRITE, invert its meaning, and also use it for industry/house layouts instead of IS_CUSTOM_SPRITE(). 2010-01-17 01:01:56 +00:00
alberth
d7c797fcf3 (svn r18581) -Change (r18570): Update sprite tables for the window shading sprites too. 2009-12-20 20:15:19 +00:00
peter1138
10753a6199 (svn r18509) -Codechange (r2515,r2753): Data for drawing single_x/y rail pieces was inverted. 2009-12-15 13:59:20 +00:00
rubidium
5d685f7195 (svn r18192) -Codechange: make the music window RTL aware 2009-11-19 20:34:45 +00:00
rubidium
9fc2e8d269 (svn r17971) -Codechange: make the code of the toolbar more uniform; give the switch bar a tooltip and unify the naming of sprites. 2009-11-04 18:28:59 +00:00
rubidium
95bcee3fde (svn r17955) -Codechange: s/SPR_PLAYER_ICON/SPR_COMPANY_ICON/ 2009-11-02 16:07:09 +00:00
yexo
d384908d56 (svn r17455) -Codechange: use sprite names instead of magic numbers in table/clear_land.h and change some names 2009-09-07 13:38:57 +00:00