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

422 Commits

Author SHA1 Message Date
Jonathan G Rennison
d715b7eb07 Merge branch 'improved_breakdowns-sx' into jgrpp 2015-09-27 23:18:40 +01:00
Jonathan G Rennison
cc79a4d0f8 Merge branch 'improved_breakdowns' into improved_breakdowns-sx 2015-09-27 23:17:58 +01:00
Jonathan G Rennison
eed722c777 Improved breakdowns: Remove non-deterministic changes to breakdown_chance. 
These cause desyncs in multiplayer.
 2015-09-27 23:16:43 +01:00
Jonathan G Rennison
bbc131ce47 Merge branch 'jgrpp' into save_ext_spp 
Conflicts:
	src/saveload/order_sl.cpp
 2015-08-26 23:26:18 +01:00
Jonathan G Rennison
805986811a Merge branch 'save_ext' into jgrpp 2015-08-26 19:08:18 +01:00
Jonathan G Rennison
659b6b7337 PATX settings: Various changes to support legacy compilers. 2015-08-26 19:00:45 +01:00
Jonathan G Rennison
b5c453b21e Add generic mechanism to cross-ref settings at load time. 
This is useful for loading settings from legacy/special versions,
where the corresponding setting is somewhere else and/or a PATX setting,
with duplicating all the info.
Use this to load SpringPP settings which have a corresponding setting.
 2015-08-17 20:11:30 +01:00
Jonathan G Rennison
4c6dc11c16 Merge branch 'infrastructure_sharing-sx' into jgrpp 
Conflicts:
	src/lang/english.txt
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/signal.cpp
	src/table/settings.ini
	src/vehicle.cpp
 2015-08-06 23:11:49 +01:00
Jonathan G Rennison
037cce3b38 Merge branch 'save_ext' into infrastructure_sharing-sx 
Conflicts:
	src/saveload/saveload.cpp
 2015-08-06 23:01:01 +01:00
Jonathan G Rennison
a4ad4130a6 Merge branch 'master' into infrastructure_sharing 
Conflicts:
	src/aircraft_cmd.cpp
	src/economy.cpp
	src/lang/english.txt
	src/order_gui.cpp
	src/roadveh_cmd.cpp
	src/saveload/saveload.cpp
	src/settings.cpp
	src/settings_gui.cpp
	src/train_cmd.cpp
 2015-08-06 22:55:09 +01:00
patch-import
ee791055f9 Import infrastructure sharing patch 
Strip trailing whitespace
Remove a leftover line form settings.ini

http://www.tt-forums.net/viewtopic.php?p=1008843#p1008843
 2015-08-06 22:24:28 +01:00
Jonathan G Rennison
174779e371 Merge branch 'save_ext' into enhanced_viewport_overlay-sx 
Conflicts:
	src/saveload/saveload.cpp
 2015-08-05 21:31:57 +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
b3e102fe52 Fix length mismatch in PATX loader. 2015-08-01 18:16:55 +01:00
Jonathan G Rennison
c57ffc64bc Settings update: add PATX chunk to store additional settings 
in an unordered format which is tolerant of extra, missing or reordered
settings.
 2015-08-01 12:58:53 +01:00
Jonathan G Rennison
17e8693e62 Initial stubs for extending the save/load version checking/upgrade code, 
with support for tests on individually versioned features as well as
savegame versions.
This is mainly for improved handling of features added to patchpacks.
The current status-quo of picking a random number for the savegame
version when releasing a patch breaks loading of savegames from newer
trunk savegame versions, with or without the same patch applied, as
savegame upgrade code is not run, which can also lead to crashes on load.
Instead don't change the savegame version (but set the high bit to
keep trunk versions away), but instead include the versions of individual
features using a separate mechanism.
 2015-08-01 12:26:22 +01:00
alberth
56c9765f72 (svn r27285) -Codechange: Use LG_ORIGINAL instead of a magic 0 to indicate the original landscape generator. 2015-05-16 12:01:19 +00:00
frosch
6cb930168f (svn r27163) -Fix [FS#6204]: Toolbars were not invalidated when changing max-vehicles settings. (adf88) 2015-02-22 15:26:27 +00:00
frosch
04b8fe6d0b (svn r27151) -Add: Allow changing max heightlevel in scenario editor. 2015-02-14 21:55:30 +00:00
peter1138
aa6fdf6f13 (svn r27004) -Codechange: Make GUI size apply to (sprite-font) text as well. 2014-10-12 20:43:25 +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
alberth
88d1d3c8c1 (svn r26611) -Feature: Save and load grfid and md5sum of newgrfs in config file (frosch) 2014-05-24 19:12:48 +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
699779324e (svn r26499) -Codechange: replace strndup with stredup 2014-04-24 18:37:39 +00:00
rubidium
a7e999ee20 (svn r26494) -Codechange: replace some further usages of s(n)printf with seprintf 2014-04-24 17:40:43 +00:00
rubidium
e2330f16ea (svn r26493) -Codechange: use strecat to concatenate script settings instead of manually accounting for the amount of characters that has been written 2014-04-24 04:41:54 +00:00
rubidium
6ecc602050 (svn r26486) -Codechange: replace a number of snprintfs with seprintf 2014-04-23 21:12:09 +00:00
frosch
24c7134bff (svn r26485) -Codechange: Replace ttd_strlcpy and ttd_strlcat with strecpy and strecat. 2014-04-23 20:44:42 +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
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
fonsinchen
111ecddb50 (svn r25358) -Codechange: save and load link graph jobs and the schedule 2013-06-09 13:02:05 +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
rubidium
afa894ba3e (svn r24996) -Change: Apply default service interval changes to vehicles without custom interval (peter1138) 2013-02-14 17:08:56 +00:00
rubidium
0f53f270c1 (svn r24968) -Fix [FS#5379]: company window was not updated when shared were enabled/disabled 2013-02-04 20:29:38 +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
planetmaker
dbaad927d7 (svn r24899) -Fix [FS#5434]: Also the station build window needs redrawing when the station spread changes (based on patch by juanjo) 2013-01-08 22:38:59 +00:00
planetmaker
54858c3fbd (svn r24894) -Fix [FS#5434]: Invalidate station selection window when station spread changes (based on patch by juanjo) 2013-01-08 17:44:39 +00:00
frosch
af74f3bb2d (svn r24860) -Codechange: Add SettingDesc::GetType(). 2012-12-26 17:43:35 +00:00
frosch
11bb1086bd (svn r24843) -Codechange: Move news display options into the general settings framework. (based on patch by eagle_rainbow) 2012-12-23 21:07:12 +00:00
michi_cc
37da99ab90 (svn r24833) -Codechange: Replace magic numbers for invalidating vehicle-related windows with an enum. 2012-12-20 19:44:02 +00:00
frosch
76fef0843c (svn r24790) -Remove: Classic difficulty profiles. 2012-12-05 19:36:41 +00:00
frosch
6516c85c82 (svn r24787) -Fix: Unify checks for editability of settings. 2012-12-05 19:35:09 +00:00
frosch
903294f2bb (svn r24786) -Codechange: Add SettingsProfile enum for difficulty profiles and highscore tables. 2012-12-05 19:34:45 +00:00
frosch
b77bb699da (svn r24250) -Fix [FS#5154]: Do not immediately display error messages from parsing the cfg file, but schedule them for displaying after the GUI is prepared for it. 2012-05-14 21:04:49 +00:00
frosch
51e7c489a3 (svn r24247) -Fix: If loading of int-list settings fails, use the default. 2012-05-14 20:53:39 +00:00
frosch
f214171d15 (svn r24193) -Fix (r24191): Also update comments accordingly. 2012-05-01 15:34:45 +00:00
frosch
43ac4de940 (svn r24192) -Fix [FS#5153-ish]: Also use default value when reading an invalid integer setting value. 2012-05-01 15:33:42 +00:00
michi_cc
adb1692f27 (svn r24146) -Fix [FS#5153]: Use default value when reading an invalid setting value. (Eddi) 2012-04-17 19:45:04 +00:00
michi_cc
123427749b (svn r24145) -Cleanup: Switch coding style. 2012-04-17 19:44:59 +00:00