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

94 Commits

Author SHA1 Message Date
Jonathan G Rennison
f6b9395c6a Improve performance of name sorting in town and station list windows 2019-05-12 18:03:57 +01:00
Jonathan G Rennison
674732cd68 Merge: Codechange: Use null pointer literal instead of the NULL macro 2019-04-11 18:14:13 +01:00
Henry Wilson
7c8e7c6b6e Codechange: Use null pointer literal instead of the NULL macro 2019-04-10 23:22:20 +02:00
Jonathan G Rennison
5e6d283463 Merge branch 'master' into jgrpp 
Remove the viewport sign cache as this is now superseded by the kd tree
implementation

# Conflicts:
#	src/crashlog.cpp
#	src/lang/english.txt
#	src/misc.cpp
#	src/pathfinder/follow_track.hpp
#	src/pbs.cpp
#	src/rail_cmd.cpp
#	src/saveload/vehicle_sl.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/ship_cmd.cpp
#	src/station.cpp
#	src/station_base.h
#	src/station_cmd.cpp
#	src/table/settings.ini
#	src/thread/thread_morphos.cpp
#	src/town_cmd.cpp
#	src/train_cmd.cpp
#	src/viewport.cpp
#	src/waypoint.cpp
 2019-03-13 03:38:26 +00:00
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
 2019-01-29 02:28:14 +00:00
Johannes E. Krause
05da5a177c Codechange: Simplify marking tiles dirty when terraforming (Patch by adf88, #6583) 2019-01-24 21:17:17 +01:00
Jonathan G Rennison
698409381e Cache viewport station/waypoint sign infomation 2019-01-21 19:41:11 +00:00
Jonathan G Rennison
0d0d55f81d Scrolling/perf improvements to link graph overlays on viewport and smallmap 2018-05-26 09:15:22 +01:00
Jonathan G Rennison
fe1e0a9d59 Merge branch 'enhanced_viewport_overlay' into jgrpp 2018-05-26 09:15:08 +01:00
Jonathan G Rennison
64815c0d8a Improve performance of show scrolling viewport on map 2018-05-26 09:09:39 +01:00
Jonathan G Rennison
f373a67610 Fix display of zoning overlay sprites on half-tile foundations 
Partly based on commit 598b781259a5c1ad25cf3de85807b9c79e9f08fe
 2018-05-10 23:10:04 +01:00
Jonathan G Rennison
5c7f36ef4b Merge branch 'enhanced_viewport_overlay' into jgrpp 
Further fixes for viewport lines/marker for multiplayer clients.

# Conflicts:
#	src/lang/russian.txt
 2016-12-26 15:38:56 +00:00
Jonathan G Rennison
509da024cc Fix viewport order lines/markers for multiplayer clients. 2016-12-26 15:35:11 +00:00
Jonathan G Rennison
54b8eb9b4c Merge branch 'polyline_track_tool' into jgrpp 
# Conflicts:
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/viewport.cpp
#	src/viewport_func.h
 2016-04-13 21:14:47 +01:00
patch-import
01cf154f51 Import polyline rail tool patch v10b 
http://www.tt-forums.net/viewtopic.php?f=33&t=57080
 2016-04-13 21:03:51 +01:00
Jonathan G Rennison
919057a5e6 Cache tunnel info in viewport map mode, to prevent render flicker. 
If we see a tunnel during the usual tile scan, keep it in the cache
until it is explicitly evicted by a clear tunnel tile action, or
the cache is cleared at game init/load/shutdown.
Select colours at the drawing rather than the cache-building stage.
Bridges and tunnels are now stored/handled separately.
The process for bridges is mostly unchanged.
 2015-11-11 19:18:32 +00: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
frosch
3adf082db2 (svn r27161) -Fix [FS#6156] [FS#6206]: Reimplement the viewport drawing algorithm. 2015-02-22 14:42:34 +00:00
frosch
939719ffc0 (svn r27161) -Fix [FS#6156] [FS#6206]: Reimplement the viewport drawing algorithm. 2015-02-22 14:42:34 +00:00
frosch
06d1d50884 (svn r27158) -Codechange: Simplify mapping from viewport to smallmap coordinates by duplicating less code. 2015-02-22 14:10:44 +00:00
frosch
79380a566e (svn r27158) -Codechange: Simplify mapping from viewport to smallmap coordinates by duplicating less code. 2015-02-22 14:10:44 +00:00
frosch
e8e49e5dda (svn r27157) -Fix: Mark bridge middle tiles dirty when building/removing/changing bridges. 2015-02-22 14:01:24 +00:00
frosch
bd3a8bf9e4 (svn r27157) -Fix: Mark bridge middle tiles dirty when building/removing/changing bridges. 2015-02-22 14:01:24 +00:00
rubidium
dfd472f4a4 (svn r26900) -Fix-ish: dirty the appropriate area around map edges when terraforming there to prevent any artefacts from occuring (ic111) 2014-09-21 17:29:48 +00:00
rubidium
073aa05da5 (svn r26900) -Fix-ish: dirty the appropriate area around map edges when terraforming there to prevent any artefacts from occuring (ic111) 2014-09-21 17:29:48 +00:00
rubidium
6cee5310c1 (svn r26899) -Codechange: reduce the amount of tiles that needs to be drawn by taking the height of tiles into account instead of drawing way too many (ic111) 2014-09-21 17:27:37 +00:00
rubidium
4d619ad10e (svn r26899) -Codechange: reduce the amount of tiles that needs to be drawn by taking the height of tiles into account instead of drawing way too many (ic111) 2014-09-21 17:27:37 +00:00
rubidium
238a842700 (svn r25264) -Feature: linkgraph overlay over main viewport (fonsinchen) 2013-05-19 14:49:25 +00:00
rubidium
ef7befdbd8 (svn r25264) -Feature: linkgraph overlay over main viewport (fonsinchen) 2013-05-19 14:49:25 +00:00
peter1138
1a0d9e73de (svn r23329) -Fix (r23316): Scale child sprite pixel offsets unless told not to. Fixes lifts and industry graphics. 2011-11-25 23:06:17 +00:00
peter1138
07633a064c (svn r23329) -Fix (r23316): Scale child sprite pixel offsets unless told not to. Fixes lifts and industry graphics. 2011-11-25 23:06:17 +00:00
rubidium
701bd8848a (svn r22017) -Codechange: move MarkTileDirtyByTile to viewport_func.h 2011-02-07 22:29:47 +00:00
rubidium
faf5d899f7 (svn r22017) -Codechange: move MarkTileDirtyByTile to viewport_func.h 2011-02-07 22:29:47 +00:00
rubidium
05199a641a (svn r21890) -Cleanup: remove some unneeded includes 2011-01-22 14:52:20 +00:00
rubidium
7eba2bf4d3 (svn r21890) -Cleanup: remove some unneeded includes 2011-01-22 14:52:20 +00:00
rubidium
3dd1cf6049 (svn r21843) -Codechange: move documentation towards the code to make it more likely to be updates [t-z]. 2011-01-18 21:58:22 +00:00
rubidium
d89095b3ec (svn r21843) -Codechange: move documentation towards the code to make it more likely to be updates [t-z]. 2011-01-18 21:58:22 +00:00
alberth
de9c678901 (svn r21270) -Doc: Doxyment updates and additions. Removal of doxyment in code. 2010-11-20 14:15:02 +00:00
alberth
3b0ee65571 (svn r21270) -Doc: Doxyment updates and additions. Removal of doxyment in code. 2010-11-20 14:15:02 +00:00
alberth
835fe2131d (svn r21020) -Add: Use center of waypoint in waypoint gui, if available. 2010-10-23 20:39:21 +00:00
alberth
83094e5e58 (svn r21020) -Add: Use center of waypoint in waypoint gui, if available. 2010-10-23 20:39:21 +00:00
smatz
ca1aea6225 (svn r20761) -Codechange: make PlaceObject() static 2010-09-07 11:05:22 +00:00
smatz
bb4538665a (svn r20761) -Codechange: make PlaceObject() static 2010-09-07 11:05:22 +00:00
smatz
e4bf409e44 (svn r20760) -Cleanup (r20753): remove unused CheckMouseOverVehicle() 2010-09-07 11:03:46 +00:00
smatz
15c2a2d555 (svn r20760) -Cleanup (r20753): remove unused CheckMouseOverVehicle() 2010-09-07 11:03:46 +00:00
rubidium
b4747b00e6 (svn r19807) -Codechange: instead of having an unnamed enum and passing it as an int, name the enum and pass that 2010-05-13 08:56:01 +00:00
rubidium
3118292b14 (svn r19807) -Codechange: instead of having an unnamed enum and passing it as an int, name the enum and pass that 2010-05-13 08:56:01 +00:00
alberth
14d545e902 (svn r19767) -Fix [FS#3808]: Height in smallmap was different from measured heights (ChillCore). 2010-05-07 20:39:00 +00:00
alberth
8d1d4267af (svn r19767) -Fix [FS#3808]: Height in smallmap was different from measured heights (ChillCore). 2010-05-07 20:39:00 +00:00