cbrown
|
a2c73d32e5
|
Last minute updates (from yesterday)
|
2024-04-26 08:52:12 -04:00 |
|
|
|
8df3a21083
|
Colider work
|
2024-04-24 10:36:08 -04:00 |
|
Kip Taylor
|
8c84bc53bd
|
Merge branch 'development' into Obstical-Work
# Conflicts:
# Assets/CoursePrefabs/AR Content Green Room.prefab
# Assets/CoursePrefabs/AR Content Main Room 1.prefab
|
2024-04-23 14:28:32 -04:00 |
|
Kip Taylor
|
58f23250b9
|
Fire ob added
|
2024-04-23 14:19:33 -04:00 |
|
Abraham Blain
|
7723f53430
|
Merge remote-tracking branch 'origin/development' into feature/Placing-Spears-Bombs
|
2024-04-23 14:16:03 -04:00 |
|
Kip Taylor
|
e55fba92ab
|
Fixing scripts and adding objects
|
2024-04-23 12:53:11 -04:00 |
|
Abraham Blain
|
37ed1d1934
|
Merge branch 'development' into feature/Obstacles-On-Course
|
2024-04-23 11:48:10 -04:00 |
|
Abraham Blain
|
90e040676f
|
Added bomb timeout
|
2024-04-23 11:45:53 -04:00 |
|
Kip Taylor
|
bc31e72110
|
Axe anime fix i Pray
|
2024-04-23 11:10:56 -04:00 |
|
Kip Taylor
|
5ddfdbb64f
|
Swinging axe
|
2024-04-23 10:28:52 -04:00 |
|
cbrown
|
3d4658f9a0
|
Merge branch 'development' into feature/Spear-Trap
# Conflicts:
# Assets/Scenes/TestControls.unity
|
2024-04-22 15:42:34 -04:00 |
|
cbrown
|
ed3fc42dea
|
Merge branch 'development' into feature/Swinging-Blade
# Conflicts:
# Assets/Scenes/TestControls.unity
|
2024-04-22 15:06:46 -04:00 |
|
cbrown
|
d1fe9789eb
|
Small fix to the MoveFloor script
|
2024-04-22 14:43:40 -04:00 |
|
|
|
0764212875
|
Merge branch 'feature/Moving-Floor-Up-Down' into feature/Swinging-Blade
# Conflicts:
# Assets/Scenes/TestControls.unity
|
2024-04-22 09:51:14 -04:00 |
|
|
|
c57b958220
|
Merge branch 'feature/Moving-Floor-Left-Right' into feature/Moving-Floor-Up-Down
# Conflicts:
# Assets/Scenes/TestControls.unity
|
2024-04-22 09:49:51 -04:00 |
|
|
|
1fcf2fa4b0
|
fixes
|
2024-04-22 09:48:40 -04:00 |
|
|
|
13394322e2
|
fixed, added script and way more functionality.
|
2024-04-22 09:47:46 -04:00 |
|
Abraham
|
ded53d8ce2
|
Created Spear Trap and Multi-Spear Trap
|
2024-04-21 22:15:04 -04:00 |
|
|
|
99819bdfea
|
Added Spinning Sickles
Fun little sickles
|
2024-04-21 09:30:49 -04:00 |
|
|
|
5ba2a7dee9
|
Fixes to overides
|
2024-04-21 08:34:09 -04:00 |
|
|
|
3cc7957726
|
Setting For Left right and Up Down Moving
|
2024-04-21 08:25:14 -04:00 |
|
|
|
25e6460039
|
Distinction between LR and UD
|
2024-04-21 08:07:31 -04:00 |
|
|
|
b8c3a5d791
|
Moving Floor Build
|
2024-04-21 08:02:16 -04:00 |
|
|
|
89b9912466
|
Merge branch 'development' into feature/FloorRamp
# Conflicts:
# Assets/CoursePrefabs/Animations.meta
# Assets/Obstacles.meta
# Assets/PolygonDungeon/URP_ExtractMe.unitypackage.meta
# Assets/Scenes/TestControls.unity
|
2024-04-19 11:58:43 -04:00 |
|
Abraham Blain
|
6de65b7923
|
Created Bomb obstacle
|
2024-04-18 12:52:07 -04:00 |
|
