Skip to content

Level building #3

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.

Sign up for GitHub

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

Open
SeanCampbell255 wants to merge 37 commits into
base: Programming
Choose a base branch
from
Open

Level building #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
91c2f9d
Created Prefabs, did fixes
OnlyAtRisk Nov 4, 2018
499ea88
Update Project Chronograph/Assets/Scenes/Flavor/F_1.unity
OnlyAtRisk Nov 4, 2018
8a97539
Update Project Chronograph/Assets/Scripts/Enemy Scripts/EnemyGroundMo…
OnlyAtRisk Nov 5, 2018
33840ef
Fixed Resizing Enemies
OnlyAtRisk Nov 9, 2018
a6724f1
Merge branch 'Programming'
SeanCampbell255 Nov 10, 2018
95aa78c
Commented out previous merge conflict
SeanCampbell255 Nov 10, 2018
142aaec
Audiomanager Added
reverienest Nov 11, 2018
6d3b472
Merge branch 'PlayerBehavior' into AudioManager
reverienest Nov 12, 2018
e6de677
Changing player
reverienest Nov 12, 2018
0f1da2d
Revert "Changing player"
reverienest Nov 12, 2018
9cc5771
Revert "Merge branch 'PlayerBehavior' into AudioManager"
reverienest Nov 12, 2018
859c4fd
Revert "Revert "Merge branch 'PlayerBehavior' into AudioManager""
reverienest Nov 12, 2018
c55e7d3
Fixed a few issues
reverienest Nov 14, 2018
849aabe
Merge remote-tracking branch 'origin/AudioManager' into LevelBuilding
ActuallyTrue Nov 15, 2018
f5218b8
Fixed destroyed manager issues
reverienest Nov 15, 2018
7099a2c
Assets
reverienest Nov 15, 2018
f4123af
Merge branch 'AudioManager' into LevelBuilding
reverienest Nov 15, 2018
f81ff72
Update Project Chronograph/Assets/Scenes/Test.unity
reverienest Nov 15, 2018
f69962c
Update Project Chronograph/Assets/Scenes/True Levels/Level 1.unity
reverienest Nov 15, 2018
3373406
Update Project Chronograph/Assets/Scenes/True Levels/Level 1.unity
reverienest Nov 15, 2018
b7582a9
Added Composite Collider
reverienest Nov 15, 2018
25598a4
Update Project Chronograph/Assets/Scenes/True Levels/Level 1.unity
reverienest Nov 15, 2018
099dd42
Update Project Chronograph/Assets/Scenes/True Levels/Level 1.unity
reverienest Nov 15, 2018
9c063bf
Update Project Chronograph/Assets/Scenes/Test.unity
reverienest Nov 15, 2018
aca8ad7
Merge branch 'AudioManager' into LevelBuilding
reverienest Nov 15, 2018
031e79d
Level 1 Mapped
reverienest Nov 15, 2018
6bee306
Update Project Chronograph/Assets/Scripts/Player Scripts/PlayerAttack.cs
reverienest Nov 15, 2018
fafcf58
Added spike prefab
reverienest Nov 15, 2018
eae118e
Level 2
reverienest Nov 15, 2018
1f35309
A load of things.
reverienest Nov 16, 2018
5d8b949
Update Level 4.unity
reverienest Nov 16, 2018
69d90eb
Update Level 4.unity
reverienest Nov 16, 2018
64f8a16
Moving platforms
reverienest Nov 16, 2018
93b3b79
Still moving platoforms
reverienest Nov 16, 2018
81ce94e
Getting rid of mean files
SeanCampbell255 Nov 16, 2018
d3529dd
gh
reverienest Nov 16, 2018
c63c47e
Update AudioManager.cs
reverienest Dec 31, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions Project Chronograph/.vs/Project Chronograph/xs/UserPrefs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
<Properties StartupConfiguration="{20E910C5-19E6-4A85-09EC-F1DADD468B4A}|">
<MonoDevelop.Ide.ItemProperties.Assembly-CSharp PreferredExecutionTarget="Unity.Editor" />
<MonoDevelop.Ide.Workbench ActiveDocument="Assets/Scripts/Environment Scripts/MoveThroughPlatform.cs">
<MonoDevelop.Ide.Workbench ActiveDocument="Assets/Scripts/Environment Scripts/AudioManager.cs">
<Files>
<File FileName="Assets/Scripts/Player Scripts/Raycast Scripts/RaycastCheckTouching.cs" Line="1" Column="1" />
<File FileName="Assets/Scripts/Player Scripts/Raycast Scripts/RaycastMoveDirection.cs" Line="1" Column="1" />
<File FileName="Assets/Scripts/Player Scripts/Raycast Scripts/RaycastMoveDirection.cs" Line="35" Column="24" />
<File FileName="Assets/Scripts/Environment Scripts/MoveThroughPlatform.cs" Line="6" Column="4" />
<File FileName="Assets/Scripts/Enemy Scripts/HurtPlayer.cs" Line="31" Column="49" />
<File FileName="Assets/Scripts/Player Scripts/Raycast Scripts/RaycastPlayerController.cs" Line="1" Column="1" />
<File FileName="Assets/Scripts/Player Scripts/Raycast Scripts/RaycastPlayerController.cs" Line="282" Column="5" />
<File FileName="Assets/Scripts/Player Scripts/HealthManager.cs" Line="1" Column="1" />
<File FileName="Assets/Scripts/Player Scripts/PlayerAttack.cs" Line="1" Column="1" />
<File FileName="Assets/Scripts/Player Scripts/PlayerAttack.cs" Line="18" Column="11" />
<File FileName="Assets/Scripts/Player Scripts/AttackTrigger.cs" Line="1" Column="1" />
<File FileName="Assets/Scripts/Enemy Scripts/KillPlayer.cs" Line="1" Column="1" />
<File FileName="Assets/Scripts/Level Scripts/LevelManager.cs" Line="1" Column="1" />
<File FileName="Assets/Scripts/Time Scripts/TimeManager.cs" Line="1" Column="1" />
<File FileName="Assets/Scripts/Enemy Scripts/EnemyGroundMovement.cs" Line="1" Column="1" />
<File FileName="Assets/Scripts/Player Scripts/PlayerController.cs" Line="26" Column="24" />
<File FileName="Assets/Scripts/Environment Scripts/MoveThroughPlatform.cs" Line="1" Column="1" />
<File FileName="Assets/Scripts/Environment Scripts/AudioManager.cs" Line="1" Column="1" />
</Files>
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
Expand Down
Binary file removed Project Chronograph/.vs/Project Chronograph/xs/sqlite3/storage.ide-shm
View file
Open in desktop
Binary file not shown.
Binary file removed Project Chronograph/.vs/Project Chronograph/xs/sqlite3/storage.ide-wal
View file
Open in desktop
Binary file not shown.
Binary file added Project Chronograph/Assets/Art/20181108_165115.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
88 changes: 88 additions & 0 deletions Project Chronograph/Assets/Art/20181108_165115.jpg.meta
View file
Open in desktop

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

8 changes: 8 additions & 0 deletions Project Chronograph/Assets/Art/All Levels.meta
View file
Open in desktop

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

Binary file added Project Chronograph/Assets/Art/All Levels/Level_First_Tutorial_0.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
88 changes: 88 additions & 0 deletions Project Chronograph/Assets/Art/All Levels/Level_First_Tutorial_0.png.meta
View file
Open in desktop

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

Binary file added Project Chronograph/Assets/Art/All Levels/Level_First_Tutorial_1.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
88 changes: 88 additions & 0 deletions Project Chronograph/Assets/Art/All Levels/Level_First_Tutorial_1.png.meta
View file
Open in desktop

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

Binary file added Project Chronograph/Assets/Art/All Levels/Level_First_Tutorial_2.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
88 changes: 88 additions & 0 deletions Project Chronograph/Assets/Art/All Levels/Level_First_Tutorial_2.png.meta
View file
Open in desktop

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

Binary file added Project Chronograph/Assets/Art/All Levels/Level_First_Tutorial_3.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading