Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-11 13:10:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,609 Commits 12 Branches 180 Tags 451 MiB
da2a263c5f
Commit Graph

22609 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan G Rennison
cbfdb4c94c Version: Committing version data for tag: jgrpp-0.3.1 2015-08-31 16:37:45 +01:00
Jonathan G Rennison
32dffceaa0 Merge branch 'order_occupancy-sx' into jgrpp 2015-08-31 16:36:02 +01:00
Jonathan G Rennison
e9d3e6fad2 Merge branch 'order_occupancy' into order_occupancy-sx 2015-08-31 16:35:34 +01:00
Jonathan G Rennison
0cf7428f85 Fix crash in competitor orders GUI. 
Fix attempt to set occupancy widget displayed pane in
competitors order GUI, where the occupancy widget is not present.
 2015-08-31 16:35:24 +01:00
Jonathan G Rennison
1723c0f302 Version: Committing version data for tag: jgrpp-0.3.0 2015-08-31 11:46:06 +01:00
Jonathan G Rennison
ce15bdc08f Merge branch 'save_ext_spp' into jgrpp 2015-08-31 10:22:39 +01:00
Jonathan G Rennison
44a41ba13e Fix traffic light removal not deleting animated tile. 2015-08-31 09:58:42 +01:00
Jonathan G Rennison
6e505ceab1 Fix missing template definition in company_settings. 2015-08-31 09:58:10 +01:00
Jonathan G Rennison
9287fa6554 Merge branch 'version_utils' into jgrpp 2015-08-31 01:51:52 +01:00
Jonathan G Rennison
1b8166b198 Enable embedding versioning info into the repo 
Add a script to write a .ottdrev style file: .ottdrev-vc, which also
includes a SHA-256 hash of the source tree.
Modify findversion.sh to use this file if no VCS info can be found,
and use the source tree hash to set the modified status.
Include leading digits of hash in version string if different,
this is to make it easier to distinguish between modified or
non-release versions.
Add function to create release tag and create/commit .ottdrev-vc
in one go.
 2015-08-31 01:51:01 +01:00
Jonathan G Rennison
60ba68cc69 Update departure board to handle changed minutes. 
Use scaled date ticks internally.
 2015-08-30 19:40:58 +01:00
Jonathan G Rennison
0b22a8e5c6 Changes to timetable GUI to handle minutes change. 
Use scaled date ticks internally.
Update date entry GUI.
 2015-08-30 19:38:52 +01:00
Jonathan G Rennison
29809f2001 Time in minutes is no longer scaled by day length. 
Time in minutes now based on the existing date ticks * the day length,
plus the tick skip counter, instead of just the date ticks.
Change the format of the {DATE_WALLCLOCK_*} string params
to use date ticks scaled by the day length, as above.
Update status bar clock.
 2015-08-30 18:54:59 +01:00
translators
ee8bee5e31 (svn r27390) -Update from WebTranslator v3.0: 
korean - 1 changes by telk5093
 2015-08-30 17:45:17 +00:00
Jonathan G Rennison
5d7ad2ba7b Merge branch 'vehicle_details_gui_additions' into jgrpp 
Conflicts:
	src/table/settings.ini
 2015-08-30 17:10:19 +01:00
Jonathan G Rennison
5a07315405 Add train length and group name to vehicle details window. 
Add settings to control each, default on.
Re-init window whenever presence of group name line changes.
 2015-08-30 17:09: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
8357b911e5 Merge branch 'more_cond_orders-sx' into jgrpp 
Conflicts:
	src/order_base.h
	src/order_gui.cpp
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
 2015-08-26 23:24:41 +01:00
Jonathan G Rennison
77bcd5f2c2 More conditional orders: Extended save/load changes. 2015-08-26 23:15:33 +01:00
Jonathan G Rennison
0372bfcda7 Merge branch 'save_ext' into more_cond_orders-sx 
Conflicts:
	src/saveload/saveload.cpp
 2015-08-26 23:08:51 +01:00
Jonathan G Rennison
33233e8575 Fix references to renamed variables. 
Update comment on Order::UpdateJumpCounter.
 2015-08-26 23:07:02 +01:00
Jonathan G Rennison
ffdd845b1c Merge branch 'master' into more_cond_orders 
Conflicts:
	src/order_base.h
	src/order_gui.cpp
	src/saveload/saveload.cpp
	src/saveload/saveload.h
 2015-08-26 22:51:47 +01:00
Jonathan G Rennison
ea5c33029b Fix various whitespace and style issues. 2015-08-26 22:49:08 +01:00
Jonathan G Rennison
218758fc86 Remove some of the Russian translations, as they are out-of-sync. 2015-08-26 22:35:09 +01:00
patch-import
c757a97214 Import more conditional orders patch 
http://www.tt-forums.net/viewtopic.php?p=1033223#p1033223
 2015-08-26 22:28:20 +01:00
Jonathan G Rennison
591d2ee8b9 Merge branch 'ingame_rivers' into jgrpp 
Conflicts:
	src/settings_gui.cpp
	src/settings_type.h
 2015-08-26 19:09:38 +01:00
Jonathan G Rennison
805986811a Merge branch 'save_ext' into jgrpp 2015-08-26 19:08:18 +01:00
Jonathan G Rennison
bdf0216bf0 Avoid closing nested templates with >> for backwards compatibility. 2015-08-26 19:07:48 +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
9c75a3c477 Enable building rivers in-game. 
Controlled by setting, default off.
 2015-08-25 23:44:28 +01:00
Jonathan G Rennison
e257b23cba Merge branch 'tracerestrict-sx' into jgrpp 2015-08-25 18:26:52 +01:00
Jonathan G Rennison
6c32cca5b9 Merge branch 'tracerestrict' into tracerestrict-sx 2015-08-25 18:26:37 +01:00
Jonathan G Rennison
38aaf8a921 Fix compilation on legacy compilers. 2015-08-25 18:22:18 +01:00
Jonathan G Rennison
58780fb109 Merge branch 'everest_treeline-sx' into jgrpp 2015-08-22 01:29:53 +01:00
Jonathan G Rennison
3caa662c77 Timetable GUI: Scale dates/times by day length factor. 2015-08-22 01:21:55 +01:00
Jonathan G Rennison
010c290511 Departures: Scale dates in departures window by day length factor. 2015-08-22 00:36:28 +01:00
Jonathan G Rennison
803e8970c3 Departures: Fix major memory leak in MakeDepartureList. 2015-08-21 23:33:48 +01:00
Jonathan G Rennison
c6f38acbd6 Departures: Fix indentation/whitespace issues. 2015-08-21 23:06:52 +01:00
Jonathan G Rennison
64a6f5c0d4 Merge branch 'jgrpp' into save_ext_spp 2015-08-21 23:00:57 +01:00
Jonathan G Rennison
efb1ba3337 Add GUI settings and setting/help texts. 
Move tree-related functions into their own GUI sub-category.
 2015-08-21 21:17:18 +01:00
Jonathan G Rennison
381d11096f Bin no_trees_on_this_level, use exp. decay away from snow line. 
Probability of placing an arctic tree is now an exponential decay
function of height distance from the snow line, instead of the previous
50% blocks.
This results in a more gradual thinning out of arctic trees in
each direction.
The algorithm is: p = exp(-3 * distance / range_setting),
using a rather crude approximation of the exponential function.

The no_trees_on_this_level setting is not really useful, and its
dual behaviour to disallow discrete height levels and turn on the
snow line behaviour is unintuitive.
Replace it with a simple on/off setting.
 2015-08-21 21:17:18 +01:00
Jonathan G Rennison
3b120c6cbd Merge branch 'save_ext' into everest_treeline-sx 2015-08-21 18:16:30 +01:00
Jonathan G Rennison
efe85200f0 Import Everest treeline patch 2015-08-21 18:16:15 +01:00
frosch
8c389a2a96 (svn r27389) -Fix: There are two different availability conditions for fdatasync in the manpage. Use them both, since at least on some MinGW versions one is not enough. 2015-08-20 20:47:45 +00:00
translators
8f36c49ffa (svn r27388) -Update from WebTranslator v3.0: 
dutch - 4 changes by TheTycoonist
 2015-08-20 17:45:15 +00:00
Jonathan G Rennison
f2d0c3a441 Merge branch 'tracerestrict-sx' into jgrpp 
Conflicts:
	src/gfxinit.cpp
	src/rail_cmd.cpp
	src/table/sprites.h
 2015-08-20 00:39:26 +01:00
Jonathan G Rennison
6643d0a661 Merge branch 'tracerestrict' into tracerestrict-sx 2015-08-20 00:38:06 +01:00
Jonathan G Rennison
46817994bf Include GRFs in bundle output. 2015-08-20 00:36:54 +01:00
Jonathan G Rennison
8faead7e7a Graphically indicate restricted signals by recolouring the signal post. 
Recolour signal posts from grey to blue for restricted signals which
are not semaphores and are not custom sprites.
 2015-08-19 21:56:22 +01:00
Jonathan G Rennison
88d45e5e2c Clear rail ageing data on load. 2015-08-19 19:09:25 +01:00