Skip to content

Commit abf8891

Browse files
Merge branch 'main' of https://github.com/MonoGame/docs.monogame.github.io into feature/cameradocs
2 parents d76ff5f + eed1b48 commit abf8891

File tree

8 files changed

+53
-6
lines changed

8 files changed

+53
-6
lines changed

articles/console_access.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ The instructions below will help you gain access to each platform.
2525

2626
Your first step is to register as [Nintendo Developer](https://developer.nintendo.com/register) for Nintendo Switch.
2727

28-
Once you are in the program, you can go to the middleware page and fill out the [MonoGame - Nintendo Developer Athorization](https://developer.nintendo.com/group/development/getting-started/g1kr9vj6/middleware/monogame) form.
28+
Once you are in the program, you can go to the middleware page and fill out the [MonoGame - Nintendo Developer Authorization](https://developer.nintendo.com/group/development/getting-started/g1kr9vj6/middleware/monogame) form.
2929

3030
We will then contact you with further instructions.
3131

articles/getting_started/2_choosing_your_ide_rider.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Setting up your development environment for Rider
33
description: A step-by-step guide for setting up your development IDE for Rider
44
---
55

6-
This is a guide on setting up your development environment for creating games with MonoGame using Rider by DevExpress. By following this guide, you will learn how to install the tools for developing C# applications and configure Rider with recommended extensions for C# development.
6+
This is a guide on setting up your development environment for creating games with MonoGame using Rider by JetBrains. By following this guide, you will learn how to install the tools for developing C# applications and configure Rider with recommended extensions for C# development.
77

88
By the end, you will be fully equipped to start creating games with MonoGame using Rider.
99

articles/getting_started/index.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,10 @@ By the end of this tutorial set, you will have a working project to build for yo
4646
- [Understanding the Code](3_understanding_the_code.md)
4747
- [Adding Content](4_adding_content.md)
4848
- [Adding Basic Code](5_adding_basic_code.md)
49+
50+
### 4. Packaging Games
51+
- [Packaging Games for Distribution](packaging_games.md)
52+
53+
### 5. Advanced Topics
54+
- [Preparing for Consoles](preparing_for_consoles.md)
55+
- [Using Development Nuget Packages](using_development_nuget_packages.md)

articles/getting_started/packaging_games.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,9 @@ However, you do need to currently add some additional settings to your `.csproj`
174174

175175
The `TrimmerRootAssembly` stops the trimmer removing code from these assemblies. This should allow the game to run without
176176
any issues. However if you are using any Third Party or additional assemblies, you might need to add them to this list or fix your code to be `Aot` compliant.
177-
It is recommended that you publish using AOT as it simplifies the app bundle.
177+
It is recommended that you publish using AOT as it simplifies the app bundle.
178+
179+
You may see some trim and AOT analysis warnings related to MonoGame when using PublishAOT, even after adding `TrimmerRootAssembly` - these are normal and should not present any issue.
178180

179181
See [Trim self-contained deployments and executables](https://learn.microsoft.com/en-us/dotnet/core/deploying/trimming/trim-self-contained) for more information.
180182

articles/toc.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@
3636
- name: Packaging
3737
href: getting_started/packaging_games.md
3838
- name: Preparing for consoles
39-
href: getting_started/preparing_for_consoles.md
39+
href: getting_started/preparing_for_consoles.md
40+
- name: Using Development Nuget Packages
41+
href: getting_started/using_development_nuget_packages.md
4042
- name: Tools
4143
items:
4244
- name: Introduction

articles/tutorials.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@ Check out the awesome work of the larger MonoGame community with their own tutor
5151
- [Batholith Entertainment Game dev tutorials](https://www.youtube.com/playlist?list=PLZ6ofHM1rvK8lQSoKX1USZstM-ZXikFHp)
5252
- [Let's Code: The T-Rex Runner Game with MonoGame](https://www.youtube.com/watch?v=DJCQVJ83J1U)
5353

54+
## Shaders
55+
- [MonoGame-Pixel-Planets - a port of Pixel Planets made by DeepFold with a lot of GLSL shaders converted to HLSL](https://github.com/EnthusiastGuy/MonoGame-Pixel-Planets)
56+
- [MonoGame-Shader-Samples](https://github.com/cpt-max/MonoGame-Shader-Samples)
57+
5458
## Others
5559

5660
- [Dark Genesis Blog MonoGame content](http://darkgenesis.zenithmoon.com/tag/monogame/)

templates/monogame/partials/footer.tmpl.partial

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161

6262
<div class="d-flex flex-column flex-sm-row justify-content-between align-items-center gap-3 py-4 my-4">
6363
<div>
64-
Copyright © 2009-2024 MonoGame Foundation, Inc. <br/> Designed with
64+
© 2009-2024 MonoGame Foundation, Inc. is a 501(c)(3) non-profit. EIN 93-3803929<br/>Designed with
6565
<span class="text-danger">❤</span>
6666
by
6767
<a href="https://github.com/MonoGame/monogame.github.io/graphs/contributors">MonoGame Community</a>

templates/monogame/public/main.css

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,4 +180,36 @@ box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.2);
180180
.mg-no-link {
181181
text-decoration: none;
182182
color: var(--bs-body-color);
183-
}
183+
}
184+
185+
186+
/*******************************************************************************
187+
*** Some adjustments to give the content some space.
188+
*******************************************************************************/
189+
190+
h1 {
191+
margin-top: 1.5em;
192+
}
193+
h2 {
194+
margin-top: 1.25em;
195+
}
196+
h3 {
197+
margin-top: 1em;
198+
}
199+
h4 {
200+
margin-top: 0.75em;
201+
}
202+
h5 {
203+
margin-top: 0.5em;
204+
}
205+
206+
p img {
207+
margin-top: 3em;
208+
margin-bottom: 3em;
209+
}
210+
211+
.alert
212+
{
213+
margin-top: 1.5em;
214+
margin-bottom: 1.5em;
215+
}

0 commit comments

Comments
 (0)