Commit Graph

557 Commits

Author SHA1 Message Date
Jonathan G Rennison
33cd1569f4 Merge branch 'chunnel' into jgrpp 2017-03-19 12:30:26 +00:00
Jonathan G Rennison
4af4cbc2a4 Chunnel: Update project files 2017-03-19 12:30:14 +00:00
Jonathan G Rennison
b3fd11efd2 Merge branch 'master' into jgrpp
# Conflicts:
#	src/blitter/32bpp_anim.cpp
#	src/blitter/32bpp_anim.hpp
#	src/blitter/32bpp_anim_sse4.cpp
2017-03-19 12:27:24 +00:00
Jonathan G Rennison
fae4ac1a5d Merge branch 'master' into save_ext
# Conflicts:
#	src/saveload/company_sl.cpp
#	src/saveload/saveload.cpp
2017-03-19 12:12:52 +00:00
michi_cc
9a62317dfc (svn r27791) -Fix (r27790) [FS#6366]: Try #2. Now also for Visual Studio 2010. 2017-03-13 21:56:38 +00:00
michi_cc
2d45d55925 (svn r27790) -Fix [FS#6366]: [Win32] Mark OpenTTD as DPI-aware to avoid OS window scaling that breaks mouse input. 2017-03-13 20:21:40 +00:00
Jonathan G Rennison
df3c10c523 Merge branch 'infrastructure_sharing' into jgrpp
# Conflicts:
#	src/infrastructure.cpp
#	src/order_cmd.cpp
2017-02-22 20:58:39 +00:00
Jonathan G Rennison
f3b1059930 Fix order removal due to shared-infra company deletion.
Order totals were not updated correctly, implicit orders not handled
properly, etc.
Create generic function for vehicle order filtering.
Use for station deletion and infra sharing company deletion.
2017-02-22 20:58:24 +00:00
Jonathan G Rennison
a67ecb4f6e Merge branch 'cpp-11' into jgrpp 2017-02-08 22:03:52 +00:00
Jonathan G Rennison
8f3e0c4fe5 Add a custom arena allocator utility. 2017-02-08 21:46:50 +00:00
Jonathan G Rennison
76de8f9b13 Merge branch 'cpp-btree' into jgrpp
# Conflicts:
#	projects/openttd_vs100.vcxproj
#	projects/openttd_vs100.vcxproj.filters
#	projects/openttd_vs140.vcxproj
#	projects/openttd_vs140.vcxproj.filters
#	source.list
2017-02-07 22:29:44 +00:00
Jonathan G Rennison
3d0ed3547b Update source.list and project files with btree headers. 2017-02-07 19:16:20 +00:00
Jonathan G Rennison
f82feb160f Merge branch 'signal_tunnels_bridges' into jgrpp
# 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/misc.cpp
#	src/openttd.cpp
#	src/pbs.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/saveload.cpp
#	src/signal.cpp
#	src/train_cmd.cpp
#	src/tunnelbridge_map.h
2016-09-18 20:07:48 +01:00
Jonathan G Rennison
556594f2f0 Extend bridge signal simulation to support an unlimited no. of signals.
This is instead of the previous limit of 16, all stored in M2.
2016-09-18 20:06:59 +01:00
Jonathan G Rennison
5e67582a64 Merge branch 'save_ext' into jgrpp
# Conflicts:
#	config.lib
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/saveload.cpp
2016-09-07 22:02:57 +01:00
Jonathan G Rennison
a6e0b1ac7d Merge branch 'cpp-11' into save_ext 2016-09-05 23:17:02 +01:00
Jonathan G Rennison
6e9ea59ab5 Add a simple scope guard include file. 2016-09-05 23:16:47 +01:00
Jonathan G Rennison
e6c7134935 Merge branch 'master' into save_ext
# Conflicts:
#	src/saveload/saveload.cpp
2016-09-02 22:21:28 +01:00
Jonathan G Rennison
f3e0da1e63 Update project files. 2016-07-01 18:33:27 +01:00
Jonathan G Rennison
80e3af6bf5 Merge branch 'tracerestrict-sx' into jgrpp
# Conflicts:
#	src/lang/english.txt
#	src/saveload/extended_ver_sl.cpp
#	src/tracerestrict.cpp
#	src/tracerestrict.h
#	src/tracerestrict_gui.cpp
2016-06-30 20:25:22 +01:00
Jonathan G Rennison
e4b932d53a Merge branch 'tracerestrict' into tracerestrict-sx 2016-06-30 20:15:27 +01:00
Jonathan G Rennison
b11d48b431 Update project files 2016-06-30 18:37:39 +01:00
Jonathan G Rennison
74ff8b9e8e Merge branch 'crashlog_improvements' into jgrpp
# Conflicts:
#	Makefile.src.in
2016-06-12 21:21:55 +01:00
Jonathan G Rennison
0951cb320c Show ./configure invocation in crash log. 2016-06-10 23:39:26 +01:00
Jonathan G Rennison
eac2f0720c Merge branch 'master' into jgrpp 2016-05-09 21:51:04 +01:00
frosch
b21e13a2a4 (svn r27553) -Update: Project files 2016-04-30 14:33:36 +00:00
Jonathan G Rennison
3da991bf9b Merge branch 'master' into jgrpp
# Conflicts:
#	src/rail_gui.cpp
2016-04-19 22:48:33 +01:00
frosch
e7e6b45d89 (svn r27542) -Fix (r27367) [FS#6427]: ICU got disabled for Windows builds. 2016-04-17 16:50:37 +00:00
Jonathan G Rennison
0779c7b7a9 Merge branch 'template_train_replacement-sx' into jgrpp
# Conflicts:
#	src/build_vehicle_gui.cpp
#	src/saveload/afterload.cpp
2016-02-16 21:08:21 +00:00
Jonathan G Rennison
f3e01f4c6d Merge branch 'template_train_replacement' into template_train_replacement-sx 2016-02-16 21:06:57 +00:00
Jonathan G Rennison
98fc4493c8 TBTR: Delete duplicated build vehicle window.
Add a virtual train mode to the existing build vehicle window.
Simplify some of the inter-window notify logic.
Disable all buttons when a new template/edit is in progress.
2016-02-15 19:17:30 +00:00
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
671c12999e Merge branch 'template_train_replacement' into template_train_replacement-sx
# 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
2016-02-14 17:40:39 +00:00
Jonathan G Rennison
7ae0c6de5a Remove TBTR replace all files, they are not used. 2016-02-14 17:39:36 +00:00
Jonathan G Rennison
769462f537 Squashed commit of the following:
commit b17f39a2016dc11a6a9815f398d690d82a6a59aa
Merge: 67b3190 3bb7c47
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Fri Feb 12 19:44:34 2016 +0100

    Merge branch 'merge/trunk27506' into dev

commit 3bb7c4768580198b7316bfeebc4b870d355439e8
Merge: 14929fe 9db36bd
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Fri Feb 12 19:43:53 2016 +0100

    Merge remote-tracking branch 'openttd/master' into merge/trunk27506

commit 14929fe3536e2aa5b4d6a43d0d55043da7a2f252
Merge: af15609 4b8c698
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Wed Feb 10 22:14:25 2016 +0100

    Merge branch 'master' into merge/trunk27506

commit 67b319060b4b88b72c94b0e0c2c9fdcf1c2fd95d
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sat Feb 28 20:17:13 2015 +0100

    removed 2 unused function calls

commit af15609c938eb388dd507b16fb7b6d547c54c2da
Merge: 5465c88 b251ba3
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sat Feb 28 15:12:33 2015 +0100

    Merge branch 'trunk' into merge_trunk

commit 5465c88c8016c5e7910570ab5795222e8348c703
Author: me <streen01@gmx.de>
Date:   Sat Feb 28 10:59:41 2015 +0100

    regenerated MSVS project files

    forgot to do this, they still retained the old filenames

commit 0391455e29c5ed794fcd0f58c63ff98dc52685ac
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Thu Feb 26 16:53:05 2015 +0100

    removed the patch files from this repo again

    that was a rather dum idea, it made the difference patch between
    branches trunk and tbtr huge.
    the patch files are now being tracked again in the supplimentary repo
    'tbtr_proj', that will keep this fork clean and creating diff-patches
    will be much easier

commit 8395d40386c8d620c90fb4be66cf6679408ac975
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Thu Feb 26 16:27:40 2015 +0100

    fix for reported bug by DC-1: crash in station gui

    the template gui item was added to the drop-down list that was also
    shown in a station gui, but there was no action present when this item
    was selected in a station gui. per default the game would commit suicide
    by called NOT_REACHED() at the default case of the according
    switch-statement.

commit 833873245d33bd77105a82a584d9bec2362419bc
Merge: 39596be 8688c95
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Thu Feb 26 15:08:53 2015 +0100

    Merge branch 'fix_disableTemplateOrderCheck' into tbtr

commit 8688c95a01ed5933a35a08597bbf45ff148f5a67
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Thu Feb 26 15:06:25 2015 +0100

    added fix by DC-1

    don't check the orders list of a virtual vehicle

commit 39596beff9a815a0f9b2ea3abe5d82c3ec5933e7
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sun Feb 22 10:47:58 2015 +0100

    added history of patches for the mod

commit b3ae74ac4e9143202a1fda1333a91c3716ebb21e
Merge: 9a601a1 ee756e1
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sun Feb 22 10:03:04 2015 +0100

    Merge branch 'tbtr' into merge_tbtr

commit ee756e1c2229534f1cc05edb97269b0c83ddde66
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Feb 17 22:25:50 2015 +0100

    removed nonsensical comments + disabled code

commit e7d37f0500c56c84a36ce8b93eafb31f800e1086
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Feb 17 21:30:38 2015 +0100

    added some missing renames in includes

commit 63c2b13766b077e4f2923f321e95d53356dee2db
Merge: e92e6ba 9752606
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Feb 17 21:22:11 2015 +0100

    Merge branch 'feat_renameFiles' into merge_renameFiles

    Conflicts:
    	src/tbtr_template_gui_create_virtualtrain.cpp

commit 975260643d212f8cac72485f2011011210622849
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Mon Feb 9 22:11:18 2015 +0100

    replaced source file prefix: aaa -> tbtr

commit e92e6ba7089564886d17dd5c1fd8d85ea0ca4ac7
Merge: 62d2f80 ac16eab
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sun Feb 8 15:02:19 2015 +0100

    Merge branch 'rm_TODOs' into dev

    Conflicts:
    	src/aaa_template_gui_main.cpp

commit 62d2f809edf170cfbeb0599822c4c3d4f9a1fefe
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sun Feb 8 14:59:36 2015 +0100

    i++ -> ++i

commit ac16eabc082f62b9fe2ef6c11a314f8e9a28c26b
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sun Feb 8 14:34:36 2015 +0100

    rm'ed TODOs

commit 22f642f32265882b8f99b409b517823991c08101
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sun Feb 8 14:17:49 2015 +0100

    rm TODO

    yes, depends on the selected template because the button "Start
    replacing" means, to start the replacement for the currently selected
    group and template (create a templatereplacement object for this
    combination)

commit 60d8192838e340a3cf6899979361c997df73b716
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sun Feb 8 14:17:26 2015 +0100

    rm'ed TODO: included task in TODO-list

commit 39e42674ac9f5ad5dd056b613e80ef4e754c1153
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sun Feb 8 11:19:36 2015 +0100

    changed window class in use: WC_NONE -> WC_TEMPLATE_GUI_MAIN

commit cadfac96e21aeb862b75e0454197ddce89fb728c
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Mon Jan 26 23:18:29 2015 +0100

    removed a weird call to deleteAllTmplReplacements

    was a TODO task, it was set to delete all template replacements
    belonging to group with id -1, which does not exist, ever

commit dc1058464c29f61b6197dec556ec468d1ff38451
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sun Jan 25 23:27:03 2015 +0100

    removed some TODOs

commit 7afeb17db512600424039099a0f4bd78882fcd8e
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sun Jan 25 11:35:47 2015 +0100

    removed all MYGUI comments

    tried to replace them with useful comments where necessary
    added a few new TODOs here and there

commit 6b9453224a77811062254e6bce7dac4074b829a8
Merge: 292a5aa 687bc4c
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sun Jan 18 20:47:06 2015 +0100

    Merge branch 'fix_compiler_warnings' into dev

commit 687bc4c34fbb9ddeaf15b4857b235a9709dd85be
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sun Jan 18 20:43:26 2015 +0100

    fixed all remaining warnings

commit ada08d7097772e325b7852fd058d8bad7036ae4d
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sun Jan 18 18:25:45 2015 +0100

    removed testing code that produced a warning

commit f3b1568384f36998aeb1fa51c1fab4cfb96c7f93
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sun Jan 18 00:07:34 2015 +0100

    removed unused variable REPLACEMENT_IN_PROGRESS

commit 5aa9098880070cfaa3d2815f445497b2886933f9
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sun Jan 18 00:02:43 2015 +0100

    removed variable 'mode' from ClickedOnVehicle()

    member function of class TemplateCreateWindow
    in the depot gui the mode variable is used to decide whether a vehicle
    is started or dragged or ...

    here, we only drag so the mode is never used

commit 292a5aa9dba9cf1d0003e84055fb95357f922454
Merge: 8f6df8c 2bb12bc
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Wed Jan 14 23:41:29 2015 +0100

    Merge branch 'feat_mergePatch0.4c' into dev

commit 2bb12bcf283cccc8869bf537b79b22f479cb7203
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Wed Jan 14 23:32:04 2015 +0100

    added vi's .swp files to .gitignore

commit aecf6f549b32f92342f8e0b65158bebef6270537
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Jan 13 20:15:25 2015 +0100

    corrected UpdateViewport code

    was VehicleUpdateViewport(Vehicle*, bool) before
    is  Vehicle::UpdateViewport(bool, bool) now

commit ae199283fd5ac0199cef1c4c980561122d030199
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Mon Jan 12 22:34:22 2015 +0100

    updated code for EngineNumberSorter

commit 9735035c6dd4ded9bb76958722dc25e26ced5f05
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sun Jan 11 18:36:17 2015 +0100

    removed unused parameter 'part_of_chain'

    from cargo movement code

commit b8b86e1f2592288ddcfb46a0a5d81c3257da60d3
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sun Jan 4 21:44:17 2015 +0100

    Reimplemented moving of cargo

    - uses the new shift function
    - manages to spread the old cargo of replaced vehicles from a chain across the memebers of the newly constructed chain

    some TODOs are left within the code and some testing needs to be done,
    how this behaves when there is more than one vehicle being replaced

commit 0d76e1bfe10ef207ac5e4018976e9fba0b0bb25e
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sat Jan 3 01:05:54 2015 +0100

    fixed saveload code for TemplateVehicle

commit ba0ea6975f48fe38c2b5376ebc83c23d6bb6151c
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Fri Jan 2 11:32:23 2015 +0100

    final changes for the merge

    - removed the WDF_UNLICK_BUTTON
    - updated ctor calls to Window()
    - disabled the engine number sorter

commit 9cc213335046b3febfe6649fde40b00e1bb43d5b
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Fri Jan 2 11:29:03 2015 +0100

    disabled cargo movement during templrpl

    need to reimplement this step since the cargo is now moved
    packet-by-packet and not as a complete list from a vehicle onto another
    vehicle anymore

commit 39743806d0156f8547670c525af0e59083dbcd49
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Fri Jan 2 11:16:54 2015 +0100

    replaced cargo function 'Count'

    - not available anymore: VehicleCargoList::Count()
    - using StoredCount() for now, should check if this is the correct count

commit 9b240bbf9b2ee5659bbcb518e9e2767103861254
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Fri Jan 2 01:27:56 2015 +0100

    final corrections for template_gui_create_virtualtrain

commit cf0d48d8fa052ff521e1fac0ec75d75107c9b76e
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Fri Jan 2 01:20:30 2015 +0100

    disbabled usage of not-anymore-existing newgrf_engine.h::ListPositionOfEngine

commit 81da16b7f0c3ea2417b24707329d1d971a67e82e
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Fri Jan 2 01:09:53 2015 +0100

    fixed typo in value WID_BV_SORT_ASSENDING_DESCENDING

commit c8f81a5c3df5ccf4858bda64a53979af510ccd87
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Fri Jan 2 01:09:25 2015 +0100

    create_virtual_train: uint GetEngineListHeight not static

commit bd29d99f80bd824e28104f3bc839fc2a5abdd297
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Fri Jan 2 00:57:25 2015 +0100

    template_gui_create: static WindowDesc not const

commit edee9c1c544845459102328209b98d424cfd3248
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Fri Jan 2 00:44:50 2015 +0100

    updated call to Window::FinishInitNested

commit 25fc3cb7ed6db15f42bd3fdff9506621fbba3d72
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Thu Jan 1 23:56:48 2015 +0100

    updated ctor calls for classes derived from Window

    - first param in the constructor used to be const WindowDesc*, now it is
      WindowDesc*

commit 54d710170f1ce9cf5539cd525744ca61f4089e7b
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Thu Jan 1 02:50:29 2015 +0100

    updated constr calls to WindowDesc::WindowDesc

    need a const char* at 2nd pos now

commit 7c954141f00666dec4c9559019a1a4af3b452372
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Wed Dec 31 02:30:02 2014 +0100

    applied patch vehicle.cpp

commit aa12720049a3dfb1c2e02d453813bd567b67ff60
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Wed Dec 31 02:22:54 2014 +0100

    applied patch vehicle_gui.cpp (failed hunks 2,4,5/6)

commit 2b8e70f15478072264f1e063418f8de0744a98e1
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Wed Dec 31 02:13:29 2014 +0100

    applied patch train_cmd.cpp (failed hunk 1/8)

commit 47499523bf1ed0cce5fdf6cc2a7102e571dcb07d
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Wed Dec 31 02:07:00 2014 +0100

    applied patch newgrf_engine.cpp

commit 7a40c62a7b5ab8059981270252a7def69eacb7d7
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Wed Dec 31 02:02:52 2014 +0100

    applied patch vehicle_cmd.cpp (failed hunks 2,3/3)

commit 277839abd8cb7eb277e4ed6cb72e0f3da5b7e479
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Wed Dec 31 01:56:35 2014 +0100

    applied patch saveload.h (failed hunk 1/1)

commit 7b64c87ad3dede6442a88dafa5aa8a6a3e0db812
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Wed Dec 31 01:53:56 2014 +0100

    applied patch group_gui.cpp (failed hunks 2,3/4)

commit 8075261c526004e21534fa0ab80429132d5f634b
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Wed Dec 31 01:46:24 2014 +0100

    applied patch vehiclelist.cpp (failed hunk 1/2)

commit b1c197c0f38e45fb50dad7f7e33f1438b150a34f
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Wed Dec 31 01:42:04 2014 +0100

    applied patch train.h (failed hunk 1/3)

commit 81bfa209e92fa74387420cc85851767d2737c1b0
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:43:10 2014 +0100

    applied patch viewport.cpp.patch (file src/viewport.cpp)

commit 5c083054544eabac9260a75033198c665b169215
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:43:10 2014 +0100

    applied patch train_gui.cpp.patch (file src/train_gui.cpp)

commit 3c3534621c6b37530035faadfa092d70fed724c9
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:43:10 2014 +0100

    applied patch source.list.patch (file source.list)

commit 6bbb071431882d4bab43023f7194f96c824e78e5
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:43:10 2014 +0100

    applied patch saveload_internal.h.patch (file src/saveload/saveload_internal.h)

commit 158640eb786cc7867c9e689eb8a92a209e528a83
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:43:10 2014 +0100

    applied patch saveload.cpp.patch (file src/saveload/saveload.cpp)

commit e171ad716c126e98bc045f5ce574ac6161f3ab4f
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:43:10 2014 +0100

    applied patch openttd_vs90.vcproj.patch (file projects/openttd_vs90.vcproj)

commit b77486d89c12a80f73f088759da760abd0af7f49
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:43:10 2014 +0100

    applied patch openttd_vs80.vcproj.patch (file projects/openttd_vs80.vcproj)

commit 57f9c52fc580da51e20bd40f116fe66c9a0f3669
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:43:10 2014 +0100

    applied patch openttd_vs100.vcxproj.patch (file projects/openttd_vs100.vcxproj)

commit bda1f739a415600a7f522b1c7f9ca53fa7713ed3
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:43:10 2014 +0100

    applied patch openttd_vs100.vcxproj.filters.patch (file projects/openttd_vs100.vcxproj.filters)

commit ed96771b03e726e5cb56cac9a8328c3a1e63856b
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:43:10 2014 +0100

    applied patch newgrf_spritegroup.cpp.patch (file src/newgrf_spritegroup.cpp)

commit 3df57e0d855fef5f54be4fd8d25e231a7eb3c3f1
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:43:10 2014 +0100

    applied patch group_cmd.cpp.patch (file src/group_cmd.cpp)

commit da31ca4b67d6993f127c6cecac717eb286ead4e6
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:43:09 2014 +0100

    applied patch english.txt.patch (file src/lang/english.txt)

commit ddc0af7139fccbae4060c70440f17c763e3bba96
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:43:09 2014 +0100

    applied patch depot_gui.cpp.patch (file src/depot_gui.cpp)

commit 88aca9db192c6a2b92185f56505caf8b91d23ab4
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:43:09 2014 +0100

    applied patch autoreplace_cmd.cpp.patch (file src/autoreplace_cmd.cpp)

commit 45ca80f7c9847ac3afe181a0badeb12bbbd5ed0d
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:43:09 2014 +0100

    applied patch articulated_vehicles.cpp.patch (file src/articulated_vehicles.cpp)

commit 44bd0bf2e77f366b61f96b0f4ca564f2e2e5814a
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:43:09 2014 +0100

    applied patch afterload.cpp.patch (file src/saveload/afterload.cpp)

commit 679f9b327f9d3f3bec327ae0266f289981972c85
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:43:09 2014 +0100

    applied patch aaa_template_veh_sl.cpp.patch (file src/saveload/aaa_template_veh_sl.cpp)

commit ebcec221ec7c1988e85ba458283ff362e034e6d5
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:43:09 2014 +0100

    applied patch aaa_template_vehicle.h.patch (file src/aaa_template_vehicle.h)

commit ad690e74b95d2aa07157b73834eef672c63ef901
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:43:09 2014 +0100

    applied patch aaa_template_vehicle_func.h.patch (file src/aaa_template_vehicle_func.h)

commit 5982153c369432fc694daaa91a06dfefeeb29485
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:43:09 2014 +0100

    applied patch aaa_template_vehicle_func.cpp.patch (file src/aaa_template_vehicle_func.cpp)

commit 773f889e165b013de96736fa380d5ab5c311b3dd
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:43:09 2014 +0100

    applied patch aaa_template_vehicle.cpp.patch (file src/aaa_template_vehicle.cpp)

commit 03af781d69a09863d3b76ee4911e5eecd90a7cf5
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:43:09 2014 +0100

    applied patch aaa_template_replacement_sl.cpp.patch (file src/saveload/aaa_template_replacement_sl.cpp)

commit ab6cb0562fd390d551670dbc27e0c3c94c8554db
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:43:09 2014 +0100

    applied patch aaa_template_gui_replaceall.cpp.patch (file src/aaa_template_gui_replaceall.cpp)

commit d88452a6195c55e39bceb3ea7689fc546c4eee6a
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:43:09 2014 +0100

    applied patch aaa_template_gui_main.cpp.patch (file src/aaa_template_gui_main.cpp)

commit ab6ac687f355d400ad9ebc154e75477671a8e0fa
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:42:21 2014 +0100

    applied patch aaa_template_gui_create_virtualtrain.cpp.patch (file src/aaa_template_gui_create_virtualtrain.cpp)

commit 288d14b9b145cb045b6a287d23cf3be4f2712ede
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:38:12 2014 +0100

    applied patch aaa_template_gui_create.cpp.patch (file src/aaa_template_gui_create.cpp)

commit 5342db70e07fb7c1f3c41654abd2c6a4c51472c4
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Tue Dec 30 01:18:32 2014 +0100

    applied aaa_* header files

commit 6f14e94a0ad715a33a2653cf6c12e1c2981ace8d
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sun Dec 28 17:29:55 2014 +0100

    applied vehicle_base.h.patch

commit b76a5ce921fab5d81b60755ce66db71e38664e9b
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sun Dec 28 17:29:28 2014 +0100

    applied window_type.h.patch

commit d33d738c7e3477de3f12affcc74c88194a61c442
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sun Dec 28 17:28:30 2014 +0100

    applied newgrf_engine.h.patch

commit 931fd1143706bc76aa145e1430645cb4496f9f4a
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sun Dec 28 17:27:21 2014 +0100

    applied vehicle_gui.h.patch

commit f6c4ab089dad5a4a01401e18cffa8f20e02f733e
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sun Dec 28 17:00:52 2014 +0100

    applied vehicle_gui_base.h.patch

commit 5f7378136758fcc4987791d264856169950cbfe2
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sun Dec 28 12:34:23 2014 +0100

    applied build_vehicle_widget.h.patch

commit 5c6fc73847a2f34573260721bb68c7b552d546bc
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sun Dec 28 12:01:10 2014 +0100

    applied autoreplace_func.h

commit 7636f27011841d01e5f954c855dfa0cf1859e0e0
Author: Thomas Schmidt <streen01@gmx.de>
Date:   Sun Dec 28 12:01:00 2014 +0100

    applied newgrf.h

Remove some spurious whitespace changes, update projects files.
2016-02-13 19:26:47 +00:00
Jonathan G Rennison
248ac0e263 Merge branch 'save_ext' into infrastructure_sharing-sx 2016-01-31 11:45:19 +00:00
Jonathan G Rennison
e5894b3948 Merge branch 'infrastructure_sharing' into infrastructure_sharing-sx 2016-01-31 11:45:08 +00:00
Jonathan G Rennison
6992312702 Merge branch 'master' into infrastructure_sharing 2016-01-31 11:44:54 +00:00
Jonathan G Rennison
a671f40fc8 Merge branch 'save_ext' into tracerestrict-sx 2016-01-20 22:02:14 +00:00
Jonathan G Rennison
bc2094d261 Update project files. 2015-11-01 11:31:11 +00:00
Jonathan G Rennison
98047b5d87 Merge branch 'departure-boards-sx' into jgrpp 2015-11-01 11:30:28 +00:00
Jonathan G Rennison
7dc91d0858 Merge branch 'departure-boards' into departure-boards-sx 2015-11-01 11:18:10 +00:00
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