Skip to content
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.

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

The Marauder's Map - Nadine Adnane, Nick Liu, & Insha Lakhani #15

Open
wants to merge 82 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
3c4f3de
Initial Commit
Nov 9, 2023
89c1671
Design Doc WIP
nadnane Nov 9, 2023
58a2a07
Added free-body diagram
nadnane Nov 9, 2023
ed59c35
Proposal done
Nov 9, 2023
40312c4
Formatting fix + add logo
nadnane Nov 9, 2023
83b8b15
We are definitely using unity; merging into main
liunicholas6 Nov 28, 2023
e279d11
Add fonts, logo, and update map generator
nadnane Nov 29, 2023
dbba24c
UI WIP
nadnane Nov 29, 2023
ff47bc4
Merging room creation
liunicholas6 Nov 30, 2023
297f254
Merge
liunicholas6 Nov 30, 2023
94405f2
WIP scene setup, interactivity, post-processing
nadnane Nov 30, 2023
1d58106
Curve to point stream
liunicholas6 Dec 3, 2023
4386a58
Building Generator top-level class created; depedencies updated
liunicholas6 Dec 3, 2023
d8f8549
Walls
liunicholas6 Dec 4, 2023
83db759
Arc Curve
liunicholas6 Dec 4, 2023
dab7287
Moved rectangle; created sector and sector region
liunicholas6 Dec 4, 2023
87912b6
Created tower runner and debug sector
liunicholas6 Dec 4, 2023
90ebf54
Patched ToPointStream
liunicholas6 Dec 4, 2023
f5eefc3
Fixed DebugSector
liunicholas6 Dec 4, 2023
f4608ef
Patched sector to be struct and TowerRunner left/right to be correct
liunicholas6 Dec 4, 2023
4368be6
working sprite
inshalak Dec 5, 2023
bdbf896
Progress
liunicholas6 Dec 5, 2023
7fe2a2b
Progress
liunicholas6 Dec 5, 2023
5923351
added bezier
inshalak Dec 5, 2023
2f31fb2
Progress
liunicholas6 Dec 5, 2023
5532caa
Merge branch 'building-generation' of github.com:liunicholas6/maraude…
liunicholas6 Dec 5, 2023
066e5d8
Debug binary partition
liunicholas6 Dec 5, 2023
8f9c2e1
Commented Tower Runner
liunicholas6 Dec 5, 2023
bbd7e67
Restore TowerRunner
liunicholas6 Dec 5, 2023
5b42875
Tower complete
liunicholas6 Dec 5, 2023
35239e9
Tower Complete
liunicholas6 Dec 5, 2023
85c5750
Merge branch 'building-generation'
liunicholas6 Dec 5, 2023
5e37061
WIP render text, remove necessary files
nadnane Dec 6, 2023
e4aa858
Room walls have thickness
liunicholas6 Dec 6, 2023
ce1b478
Add new map scene (old one is corrupted)
nadnane Dec 6, 2023
dbdf5e4
Mark anims as legacy
nadnane Dec 6, 2023
af4fff0
Import TMP essentials
nadnane Dec 6, 2023
40d95a5
Merge branch 'main' into rendering
nadnane Dec 6, 2023
9eedcae
updates
inshalak Dec 6, 2023
0aaf6fe
updates + added files
inshalak Dec 6, 2023
c10a733
Merge branch 'sprites'
liunicholas6 Dec 6, 2023
36018d2
Added URP and updated shaders
nadnane Dec 6, 2023
5f7559a
Post-merge fixes
liunicholas6 Dec 6, 2023
aae067d
LineCurve -> ICurve patch
liunicholas6 Dec 6, 2023
2e16716
Patch
liunicholas6 Dec 6, 2023
cdca9e3
Add bookshelves and candle glow
nadnane Dec 6, 2023
9536d9e
Merge branch 'main' into rendering
nadnane Dec 6, 2023
62f9bfa
Add post processing
nadnane Dec 6, 2023
331ed7e
HE ZOOM IN DA ROOM
inshalak Dec 6, 2023
5ad23db
Added tangent angle
liunicholas6 Dec 6, 2023
8c80095
Tangent angle patch
liunicholas6 Dec 6, 2023
a4d1def
Draw map after unfold animation ends
nadnane Dec 6, 2023
592048f
Reverting wanderers
liunicholas6 Dec 6, 2023
0ad26a9
Remove extra map scene
nadnane Dec 6, 2023
3b5d04e
Fix missing prefab issue
nadnane Dec 6, 2023
06194bc
Attach camera to UI Canvas
nadnane Dec 6, 2023
e1475d0
Create MapText.png
nadnane Dec 6, 2023
51e958a
Line textures; line render works for arcs
liunicholas6 Dec 6, 2023
09044b4
Footprint trail WIP
nadnane Dec 6, 2023
4617be9
Lines and prefabs
liunicholas6 Dec 6, 2023
2decf11
Text mapping good. Block + Tower
liunicholas6 Dec 6, 2023
2c12890
Merge branch 'rendering'
liunicholas6 Dec 6, 2023
1d99b32
Footprints working!
nadnane Dec 10, 2023
5083c5f
Replace default README with proposal
nadnane Dec 10, 2023
f97fe66
Update README.md
nadnane Dec 10, 2023
a3c24d6
footsteps fixed
inshalak Dec 11, 2023
7bb8a7c
Merge branch 'main' of https://github.com/liunicholas6/marauders-map
inshalak Dec 11, 2023
0bec824
footsteps better
inshalak Dec 11, 2023
d68fd84
adding in final texture
inshalak Dec 11, 2023
ec52343
adding texture meta
inshalak Dec 11, 2023
f1f2327
Cleanup formatting
liunicholas6 Dec 11, 2023
78584ed
Fixed Bezier tangent typo
liunicholas6 Dec 11, 2023
8359384
Footstep orientation in hallways
liunicholas6 Dec 11, 2023
e8631e8
Random walk without lag implemented (currently teleports across rooms)
liunicholas6 Dec 11, 2023
66f10ba
Footstep orientation
liunicholas6 Dec 11, 2023
368c020
Walk through rooms; switch to queue + purely random walk to lay groun…
liunicholas6 Dec 11, 2023
0b3d3d1
DFS for paths between random points
liunicholas6 Dec 11, 2023
99c940b
DFS now adds edges for rooms
liunicholas6 Dec 11, 2023
480d564
ArcCurve tangent patch, added wanderers back
liunicholas6 Dec 11, 2023
4ffd1fe
Added 4 line material slots
nadnane Dec 11, 2023
ecd9de9
Fix interactive text prompt
nadnane Dec 11, 2023
96b5a1d
Add presentation links
nadnane Dec 11, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
106 changes: 106 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
# This .gitignore file should be placed at the root of your Unity project directory
#
# Get latest from https://github.com/github/gitignore/blob/main/Unity.gitignore
#
/[Ll]ibrary/
/[Tt]emp/
/[Oo]bj/
/[Bb]uild/
/[Bb]uilds/
/[Ll]ogs/
/[Uu]ser[Ss]ettings/

# MemoryCaptures can get excessive in size.
# They also could contain extremely sensitive data
/[Mm]emoryCaptures/

# Recordings can get excessive in size
/[Rr]ecordings/

# Uncomment this line if you wish to ignore the asset store tools plugin
# /[Aa]ssets/AssetStoreTools*

# Autogenerated Jetbrains Rider plugin
/[Aa]ssets/Plugins/Editor/JetBrains*

# Visual Studio cache directory
.vs/

# Gradle cache directory
.gradle/

# Autogenerated VS/MD/Consulo solution and project files
ExportedObj/
.consulo/
*.csproj
*.unityproj
*.sln
*.suo
*.tmp
*.user
*.userprefs
*.pidb
*.booproj
*.svd
*.pdb
*.mdb
*.opendb
*.VC.db

# Unity3D generated meta files
*.pidb.meta
*.pdb.meta
*.mdb.meta

# Unity3D generated file on crash reports
sysinfo.txt

# Builds
*.apk
*.aab
*.unitypackage
*.app

# Crashlytics generated file
crashlytics-build.properties

# Packed Addressables
/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin*

# Temporary auto-generated Android Assets
/[Aa]ssets/[Ss]treamingAssets/aa.meta
/[Aa]ssets/[Ss]treamingAssets/aa/*

# Common IntelliJ Platform excludes

# User specific
**/.idea/**/workspace.xml
**/.idea/**/tasks.xml
**/.idea/shelf/*
**/.idea/dictionaries
**/.idea/httpRequests/

# Sensitive or high-churn files
**/.idea/**/dataSources/
**/.idea/**/dataSources.ids
**/.idea/**/dataSources.xml
**/.idea/**/dataSources.local.xml
**/.idea/**/sqlDataSources.xml
**/.idea/**/dynamic.xml

# Rider
# Rider auto-generates .iml files, and contentModel.xml
**/.idea/**/*.iml
**/.idea/**/contentModel.xml
**/.idea/**/modules.xml

*.suo
*.user
.vs/
[Bb]in/
[Oo]bj/
_UpgradeReport_Files/
[Pp]ackages/

Thumbs.db
Desktop.ini
11 changes: 11 additions & 0 deletions .idea/.idea.marauders-map/.idea/indexLayout.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/.idea.marauders-map/.idea/projectSettingsUpdater.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/.idea.marauders-map/.idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .vsconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"version": "1.0",
"components": [
"Microsoft.VisualStudio.Workload.ManagedGame"
]
}
8 changes: 8 additions & 0 deletions Assets/Fonts.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading