dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,584 Commits 1 Branch 0 Tags
ee87b1d7d340514e8dfb0eccdff79fa54a32f5bf
Commit Graph

544 Commits

Author SHA1 Message Date
Jonathan G Rennison
ee87b1d7d3 Pause on savegame load if ctrl key is pressed. 2015-10-15 00:45:22 +01:00
Jonathan G Rennison
66cd454c37 Merge branch 'day_length-sx' into jgrpp 2015-09-27 23:18:33 +01:00
Jonathan G Rennison
26d0eb041d Increase thoroughness of vehicle and YAPF cache desync debug checks. 2015-09-27 23:16:12 +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
8b994e255d Merge branch 'extra_large_maps-sx' into jgrpp 
Conflicts:
	src/saveload/saveload.cpp
 2015-09-11 22:50:35 +01:00
Jonathan G Rennison
5d222e4d5e Merge branch 'extra_large_maps' into extra_large_maps-sx 
Conflicts:
	src/genworld_gui.cpp
	src/map_type.h
	src/newgrf_debug_gui.cpp
 2015-09-11 22:39:01 +01:00
patch-import
7d2b4bd3ea Import extra large maps patch. 
http://www.tt-forums.net/viewtopic.php?f=33&t=33137
 2015-09-11 19:53:08 +01: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
9565e5b9b1 Merge branch 'day_length-sx' into jgrpp 
Conflicts:
	src/lang/english.txt
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/timetable_cmd.cpp
 2015-08-09 13:51:36 +01:00
patch-import
d86a56cbef Import day length patch 
Minor whitespace fixes.

http://www.tt-forums.net/viewtopic.php?p=1148227#p1148227
 2015-08-09 11:23:15 +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
b6a1866ded Merge branch 'max_grfs' into jgrpp 2015-08-02 22:17:45 +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
Jonathan G Rennison
2bcbeea011 Merge branch 'progsig-sx' into jgrpp 
Conflicts:
	src/command.cpp
	src/command_type.h
	src/lang/english.txt
	src/rail_cmd.cpp
	src/rail_gui.cpp
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/saveload/saveload.cpp
	src/widgets/rail_widget.h
	src/window_type.h
 2015-08-02 18:15:18 +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
Jonathan G Rennison
5f1b148cf9 Initial minimal working tracerestrict implementation. 
This is a port of the tracerestrict/routing restrictions feature
from TTDPatch.
At present this implements if tests (train length only),
and pathfinder deny and penalty actions.
This requires the use of YAPF. Note that restrictions are only evaluated
within the YAPF lookahead distance.
 2015-07-28 01:36:52 +01:00
rubidium
876d87097a (svn r26828) -Fix: memory leak when passing -c multiple times 2014-09-16 17:14:07 +00:00
alberth
db47d62069 (svn r26729) -Feature: Warn about missing industries after generating a map. 2014-08-13 19:31:45 +00:00
rubidium
beb540ec55 (svn r26538) -Codechange: remove double accounting of the drivers 2014-04-28 21:06:51 +00:00
frosch
b2c786ea68 (svn r26522) -Add: A config-file-only setting to disable usage of 8bpp video modes. 
-Remove: [win32] fullscreen_bpp setting, which is replaced by above setting.
-Change: Disable usage of 8bpp blitters and video modes by default. Many modern OS and hardware cause issues with those.
 2014-04-27 12:15:14 +00:00
rubidium
034735a54c (svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL) 2014-04-25 15:40:32 +00:00
rubidium
b886c8db8c (svn r26506) -Codechange: replace most of vsnprintf with vseprintf 2014-04-24 19:51:45 +00:00
rubidium
6ecc602050 (svn r26486) -Codechange: replace a number of snprintfs with seprintf 2014-04-23 21:12:09 +00:00
rubidium
2be4215f43 (svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values 2014-04-23 20:13:33 +00:00
frosch
8771a19768 (svn r26371) -Fix [FS#5831]: Calling DoCommandP during the gameloop cleared pending persistent storage changes. 2014-02-23 22:03:08 +00:00
frosch
3403ade478 (svn r26369) -Fix-ish: Do not run scripts during command replay. 2014-02-23 19:32:00 +00:00
rubidium
cce01f8104 (svn r26326) -Fix [FS#5871]: when autosaving the message about a save already happening could be shown, even though the code's intention was to not show it (MJP) 2014-02-09 20:37:36 +00:00
frosch
eb6974179d (svn r26317) -Fix [FS#5897]: Check whether NewGRF change vehicle capacity when they are not supposed to, and truncate cargo appropiately if they are allowed to. 2014-02-07 23:48:56 +00:00
rubidium
4a911754b5 (svn r26209) -Codechange: remove some template magic and simplify some code 2014-01-02 22:41:58 +00:00
rubidium
5156c3731b (svn r26205) -Feature: SSE 4.1 sprite sorter, improving the sorting performance significantly (MJP) 
For example with GCC 4.8, x86_64 Linux, Intel i5-3337U this patch improves the performance of Pile, Treham and Hamac test save games by about 10% in over-all run time at fast forward at 1920x1080 when zoomed out and when trees are not disabled.
 2014-01-02 16:48:16 +00:00
frosch
35ecb9db3f (svn r26174) -Codechange: Rename BaseStorageArray to BasePersistentStorageArray 2013-12-23 18:09:03 +00:00
rubidium
f843a0b5d9 (svn r26107) -Codechange/cleanup: remove some coding bloat and simplify the driver factory instatiations 2013-11-25 14:26:46 +00:00
rubidium
cd2f85cfdb (svn r26099) -Codechange: make NewGRF scanner management slightly easier 2013-11-25 09:22:56 +00:00
rubidium
f9300ba6a2 (svn r26098) -Fix: close the log file when OpenTTD was forked and finally closed 2013-11-25 09:20:35 +00:00
rubidium
2b3d476efc (svn r26097) -Fix: another minor memory leak (when pressing cancel in the bootstrap window) 2013-11-25 09:12:49 +00:00
rubidium
4e34aae523 (svn r26091) -Fix (r26089): double frees... woospie 2013-11-24 16:21:19 +00:00
rubidium
d9a3177862 (svn r26089) -Fix: a number of minor memory leaks 2013-11-24 15:21:38 +00:00
frosch
6bb4748558 (svn r25570) -Add: cache for ParagraphLayouts. 2013-07-06 19:00:33 +00:00
rubidium
6272a35c0a (svn r25553) -Fix [FS#5530]: provide a warning when no vehicles are available, and tell what to do in that case 2013-07-02 18:57:26 +00:00
rubidium
17951f57a5 (svn r25506) -Document: a function, and name it slightly better 2013-06-28 21:11:35 +00:00
fonsinchen
97a9908b0e (svn r25354) -Add: link graph schedule and typedefs for LinkGraph and related classes 2013-06-09 12:58:37 +00:00
frosch
b172ed3578 (svn r25291) -Add: WindowDesc ability to load and store information in a config file. 2013-05-26 19:27:22 +00:00
peter1138
7bf898c81c (svn r24974) -Fix [FS#5279]: Honour pause_on_newgame setting when running as a dedicated server. 2013-02-05 21:41:32 +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
frosch
76fef0843c (svn r24790) -Remove: Classic difficulty profiles. 2012-12-05 19:36:41 +00:00
frosch
4d2ce0a035 (svn r24716) -Feature(ette): Reset engine pool when starting a scenario. 2012-11-12 20:13:51 +00:00
planetmaker
27551960cf (svn r24485) -Fix: Clarify description of command line option -n 2012-08-20 13:12:12 +00:00
frosch
7814956d4c (svn r24482) -Fix [FS#5232] (r24180): Do not call RebuildSubsidisedSourceAndDestinationCache() before subsidy savegame conversion is finished. 2012-08-18 11:38:06 +00:00
frosch
7ae3b0d332 (svn r24388) -Fix [FS#5233]: Do not consider not finding a particular base set critical; just load a different one and display an in-game error later on. 2012-07-08 18:41:50 +00:00