Jonathan G Rennison
580b2f7584
Merge branch 'template_train_replacement-sx' into jgrpp
...
Remove a duplicated declaration.
# Conflicts:
# projects/openttd_vs100.vcxproj
# projects/openttd_vs100.vcxproj.filters
# projects/openttd_vs140.vcxproj
# projects/openttd_vs140.vcxproj.filters
# projects/openttd_vs80.vcproj
# projects/openttd_vs90.vcproj
# source.list
# src/group_gui.cpp
# src/lang/english.txt
# src/network/network_command.cpp
# src/saveload/extended_ver_sl.cpp
# src/saveload/extended_ver_sl.h
# src/saveload/saveload.cpp
# src/train_cmd.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/vehicle_gui_base.h
# src/window_type.h
2016-02-14 17:55:51 +00:00
Jonathan G Rennison
6be2efc084
Update from KeldorKatarn branch
...
This approximately corresponds to 971ba4928a5c7c7916fea55d91a3b6dd5bba140c,
excluding the different virtual train build GUI, but including the basic
changes to the original train build GUI for multiplayer to work.
Fixup
2016-02-14 03:32:42 +00:00
Jonathan G Rennison
db2f08f86e
Merge branch 'master' into jgrpp
2015-12-15 20:36:54 +00:00
zuu
8660a2c2b1
(svn r27469) -Fix (r27468): Don't fetch all content info from content server when showing a online content window with exactly one type of content.
2015-12-10 19:58:33 +00:00
zuu
b22d6715cd
(svn r27469) -Fix (r27468): Don't fetch all content info from content server when showing a online content window with exactly one type of content.
2015-12-10 19:58:33 +00:00
zuu
566d7de6af
(svn r27468) -Fix (r27444): Game Scripts were not displayed in the content download window when opened from the AI/GS settings window.
2015-12-10 18:28:01 +00:00
zuu
aabc46712a
(svn r27468) -Fix (r27444): Game Scripts were not displayed in the content download window when opened from the AI/GS settings window.
2015-12-10 18:28:01 +00:00
Jonathan G Rennison
a3768d3a29
Label threads with a descriptive name where supported (pthreads).
2015-11-26 17:48:47 +00:00
Jonathan G Rennison
f6a8f27501
Make server and all clients run desync checks if a client desyncs.
2015-11-23 19:47:59 +00:00
Jonathan G Rennison
7ff6ad1e36
Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
2015-11-18 23:33:10 +00:00
Jonathan G Rennison
ea3198cc25
Merge branch 'save_ext' into enhanced_viewport_overlay-sx
2015-11-18 23:33:00 +00:00
zuu
0cff11130d
(svn r27444) -Add: When viewing online content of a particular type, hide content of other types unless they have been (auto)selected for download.
2015-11-14 15:57:15 +00:00
zuu
c9f1d82345
(svn r27444) -Add: When viewing online content of a particular type, hide content of other types unless they have been (auto)selected for download.
2015-11-14 15:57:15 +00:00
zuu
90b340e689
(svn r27443) -Fix: Negoation in comment was wrong.
2015-11-14 13:06:26 +00:00
zuu
4fcaee1fee
(svn r27443) -Fix: Negoation in comment was wrong.
2015-11-14 13:06:26 +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
7be7851b94
(svn r27421) -Fix [FS#6265]: Consider text and icon sizes when drawing the client list. (_dp_)
2015-10-30 16:19:33 +00:00
frosch
2c9117fbdd
(svn r27421) -Fix [FS#6265]: Consider text and icon sizes when drawing the client list. (_dp_)
2015-10-30 16:19:33 +00:00
Jonathan G Rennison
66cd454c37
Merge branch 'day_length-sx' into jgrpp
2015-09-27 23:18:33 +01:00
Jonathan G Rennison
f03cd98d04
Check/print tick skip counter in desync and random logging.
2015-09-27 23:12:00 +01:00
Jonathan G Rennison
531956bb4d
Merge branch 'house_placing' into jgrpp
2015-09-21 22:17:37 +01:00
rubidium
e8788019fa
(svn r27400) -Fix [FS#6368] (r26449): when a dedicated server was paused with no clients the tick length was increased significantly, making any assumptions about the tick length used further down in the code are not true anymore. One of such assumptions was that one should readvertise every 15 minutes worth of original ticks, but due to the lengthening this timeframe would be more like 45-60 minutes. Now we'll take the operating system's millisecond counter instead
2015-09-19 16:49:46 +00:00
rubidium
ff5c05c1b4
(svn r27400) -Fix [FS#6368] (r26449): when a dedicated server was paused with no clients the tick length was increased significantly, making any assumptions about the tick length used further down in the code are not true anymore. One of such assumptions was that one should readvertise every 15 minutes worth of original ticks, but due to the lengthening this timeframe would be more like 45-60 minutes. Now we'll take the operating system's millisecond counter instead
2015-09-19 16:49:46 +00:00
Jonathan G Rennison
c6854afcef
Pause the game instead of blocking when link graph jobs lag.
...
Check if the job is still running one date fract tick before it
is due to join and if so pause the game until its done.
This avoids the main thread being blocked on a thread join.
Show if pause is due to link graph job in status bar, update network
messages.
This does not apply for network clients.
2015-09-03 18:36:30 +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
patch-import
8f5ef2ae01
Import and rebase Max NewGRFs patch
...
Fix trailing whitespace, clean up code a bit
http://www.tt-forums.net/viewtopic.php?p=894743#p894743
2015-08-02 22:17:35 +01:00
frosch
4117c5b747
(svn r27304) -Fix [FS#6321-ish]: Improve password window layout for big font sizes.
2015-06-20 12:30:10 +00:00
frosch
fc50ff6531
(svn r27304) -Fix [FS#6321-ish]: Improve password window layout for big font sizes.
2015-06-20 12:30:10 +00:00
michi_cc
a41f197379
(svn r27288) -Fix: Slow network content GUI in MSVC Debug builds due to repeated string resolving.
2015-05-17 19:49:35 +00:00
michi_cc
95cb7c8692
(svn r27288) -Fix: Slow network content GUI in MSVC Debug builds due to repeated string resolving.
2015-05-17 19:49:35 +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
frosch
3d37abf802
(svn r27144) -Change: The chatbox-width setting now uses percent of screen width instead of pixels.
2015-02-12 20:00:23 +00:00
frosch
2f7de4fd99
(svn r27144) -Change: The chatbox-width setting now uses percent of screen width instead of pixels.
2015-02-12 20:00:23 +00:00
frosch
93fb724f87
(svn r27092) -Fix/Add [FS#6186]: Compilation on OS/2 (smedles)
2014-12-24 17:17:18 +00:00
frosch
396dde1636
(svn r27092) -Fix/Add [FS#6186]: Compilation on OS/2 (smedles)
2014-12-24 17:17:18 +00: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
rubidium
815576440c
(svn r26975) -Fix: reading too many bits when determining the client index for desync debug message
2014-10-07 17:32:29 +00:00
rubidium
f28ff446e9
(svn r26975) -Fix: reading too many bits when determining the client index for desync debug message
2014-10-07 17:32:29 +00:00
peter1138
6872b647f1
(svn r26960) -Codechange: Draw sort button symbols as sprites, and pad sort buttons with non-static width.
2014-10-05 11:20:02 +00:00
peter1138
0877f892c5
(svn r26960) -Codechange: Draw sort button symbols as sprites, and pad sort buttons with non-static width.
2014-10-05 11:20:02 +00:00
peter1138
a1929222d5
(svn r26923) -Codechange: Make multiplayer lobby fit to icon size.
2014-09-26 16:05:42 +00:00
peter1138
59076ee32b
(svn r26923) -Codechange: Make multiplayer lobby fit to icon size.
2014-09-26 16:05:42 +00:00
peter1138
01c30568e8
(svn r26921) -Codechange: Adjust content window listing to fit icon size.
2014-09-25 19:27:07 +00:00
peter1138
d9179d518e
(svn r26921) -Codechange: Adjust content window listing to fit icon size.
2014-09-25 19:27:07 +00:00
frosch
e00f4cac59
(svn r26788) -Add: Desync replay option to skip/replay failed commands
2014-09-07 14:21:16 +00:00
frosch
e2f5081f40
(svn r26788) -Add: Desync replay option to skip/replay failed commands
2014-09-07 14:21:16 +00:00
