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

598 Commits

Author SHA1 Message Date
frosch
9d9e15a747 (svn r27961) -Fix [FS#6654]: The switch-toolbar icon contained pixels from the fire cycle. Replace the whole icon with a new version. (PaulC) 2018-01-07 14:21:09 +00:00
Jonathan G Rennison
a93cc441a9 Merge branch 'cpp-11' into jgrpp 2017-10-05 18:20:54 +01:00
frosch
bd68ed916d (svn r27915) -Fix (r27730) [FS#6620]: Glyphs in range U+0020 to U+00FF may only be defined in orig_extra.grf, not in openttd.grf. 2017-09-11 18:31:32 +00:00
frosch
96b1ac9d09 (svn r27915) -Fix (r27730) [FS#6620]: Glyphs in range U+0020 to U+00FF may only be defined in orig_extra.grf, not in openttd.grf. 2017-09-11 18:31:32 +00:00
Jonathan G Rennison
2574e46df8 Merge branch 'save_ext' into enhanced_viewport_overlay 
# Conflicts:
#	src/smallmap_gui.cpp
 2017-09-04 01:04:04 +01:00
Jonathan G Rennison
ac69b746ab Merge branch 'master' into jgrpp 
# Conflicts:
#	src/gfxinit.cpp
#	src/saveload/saveload.cpp
 2017-03-12 20:37:26 +00:00
frosch
ed63b48e76 (svn r27780) -Update: Numbers 2017-03-11 20:50:26 +00:00
frosch
afcef7faa6 (svn r27780) -Update: Numbers 2017-03-11 20:50:26 +00:00
frosch
f2af019eb7 (svn r27773) -Update: Baseset translations 2017-03-11 12:20:50 +00:00
frosch
9184b32978 (svn r27773) -Update: Baseset translations 2017-03-11 12:20:50 +00:00
Jonathan G Rennison
bdc5820836 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/road_cmd.cpp
 2017-02-22 21:13:04 +00:00
frosch
c46e51449e (svn r27745) -Update: Baseset translations 2017-02-12 12:01:03 +00:00
frosch
7d6d3897db (svn r27745) -Update: Baseset translations 2017-02-12 12:01:03 +00:00
Jonathan G Rennison
90cd312428 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/fios.h
 2017-01-17 19:11:09 +00:00
frosch
c72f21e410 (svn r27731) -Fix (r27730): Missed some sprites which also belong into orig_extra.grf 2017-01-14 18:00:02 +00:00
frosch
08b4255b67 (svn r27731) -Fix (r27730): Missed some sprites which also belong into orig_extra.grf 2017-01-14 18:00:02 +00:00
frosch
79027cbf9d (svn r27730) -Change: Split openttd.grf into openttd.grf and orig_extra.grf 
openttd.grf is now always loaded and provides all extra graphics in case the (possibly outdated) baseset does not.
  orig_extra.grf contains graphics specific to the original baseset only.
 2017-01-14 15:48:19 +00:00
frosch
1aedadb49b (svn r27730) -Change: Split openttd.grf into openttd.grf and orig_extra.grf 
openttd.grf is now always loaded and provides all extra graphics in case the (possibly outdated) baseset does not.
  orig_extra.grf contains graphics specific to the original baseset only.
 2017-01-14 15:48:19 +00:00
Jonathan G Rennison
c20cf31514 Merge branch 'cpp-11' into enhanced_viewport_overlay 
# Conflicts:
#	src/rail_gui.cpp
#	src/saveload/saveload.cpp
#	src/smallmap_gui.cpp
 2016-09-10 00:57:05 +01:00
Jonathan G Rennison
7b56097f50 Merge branch 'master' into jgrpp 
# Conflicts:
#	config.lib
#	src/linkgraph/demands.cpp
#	src/linkgraph/mcf.cpp
#	src/linkgraph/refresh.cpp
#	src/linkgraph/refresh.h
#	src/smallmap_gui.cpp
 2016-07-24 10:16:55 +01:00
frosch
2c403c8a80 (svn r27619) -Update: Baseset translations 2016-07-22 21:25:37 +00:00
frosch
7a180dbb4e (svn r27619) -Update: Baseset translations 2016-07-22 21:25:37 +00:00
Jonathan G Rennison
4c0423d6d8 Merge branch 'master' into jgrpp 2016-05-13 00:25:10 +01:00
rubidium
baa11c8b0f (svn r27559) -Update: baseset translations 2016-05-11 18:42:32 +00:00
rubidium
668fb3f658 (svn r27559) -Update: baseset translations 2016-05-11 18:42:32 +00:00
Jonathan G Rennison
3da991bf9b Merge branch 'master' into jgrpp 
# Conflicts:
#	src/rail_gui.cpp
 2016-04-19 22:48:33 +01:00
frosch
4cfa482786 (svn r27541) -Update: Baseset translations 2016-04-17 16:30:45 +00:00
frosch
208d83f9d3 (svn r27541) -Update: Baseset translations 2016-04-17 16:30:45 +00:00
frosch
e580d9e623 (svn r27533) -Update: Baseset translations 2016-04-02 15:59:14 +00:00
frosch
5931616e71 (svn r27533) -Update: Baseset translations 2016-04-02 15:59:14 +00:00
Jonathan G Rennison
57cbecb0e0 Merge branch 'master' into jgrpp 2016-03-02 21:44:58 +00:00
frosch
fbd79d88f0 (svn r27518) -Update: Numbers 2016-03-01 20:00:22 +00:00
frosch
0c7c0ada78 (svn r27518) -Update: Numbers 2016-03-01 20:00:22 +00:00
Jonathan G Rennison
cbf1ece361 Merge branch 'group_collapse' into jgrpp 2016-01-19 21:16:25 +00:00
frosch
265c8d090f (svn r27496) -Update: Baseset translations 2016-01-13 21:33:40 +00:00
frosch
00ce319efa (svn r27496) -Update: Baseset translations 2016-01-13 21:33:40 +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
Jonathan G Rennison
e24839ed65 Merge branch 'master' into enhanced_viewport_overlay 
Notes on conflict resolution:
* MarkTileDirtyByTile gained an extra param on both sides of the merge
  Move bridge level offset to be after zoom level param, as it's used less.
* Add zoom level params to MarkBridgeDirty functions
* Fix undefined behaviour in colour_index cycling in ViewportMapDraw

Conflicts:
	src/clear_cmd.cpp
	src/pbs.cpp
	src/rail_cmd.cpp
	src/toolbar_gui.cpp
	src/train_cmd.cpp
	src/vehicle.cpp
	src/viewport.cpp
	src/viewport_func.h
 2015-08-05 21:25:13 +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
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
frosch
97c76a51d6 (svn r27266) -Fix (r27265): Eddi jinxed it. 2015-05-03 10:30:02 +00:00
frosch
386e2ad14a (svn r27266) -Fix (r27265): Eddi jinxed it. 2015-05-03 10:30:02 +00:00
frosch
5923cfff4f (svn r27265) -Fix: Truncated comment in openttd.grf 2015-05-03 10:10:04 +00:00
frosch
65694cf0cd (svn r27265) -Fix: Truncated comment in openttd.grf 2015-05-03 10:10:04 +00:00
frosch
2edbc72ebd (svn r27192) -Change: heading for 1.6 now 2015-03-17 20:33:44 +00:00
frosch
6477356dd2 (svn r27192) -Change: heading for 1.6 now 2015-03-17 20:33:44 +00:00