dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
46,908 Commits 1 Branch 0 Tags
b80c3198ccd52f69bfcb74bebc505149b3fb6e42
Commit Graph

1099 Commits

Author SHA1 Message Date
Jonathan G Rennison
b457c67ac1 Update project info. 2015-11-01 11:17:39 +00:00
Jonathan G Rennison
44d545d220 Merge branch 'master' into departure-boards 2015-11-01 11:17:14 +00: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
ddcb3bf560 Update project files. 2015-09-11 15:16:19 +01:00
Jonathan G Rennison
ef5ecdb2c7 Merge branch 'git_findversion_fix' into save_ext 2015-08-16 14:27:46 +01:00
Jonathan G Rennison
6088c7fc24 Merge branch 'tracerestrict' into tracerestrict-sx 2015-08-15 00:32:15 +01:00
Jonathan G Rennison
29c4f244f3 Merge branch 'master' into tracerestrict 
Conflicts:
	src/pathfinder/yapf/yapf_costrail.hpp
 2015-08-15 00:28:14 +01:00
Jonathan G Rennison
19764bb4fb Merge branch 'enhanced_viewport_overlay-sx' into jgrpp 2015-08-11 21:41:58 +01:00
Jonathan G Rennison
88c150abf7 Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx 2015-08-11 21:41:48 +01:00
Jonathan G Rennison
388dab7390 Merge branch 'master' into enhanced_viewport_overlay 
Conflicts:
	src/road_gui.cpp
	src/widgets/dropdown.cpp
 2015-08-11 21:41:41 +01:00
michi_cc
f4cd0198f4 (svn r27382) -Add: [Win32] Project files for Visual Studio 2015. 2015-08-10 20:36:57 +00:00
michi_cc
9f5503ba8f (svn r27382) -Add: [Win32] Project files for Visual Studio 2015. 2015-08-10 20:36:57 +00: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
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
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
bc8b2d9826 Merge branch 'save_ext' into tracerestrict-sx 2015-08-03 00:14:51 +01:00
Jonathan G Rennison
6452b0fe02 Merge branch 'departure-boards-sx' into jgrpp 
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/window_type.h
 2015-08-02 18:23:25 +01:00
Jonathan G Rennison
6596ba216c Merge branch 'zoning' into jgrpp 
Conflicts:
	src/table/sprites.h
 2015-08-02 18:20:23 +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
Jonathan G Rennison
de76316634 Merge branch 'tracerestrict-sx' into jgrpp 2015-08-02 17:59:10 +01:00
patch-import
6de087786c Import and rebase zoning patch 
Fix some of the whitespace issues

http://www.tt-forums.net/viewtopic.php?p=888801#p888801
 2015-08-02 13:17:42 +01:00
Jonathan G Rennison
00f9f75d34 Merge branch 'save_ext' into departure-boards-sx 2015-08-01 20:40:49 +01:00
Jonathan G Rennison
526cb42608 Merge branch 'master' into depature-boards 
Conflicts:
	src/table/strgen_tables.h
 2015-08-01 20:39:16 +01:00
patch-import
79138de1b9 Import departure boards patch 2015-08-01 19:48:19 +01:00
Jonathan G Rennison
36d5b874da Update project files 2015-08-01 17:22:34 +01:00
Jonathan G Rennison
b1d8bcfe35 Merge branch 'save_ext' into progsig-sx 
Conflicts:
	source.list
	src/saveload/saveload.cpp
 2015-08-01 17:21:38 +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
71012789d2 Update project listings. 2015-07-28 01:51:31 +01:00
frosch
67ae231f1b (svn r27340) -Fix [FS#6338]: Silence warning by moving _string_colourmap to a file no its own. (Cif) 2015-07-26 09:47:17 +00:00
frosch
4830497f0b (svn r27340) -Fix [FS#6338]: Silence warning by moving _string_colourmap to a file no its own. (Cif) 2015-07-26 09:47:17 +00:00
frosch
4b39e3d98c (svn r27152) -Fix: Generated files. 2015-02-15 14:56:21 +00:00
frosch
83a02da380 (svn r27152) -Fix: Generated files. 2015-02-15 14:56:21 +00:00
frosch
3ea4eebe9a (svn r26995) -Fix: Add missing files to source.list 2014-10-11 21:38:32 +00:00
frosch
b8690523d2 (svn r26995) -Fix: Add missing files to source.list 2014-10-11 21:38:32 +00:00
planetmaker
ff71a8f5c9 (svn r26993) -Feature: Latin translation (Supercheese) 2014-10-11 21:30:33 +00:00
planetmaker
f7df63fbf9 (svn r26993) -Feature: Latin translation (Supercheese) 2014-10-11 21:30:33 +00:00
rubidium
8ab4f746f2 (svn r26864) -Codechange: bring a bit more OO into the disaster vehicles 2014-09-20 15:46:44 +00:00
rubidium
9e0f4b3847 (svn r26864) -Codechange: bring a bit more OO into the disaster vehicles 2014-09-20 15:46:44 +00:00
rubidium
6a1ed21342 (svn r26853) -Cleanup [Squirrel]: remove some stuff that we never did and especially never should use 2014-09-19 20:06:51 +00:00
rubidium
79ca66eb67 (svn r26853) -Cleanup [Squirrel]: remove some stuff that we never did and especially never should use 2014-09-19 20:06:51 +00:00
michi_cc
7f9e7b1a08 (svn r26654) -Fix (r26482): Header file missing from sources.list. 2014-06-17 20:09:00 +00:00
michi_cc
5ba1a7f323 (svn r26654) -Fix (r26482): Header file missing from sources.list. 2014-06-17 20:09:00 +00:00
michi_cc
616da05c3e (svn r26339) -Revert (r26305): Accidental changes to the VS9.0 solution file disabling the x64 build. 2014-02-15 15:01:32 +00:00
michi_cc
7d56fd5382 (svn r26339) -Revert (r26305): Accidental changes to the VS9.0 solution file disabling the x64 build. 2014-02-15 15:01:32 +00:00
zuu
ea7483a419 (svn r26305) -Add: [nogo] ScriptStoryPageElementList() - a list of all story page elements for a given page 2014-02-06 19:41:56 +00:00