dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
48,541 Commits 1 Branch 0 Tags
cbdd9f84d8d8a181c25a9f88c908468285f1417d
Commit Graph

219 Commits

Author SHA1 Message Date
Jonathan G Rennison
cbdd9f84d8 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/console_gui.cpp
#	src/lang/korean.txt
#	src/video/sdl2_v.cpp
#	src/video/sdl2_v.h
#	src/window.cpp
#	src/window_gui.h
 2019-11-12 18:43:10 +00:00
S. D. Cloudt
13cc8a0cee Cleanup: Removed SVN headers 2019-11-10 17:59:20 +00:00
Jonathan G Rennison
edfd378e93 Merge branch 'master' into jgrpp 
# Conflicts:
#	source.list
#	src/blitter/32bpp_anim.cpp
#	src/linkgraph/linkgraphjob.cpp
#	src/order_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_type.h
 2019-10-05 21:45:54 +01:00
JMcKiern
04f659e768 Fix: Some typos found using codespell 2019-09-29 21:27:32 +01:00
Jonathan G Rennison
ba8ed880c1 Merge branch 'master' into jgrpp-nrt 
Merge NRT feature

# Conflicts:
#	docs/landscape.html
#	docs/landscape_grid.html
#	src/bridge_map.h
#	src/build_vehicle_gui.cpp
#	src/company_base.h
#	src/company_cmd.cpp
#	src/misc_gui.cpp
#	src/newgrf.cpp
#	src/newgrf_engine.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/npf/npf.cpp
#	src/road_cmd.cpp
#	src/road_func.h
#	src/road_gui.cpp
#	src/road_map.h
#	src/road_type.h
#	src/roadveh_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/company_sl.cpp
#	src/script/api/script_bridge.cpp
#	src/table/newgrf_debug_data.h
#	src/tile_cmd.h
#	src/town_cmd.cpp
#	src/tunnel_map.h
#	src/tunnelbridge_cmd.cpp
 2019-07-11 19:45:56 +01:00
peter1138
c02ef3e456 Feature: Add NotRoadTypes (NRT) 2019-05-01 21:36:27 +02:00
Jonathan G Rennison
361758b516 Merge branches 'crashlog_improvements', 'save_ext' into jgrpp 
# Conflicts:
#	Makefile.src.in
#	projects/openttd_vs140.vcxproj
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs141.vcxproj
#	projects/openttd_vs141.vcxproj.filters
#	projects/openttd_vs142.vcxproj
#	projects/openttd_vs142.vcxproj.filters
#	src/core/smallstack_type.hpp
#	src/linkgraph/linkgraphjob.cpp
#	src/linkgraph/linkgraphjob.h
#	src/misc.cpp
#	src/network/network_udp.cpp
#	src/openttd.cpp
#	src/saveload/saveload.cpp
 2019-04-09 19:06:26 +01:00
kiwitreekor
bc9b47d2e5 Fix #6222: Advanced sprite layout sometimes showed incorrect railtype ground tile 2019-04-08 18:41:07 +01:00
Jonathan G Rennison
5242ec4642 Fix handling of GRF programmable signal graphics with trace restrict 2019-04-02 18:19:28 +01:00
Jonathan G Rennison
ddf31702a2 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/saveload/saveload.cpp
#	src/widgets/group_widget.h
 2019-01-31 18:19:45 +00:00
PeterN
23960d0f2c Feature: Group liveries, and livery window usability enhancements. (#7108) 
* Change: Replace checkbox in livery selection window with Default option in drop down selection.

This reduces clutter in the UI and allows for primary/secondary colours to independently follow the default scheme if desired.

* Feature: Add vehicle group liveries.
 2019-01-31 14:57:44 +01:00
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
rubidium
d534c80e94 (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
peter1138
5a924dcbbc (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
rubidium
2361aaf601 (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
frosch
103b6fffbb (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
zuu
a2d84868e7 (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
frosch
559b7ef35e (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
planetmaker
c24374f99c (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
frosch
5e8238c75c (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
a2b2bc3620 (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
michi_cc
9101d2e2d2 (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
smatz
bcd3f2bb59 (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
frosch
d071eefc54 (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
b102b58bde (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
planetmaker
40cdaca849 (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