Skip to content

Dilip branch1 #2384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 9 commits into
base: development
Choose a base branch
from
Open

Dilip branch1 #2384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
763504f
Merge pull request #2030 from Areloch/2017TemplateFix
Areloch Jul 6, 2017
f264054
Merge pull request #2123 from nev7n/forestEditorFix
Areloch Nov 27, 2017
e149024
Merge pull request #2002 from OTHGMars/VolFogLeak
Areloch May 15, 2017
0f1d270
Merge pull request #2014 from RichardsGameStudio/windows10-creator-De…
Areloch May 22, 2017
840d53c
Merge pull request #1959 from Areloch/SDLSplashScreenCleanupSanity
Areloch Mar 5, 2017
27446b1
Merge pull request #2106 from block8437/development
Areloch Oct 28, 2017
4b1f421
Merge pull request #2238 from Areloch/SDL_Install_Fixup
Areloch Apr 5, 2018
ff03c78
Merge pull request #2240 from GarageGames/Release_3_10_1
Areloch Apr 5, 2018
a2a3492
updated
Mar 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Engine/source/console/engineFunctions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,11 @@ struct _EngineFunctionDefaultArguments< void(ArgTs...) > : public EngineFunction
std::tie(std::get<I + (sizeof...(ArgTs) - sizeof...(TailTs))>(args)...) = defaultArgs;
}

<<<<<<< HEAD
#ifdef _MSC_VER == 1910
=======
#if defined(_MSC_VER) && (_MSC_VER >= 1910)
>>>>>>> 48fa0c19688bbe3d01406a79f63c8de10b349201
template<typename ...TailTs>
struct DodgyVCHelper
{
Expand Down
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,4 @@ They are available from the [downloads](http://wiki.torque3d.org/main:downloads)
# License

All assets and code are under the [![license](https://img.shields.io/github/license/GarageGames/Torque3D.svg)](https://github.com/GarageGames/Torque3D/blob/master/LICENSE.md)
dilip
Loading