Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Martenfur committed Aug 11, 2021
2 parents 9dd679c + 5d663bc commit 6d53041
Show file tree
Hide file tree
Showing 123 changed files with 2,633 additions and 2,679 deletions.
1 change: 0 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@ indent_style = tab

# Code files
[*.*]
indent_size = 2
insert_final_newline = true
charset = utf-8-bom
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -351,4 +351,6 @@ MigrationBackup/
# End of https://www.gitignore.io/api/visualstudio

Monofoxe/packages/
Release/
Release/

.idea/
22 changes: 22 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,28 @@

## [Unreleased]

## [v2.1.0] - *12.08.2021*

### Changed

- Removed VS2017 template support and added VS2022 templates.
- Solution created from template no longer requires to manually build Content project.
- Changed `Component` methods from abstract to virtual.
- Templates now support .NET5 instead of netcore 3.

### Added

- Added support for the `backgroundcolor` property for Tiled maps.
- Added `OnCrash` event to `SceneMgr` which allows to catch and recover from the exceptions within a scene.
- Added `IsFixedUpdateFrame` to `SceneMgr`.
- Added coroutines.

### Fixed:

- Fixed `Scene` not being able to delete its layers properly.
- Made `SafeList` thread safe.
- Newly created solutions set their default project to GL instead of library, which cannot be run.

## [v2.0.0] - *27.08.2020*

### Added:
Expand Down
2 changes: 1 addition & 1 deletion Docs/Entities/Components.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ component.Owner.GetComponent<CTest>();



## [<< Introduction to EC](IntroductionToEC.md) | [Layers >>](Layers.md)
## [<< Introduction to EC](IntroductionToEC.md) | [Layers >>](../SceneSystem/Layers.md)

[<<< Contents](../Contents.md)

2 changes: 1 addition & 1 deletion Docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ Docs will not describe each and every feature of Monofoxe. For that you'll need

A good place to start is the [Table of Contents](Contents.md).

And while you're at it, you might as well learn basics of Monogame [here](http://rbwhitaker.wikidot.com/monogame-getting-started-tutorials). You can also check out [Monogame forum](http://community.monogame.net/) and [Monogame Discord](https://discord.gg/ct7GQgW).
And while you're at it, you might as well learn basics of Monogame [here](http://rbwhitaker.wikidot.com/monogame-getting-started-tutorials). You can also check out [Monogame forum](http://community.monogame.net/) and [Monogame Discord](https://discord.gg/wgBb7cqGhC).

If you want to read the docs offline, just clone this repository and download MD viewer, such as [Typora](https://typora.io/).
4 changes: 2 additions & 2 deletions Docs/SettingThingsUp.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

*hehe, you are still here*

Well, it is time to install Monofoxe. Currently Monofoxe only supports development on Windows and Visual Studio, but it should be technically possible to make it run on other operating systems and IDEs.
Well, it is time to install Monofoxe. Currently Monofoxe only supports development on Windows and Visual Studio, but it is totally possible to run it on other operating systems and IDEs.

- Download Visual Studio 2017 [here](https://docs.microsoft.com/en-us/visualstudio/releasenotes/vs2017-relnotes). You can use 2019, but I recommend 2017, since 2019 is fairly new and not officially supported by Monogame yet.
- Download Visual Studio [here](https://visualstudio.microsoft.com/). You can use 2019, but I recommend 2022, since it has hot reload feature.
- After installing Visual Studio and .NET Core package, download and install [latest Monofoxe release](https://github.com/Martenfur/Monofoxe/releases/latest). The installer already comes with Monogame, so you don't need to worry about it.

And that's pretty much it! Now you can open Visual Studio and there you'll see Monofoxe project templates.
Expand Down
43 changes: 25 additions & 18 deletions Installer/packInstaller.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@


!define APPNAME "Monofoxe"
!define APPVERSION "v2-dev"
!define INSTALLERVERSION "2.0.0.0-dev"
!define APPVERSION "v2"
!define INSTALLERVERSION "2.1.0.0"

!define MUI_ICON "pics\icon.ico"
!define MUI_UNICON "pics\icon.ico"
Expand Down Expand Up @@ -53,62 +53,69 @@ RequestExecutionLevel admin

; Stuff to install.

Section "Visual Studio 2017 Templates/" VS2017
SetOutPath "$DOCUMENTS\Visual Studio 2017\${PROJECT_TEMPLATES_DIRECTORY}"
Section "Visual Studio 2019 Templates/" VS2019
SetOutPath "$DOCUMENTS\Visual Studio 2019\${PROJECT_TEMPLATES_DIRECTORY}"
File /r '..\Release\ProjectTemplates\*.zip'
SetOutPath "$DOCUMENTS\Visual Studio 2017\${ITEM_TEMPLATES_DIRECTORY}"
SetOutPath "$DOCUMENTS\Visual Studio 2019\${ITEM_TEMPLATES_DIRECTORY}"
File /r '..\Release\ItemTemplates\*.zip'
SectionEnd

Section "Visual Studio 2019 Templates/" VS2019
SetOutPath "$DOCUMENTS\Visual Studio 2019\${PROJECT_TEMPLATES_DIRECTORY}"
Section "Visual Studio 2022 Templates/" VS2022
SetOutPath "$DOCUMENTS\Visual Studio 2022\${PROJECT_TEMPLATES_DIRECTORY}"
File /r '..\Release\ProjectTemplates\*.zip'
SetOutPath "$DOCUMENTS\Visual Studio 2019\${ITEM_TEMPLATES_DIRECTORY}"
SetOutPath "$DOCUMENTS\Visual Studio 2022\${ITEM_TEMPLATES_DIRECTORY}"
File /r '..\Release\ItemTemplates\*.zip'
SectionEnd

!define OldMonofoxeInstallationDir '$PROGRAMFILES\Monofoxe\'
!define OldMonofoxeInstallationDirV2 '$PROGRAMFILES\Monofoxe Engine\'
Section "Remove old versions." RemoveOldVersions
RMDir /r "$DOCUMENTS\Visual Studio 2017\Templates\ProjectTemplates\Visual C#\Monofoxe"
RMDir /r "$DOCUMENTS\Visual Studio 2015\Templates\ProjectTemplates\Visual C#\Monofoxe"
RMDir /r "$DOCUMENTS\Visual Studio 2019\Templates\ProjectTemplates\Visual C#\Monofoxe"
RMDir /r "$DOCUMENTS\Visual Studio 2022\Templates\ProjectTemplates\Visual C#\Monofoxe"
RMDir /r "$DOCUMENTS\Visual Studio 2015\Templates\ProjectTemplates\Visual C#\Monofoxe v2-dev"
RMDir /r "$DOCUMENTS\Visual Studio 2019\Templates\ProjectTemplates\Visual C#\Monofoxe v2-dev"
RMDir /r "$DOCUMENTS\Visual Studio 2022\Templates\ProjectTemplates\Visual C#\Monofoxe v2-dev"

Delete "${OldMonofoxeInstallationDir}\Uninstall.exe"
RMDir /r "${OldMonofoxeInstallationDir}"
RMDir /r "${OldMonofoxeInstallationDirV2}"
SectionEnd

; Stuff to install.


; Component menu.
LangString VS2017Desc ${LANG_ENGLISH} "Install project templates for Visual Studio 2017. Templates are required to create new projects."
LangString VS2019Desc ${LANG_ENGLISH} "Install project templates for Visual Studio 2019. Templates are required to create new projects."
LangString VS2022Desc ${LANG_ENGLISH} "Install project templates for Visual Studio 2022. Templates are required to create new projects."
LangString RemoveOldVersionsDesc ${LANG_ENGLISH} "Remove all previous Monofoxe versions."


!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
!insertmacro MUI_DESCRIPTION_TEXT ${VS2017} $(VS2017Desc)
!insertmacro MUI_DESCRIPTION_TEXT ${VS2019} $(VS2019Desc)
!insertmacro MUI_DESCRIPTION_TEXT ${VS2022} $(VS2022Desc)
!insertmacro MUI_DESCRIPTION_TEXT ${RemoveOldVersions} $(RemoveOldVersionsDesc)
!insertmacro MUI_FUNCTION_DESCRIPTION_END

Function checkVS2017
IfFileExists `$DOCUMENTS\Visual Studio 2017\Templates\ProjectTemplates\*.*` end disable
Function checkVS2019
IfFileExists `$DOCUMENTS\Visual Studio 2019\Templates\ProjectTemplates\*.*` end disable
disable:
SectionSetFlags ${VS2017} $1
SectionSetFlags ${VS2019} $1
end:
FunctionEnd

Function checkVS2019
IfFileExists `$DOCUMENTS\Visual Studio 2019\Templates\ProjectTemplates\*.*` end disable
Function checkVS2022
IfFileExists `$DOCUMENTS\Visual Studio 2022\Templates\ProjectTemplates\*.*` end disable
disable:
SectionSetFlags ${VS2019} $1
SectionSetFlags ${VS2022} $1
end:
FunctionEnd
; Component menu.

Function .onInit
IntOp $0 $0 | ${SF_RO}
Call checkVS2017
Call checkVS2019
Call checkVS2022
IntOp $0 ${SF_SELECTED} | ${SF_RO}
FunctionEnd

Loading

0 comments on commit 6d53041

Please sign in to comment.