diff --git a/Assets/Scenes/ManageFamily.unity b/Assets/Scenes/ManageFamily.unity index 6d9cf60..cc2779b 100644 --- a/Assets/Scenes/ManageFamily.unity +++ b/Assets/Scenes/ManageFamily.unity @@ -950,7 +950,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} + m_margin: {x: 50, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -1295,7 +1295,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} + m_margin: {x: 50, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 diff --git a/README.md b/README.md index 198ad6c..193c8a2 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ Note that the Unity editor is used to create applications using the Unity Engine UML diagrams can be viewed in the browser, and edited using Violet UML Editor (https://sourceforge.net/projects/violet/). ## Deployment and Github Workflow -Deployment Usage: **download** the folder `deliverables/D4/Build` and run `Green Revolution.exe`. +Deployment Usage: **download** the folder `deliverables/D5/Windows` and run `Green Revolution.exe`. Communication is done on our Discord server. We say what we're writing and how we're going to merge it (either directly or through a pull request). We honestly aren't very strict about this - as long as it gets the work done. As a rule of thumb, if we're making a small bug fix, we can just push directly to main. If it's a big change, like writing new classes, we'll create a branch for it, and the writer of it will create a pull request. Team lead reviews it and merges it. diff --git a/deliverables/D5/Windows/Green Revolution_Data/boot.config b/deliverables/D5/Windows/Green Revolution_Data/boot.config index afcc1d3..855c2e8 100644 --- a/deliverables/D5/Windows/Green Revolution_Data/boot.config +++ b/deliverables/D5/Windows/Green Revolution_Data/boot.config @@ -2,4 +2,4 @@ wait-for-native-debugger=0 hdr-display-enabled=0 gc-max-time-slice=3 nolog= -build-guid=b7290913d96541d39124c84404f6fb63 +build-guid=730373eb188c432598121fbfc26348a2 diff --git a/deliverables/D5/Windows/Green Revolution_Data/level22 b/deliverables/D5/Windows/Green Revolution_Data/level22 index 9bd52f5..3bb8c92 100644 Binary files a/deliverables/D5/Windows/Green Revolution_Data/level22 and b/deliverables/D5/Windows/Green Revolution_Data/level22 differ diff --git a/deliverables/D5/WindowsBuild.zip b/deliverables/D5/WindowsBuild.zip deleted file mode 100644 index 6e709c7..0000000 Binary files a/deliverables/D5/WindowsBuild.zip and /dev/null differ