dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
53,848 Commits 1 Branch 0 Tags
6d4474b84e6edd038d278bca737530059bc215d2
Commit Graph

1043 Commits

Author SHA1 Message Date
Jonathan G Rennison
f77a368268 Merge branch 'crashlog_improvements' into jgrpp 2017-09-04 01:23:08 +01:00
Jonathan G Rennison
4a6ddb2d50 Merge branch 'cpp-11' into crashlog_improvements 
# Conflicts:
#	config.lib
 2017-09-04 01:22:54 +01: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
frosch
3e2ec8a545 (svn r27901) -Codechange: GetWindowZPriority only needs a WindowClass; this way it can also be used for WindowDesc before a Window instance is created. (3298) 2017-08-27 13:14:37 +00:00
frosch
09abccd316 (svn r27901) -Codechange: GetWindowZPriority only needs a WindowClass; this way it can also be used for WindowDesc before a Window instance is created. (3298) 2017-08-27 13:14:37 +00:00
frosch
5aecfd11f0 (svn r27900) -Change [FS#6568]: Remove the gap between windows when positioning them after opening. 
-Fix: Make automatic window-positioning RTL-aware.
-Fix: Automatic window-positioning now uses GUI-scale/style dependent sizes/distances instead of fixed pixel values.
 2017-08-27 11:48:38 +00:00
frosch
80dffae130 (svn r27900) -Change [FS#6568]: Remove the gap between windows when positioning them after opening. 
-Fix: Make automatic window-positioning RTL-aware.
-Fix: Automatic window-positioning now uses GUI-scale/style dependent sizes/distances instead of fixed pixel values.
 2017-08-27 11:48:38 +00:00
Jonathan G Rennison
f34833f111 Merge branch 'improved_breakdowns' into jgrpp 
# Conflicts:
#	src/vehiclelist.cpp
 2017-08-15 19:26:26 +01:00
frosch
a47fb85cd8 (svn r27893) -Codechange: Use fallthrough attribute. (LordAro) 2017-08-13 18:38:42 +00:00
frosch
b4b98e5165 (svn r27893) -Codechange: Use fallthrough attribute. (LordAro) 2017-08-13 18:38:42 +00:00
Jonathan G Rennison
8317eac918 Merge branch 'save_ext' into jgrpp 
# Conflicts:
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/lang/traditional_chinese.txt
#	src/window.cpp
 2017-04-01 01:14:28 +01:00
Jonathan G Rennison
83091f55da Merge branch 'vehicle_group_info' into jgrpp 2017-04-01 01:02:22 +01:00
peter1138
95cab27381 (svn r27826) -Fix (r27825): Wrong code style 2017-03-24 19:25:01 +00:00
peter1138
65d77ff317 (svn r27826) -Fix (r27825): Wrong code style 2017-03-24 19:25:01 +00:00
peter1138
0e68f9db70 (svn r27825) -Feature [FS#4950]: Add option to close windows with right click (Flamefire) 2017-03-24 18:55:16 +00:00
peter1138
d934ef9b00 (svn r27825) -Feature [FS#4950]: Add option to close windows with right click (Flamefire) 2017-03-24 18:55:16 +00:00
peter1138
48b9cbbb76 (svn r27816) -Fix [FS#6421]: Do not search directories when opening ini files as we already have their full path. 2017-03-20 19:30:49 +00:00
peter1138
73ea8cdb21 (svn r27816) -Fix [FS#6421]: Do not search directories when opening ini files as we already have their full path. 2017-03-20 19:30:49 +00:00
Jonathan G Rennison
064a36b319 Merge branch 'crashlog_improvements' into jgrpp 2017-02-19 12:57:55 +00:00
Jonathan G Rennison
102405e082 Fix recursive faults in Window crash logger due to message box event loop. 2017-02-19 12:56:56 +00: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
0d1e08ed75 Merge branch 'save_ext' into enhanced_viewport_overlay 
# Conflicts:
#	src/clear_cmd.cpp
 2016-12-26 15:35:01 +00:00
frosch
dbe969087d (svn r27712) -Codechange: Reduce recursions in DrawOverlappedWindow by limiting the area to the window bounds first. (adf88) 2016-12-25 17:56:57 +00:00
frosch
3419bff4ed (svn r27712) -Codechange: Reduce recursions in DrawOverlappedWindow by limiting the area to the window bounds first. (adf88) 2016-12-25 17:56:57 +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
761463d134 Merge branch 'template_train_replacement-sx' into jgrpp 
# Conflicts:
#	src/window.cpp
 2016-08-26 00:19:11 +01:00
frosch
0e3e4eeb53 (svn r27628) -Codechange: Prepare for drawing cursors consisting of multiple sprites. 2016-08-15 18:33:08 +00:00
frosch
3cb7d9703b (svn r27628) -Codechange: Prepare for drawing cursors consisting of multiple sprites. 2016-08-15 18:33:08 +00:00
Jonathan G Rennison
09291a3b74 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/blitter/32bpp_anim.cpp
#	src/rail_gui.cpp
#	src/saveload/saveload.cpp
#	src/train_cmd.cpp
#	src/vehicle_base.h
 2016-05-23 18:41:00 +01:00
frosch
51e274a523 (svn r27579) -Change [FS#6402]: Performance improvement for dedicated servers by skipping drawing calls earlier in the process. (JGR) 2016-05-22 11:30:25 +00:00
frosch
cade383f9b (svn r27579) -Change [FS#6402]: Performance improvement for dedicated servers by skipping drawing calls earlier in the process. (JGR) 2016-05-22 11:30:25 +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
ea3198cc25 Merge branch 'save_ext' into enhanced_viewport_overlay-sx 2015-11-18 23:33:00 +00:00
Jonathan G Rennison
8d19727c93 Merge branch 'save_ext' into jgrpp 
Conflicts:
	src/pathfinder/follow_track.hpp
 2015-10-31 10:53:00 +00:00
frosch
c74ffeecd1 (svn r27425) -Fix [FS#5842]: Crash when switching to or taking over companies, when an order window of a vehicle of the new company was opened. Now close those windows. 2015-10-30 17:23:16 +00:00
frosch
44d1fc4253 (svn r27425) -Fix [FS#5842]: Crash when switching to or taking over companies, when an order window of a vehicle of the new company was opened. Now close those windows. 2015-10-30 17:23:16 +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
rubidium
7cb07acd86 (svn r27185) -Fix: prevent the compiler from optimizing an assignment away which caused GCC 5 to actually crash 2015-03-13 20:54:35 +00:00
rubidium
06d7d63216 (svn r27185) -Fix: prevent the compiler from optimizing an assignment away which caused GCC 5 to actually crash 2015-03-13 20:54:35 +00:00
frosch
5ebc0c9934 (svn r27147) -Fix: Scale (non-custom) default window sizes according to GUI zoom. 2015-02-13 21:25:48 +00:00
frosch
1cf09f804b (svn r27147) -Fix: Scale (non-custom) default window sizes according to GUI zoom. 2015-02-13 21:25:48 +00:00
frosch
abe22e594d (svn r27146) -Fix: Make statusbar and chat-entry window use the same width as the toolbar. Otherwise they lack a size definition. 2015-02-13 21:13:45 +00:00
frosch
e113f5e4a1 (svn r27146) -Fix: Make statusbar and chat-entry window use the same width as the toolbar. Otherwise they lack a size definition. 2015-02-13 21:13:45 +00:00
peter1138
2655de52d7 (svn r26990) -Feature: Add option to choose normal, double or quad-size interface. 2014-10-11 13:22:37 +00:00
peter1138
253c91b17d (svn r26990) -Feature: Add option to choose normal, double or quad-size interface. 2014-10-11 13:22:37 +00:00
planetmaker
035fedd30b (svn r26815) -Change: Allow to set the granularity of the tooltip hover time in milliseconds instead of seconds. New default value is 250ms 2014-09-13 13:30:31 +00:00
planetmaker
61e129cc22 (svn r26815) -Change: Allow to set the granularity of the tooltip hover time in milliseconds instead of seconds. New default value is 250ms 2014-09-13 13:30:31 +00:00
alberth
ac23e46713 (svn r26610) -Feature: Select an editable preset name for saving. 2014-05-24 19:11:20 +00:00