Skip to content

Commit

Permalink
Got Player working and added Lava and explosion assets
Browse files Browse the repository at this point in the history
  • Loading branch information
Infin8Gamer1 committed Nov 6, 2019
1 parent 6645d2e commit 482e049
Show file tree
Hide file tree
Showing 189 changed files with 590 additions and 491 deletions.
Binary file modified .vs/Beta Engine/v15/.suo
Binary file not shown.
Binary file modified .vs/Beta Engine/v15/Browse.VC.db
Binary file not shown.
Binary file added .vs/Beta Engine/v15/Solution.VC.db-shm
Binary file not shown.
Binary file added .vs/Beta Engine/v15/Solution.VC.db-wal
Binary file not shown.
Binary file modified .vs/Beta Engine/v16/.suo
Binary file not shown.
Binary file modified .vs/Beta Engine/v16/Browse.VC.db
Binary file not shown.
Binary file modified .vs/Beta Engine/v16/Solution.VC.db
Binary file not shown.
Binary file added .vs/Beta Engine/v16/Solution.VC.db-shm
Binary file not shown.
Binary file added .vs/Beta Engine/v16/Solution.VC.db-wal
Binary file not shown.
Binary file modified .vs/Beta Engine/v16/ipch/3bdba12b3a56ce8e.ipch
Binary file not shown.
Binary file added .vs/Beta Engine/v16/ipch/55e17d585e32107e.ipch
Binary file not shown.
Binary file modified .vs/Beta Engine/v16/ipch/d8d9dba8ad03cb0c.ipch
Binary file not shown.
Binary file modified .vs/Beta Engine/v16/ipch/fd3852c383c7f1fe.ipch
Binary file not shown.
Binary file modified AntTweakBar/lib/AntTweakBar64.iobj
Binary file not shown.
Binary file modified AntTweakBar/lib/AntTweakBar64.ipdb
Binary file not shown.
143 changes: 139 additions & 4 deletions Assets/Level1.lvl
22 changes: 22 additions & 0 deletions Assets/Objects/Explosion.object
27 changes: 27 additions & 0 deletions Assets/Objects/Lava.object
3 changes: 1 addition & 2 deletions Assets/Objects/Player.object
8 changes: 8 additions & 0 deletions Assets/SpriteSources/Explosion.spriteSource
8 changes: 8 additions & 0 deletions Assets/SpriteSources/Lava.spriteSource
Binary file added Assets/Textures/Explosion.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Assets/Textures/Lava.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions Game/Game.vcxproj
12 changes: 6 additions & 6 deletions Game/Game.vcxproj.filters
2 changes: 1 addition & 1 deletion Game/Game.vcxproj.user
39 changes: 39 additions & 0 deletions Game/Source/Lava.cpp
38 changes: 38 additions & 0 deletions Game/Source/Lava.h
38 changes: 17 additions & 21 deletions Game/Source/Level1.cpp
4 changes: 0 additions & 4 deletions Game/Source/Level1.h
161 changes: 0 additions & 161 deletions Game/Source/MonkeyMovement.cpp

This file was deleted.

116 changes: 0 additions & 116 deletions Game/Source/MonkeyMovement.h

This file was deleted.

15 changes: 12 additions & 3 deletions Game/Source/PlayerMove.cpp
Binary file modified Game/x64/Debug/ExplosionTimer.obj
Binary file not shown.
Binary file added Game/x64/Debug/Game.exe
Binary file not shown.
Binary file added Game/x64/Debug/Game.ilk
Binary file not shown.
48 changes: 35 additions & 13 deletions Game/x64/Debug/Game.log
Binary file added Game/x64/Debug/Game.pdb
Binary file not shown.
Binary file modified Game/x64/Debug/Game.tlog/CL.command.1.tlog
Binary file not shown.
Binary file modified Game/x64/Debug/Game.tlog/CL.read.1.tlog
Binary file not shown.
Binary file modified Game/x64/Debug/Game.tlog/CL.write.1.tlog
Binary file not shown.
Binary file added Game/x64/Debug/Game.tlog/link.command.1.tlog
Binary file not shown.
Binary file added Game/x64/Debug/Game.tlog/link.read.1.tlog
Binary file not shown.
Binary file added Game/x64/Debug/Game.tlog/link.write.1.tlog
Binary file not shown.
Empty file.
Binary file added Game/x64/Debug/Lava.obj
Binary file not shown.
Binary file modified Game/x64/Debug/Level1.obj
Binary file not shown.
Binary file modified Game/x64/Debug/Main.obj
Binary file not shown.
Binary file modified Game/x64/Debug/PlayerAnimController.obj
Binary file not shown.
Binary file added Game/x64/Debug/PlayerMove.obj
Binary file not shown.
Binary file modified Game/x64/Debug/ScreenWrap.obj
Binary file not shown.
Binary file modified Game/x64/Debug/TimedDeath.obj
Binary file not shown.
Binary file modified Game/x64/Debug/vc142.idb
Binary file not shown.
Binary file modified Game/x64/Debug/vc142.pdb
Binary file not shown.
Binary file added Game/x64/Release/AntTweakBar64.dll
Binary file not shown.
Binary file added Game/x64/Release/ColorChange.obj
Binary file not shown.
Binary file added Game/x64/Release/ExplosionTimer.obj
Binary file not shown.
Binary file added Game/x64/Release/Game.exe
Binary file not shown.
Binary file added Game/x64/Release/Game.iobj
Binary file not shown.
Binary file added Game/x64/Release/Game.ipdb
Binary file not shown.
48 changes: 48 additions & 0 deletions Game/x64/Release/Game.log
Binary file added Game/x64/Release/Game.pch
Binary file not shown.
Binary file added Game/x64/Release/Game.pdb
Binary file not shown.
Binary file added Game/x64/Release/Game.tlog/CL.command.1.tlog
Binary file not shown.
Binary file added Game/x64/Release/Game.tlog/CL.read.1.tlog
Binary file not shown.
Binary file added Game/x64/Release/Game.tlog/CL.write.1.tlog
Binary file not shown.
2 changes: 2 additions & 0 deletions Game/x64/Release/Game.tlog/Game.lastbuildstate
Binary file added Game/x64/Release/Game.tlog/Game.write.1u.tlog
Binary file not shown.
Binary file added Game/x64/Release/Game.tlog/link.command.1.tlog
Binary file not shown.
Binary file added Game/x64/Release/Game.tlog/link.read.1.tlog
Binary file not shown.
Binary file added Game/x64/Release/Game.tlog/link.write.1.tlog
Binary file not shown.
Binary file added Game/x64/Release/Lava.obj
Binary file not shown.
Binary file added Game/x64/Release/Level1.obj
Binary file not shown.
Binary file added Game/x64/Release/Main.obj
Binary file not shown.
Binary file added Game/x64/Release/PlayerAnimController.obj
Binary file not shown.
Binary file added Game/x64/Release/PlayerMove.obj
Binary file not shown.
Binary file added Game/x64/Release/ScreenWrap.obj
Binary file not shown.
Binary file added Game/x64/Release/TimedDeath.obj
Binary file not shown.
Binary file added Game/x64/Release/fmod64.dll
Binary file not shown.
Binary file added Game/x64/Release/fmodstudio64.dll
Binary file not shown.
Binary file added Game/x64/Release/glfw3.dll
Binary file not shown.
Binary file added Game/x64/Release/stdafx.obj
Binary file not shown.
Binary file added Game/x64/Release/vc142.pdb
Binary file not shown.
2 changes: 1 addition & 1 deletion HighLevelAPI/HighLevelAPI.vcxproj
2 changes: 1 addition & 1 deletion HighLevelAPI/HighLevelAPI.vcxproj.filters
2 changes: 2 additions & 0 deletions HighLevelAPI/include/Animation.h
Binary file modified HighLevelAPI/lib/BetaHigh_x64.lib
Binary file not shown.
Binary file added HighLevelAPI/lib/BetaHigh_x64.pdb
Binary file not shown.
Binary file modified HighLevelAPI/lib/BetaHigh_x64_D.idb
Binary file not shown.
Binary file modified HighLevelAPI/lib/BetaHigh_x64_D.lib
Binary file not shown.
Binary file modified HighLevelAPI/lib/BetaHigh_x64_D.pdb
Binary file not shown.
35 changes: 35 additions & 0 deletions HighLevelAPI/src/Animation.cpp
87 changes: 43 additions & 44 deletions HighLevelAPI/src/CameraController.cpp
2 changes: 0 additions & 2 deletions HighLevelAPI/src/Level.cpp
Binary file modified HighLevelAPI/x64/Debug/Animation.obj
Binary file not shown.
Binary file modified HighLevelAPI/x64/Debug/BetaHigh_x64_D.pch
Binary file not shown.
Binary file modified HighLevelAPI/x64/Debug/CallbackInputManager.obj
Binary file not shown.
Binary file modified HighLevelAPI/x64/Debug/CameraController.obj
Binary file not shown.
Binary file modified HighLevelAPI/x64/Debug/Collider.obj
Binary file not shown.
Binary file modified HighLevelAPI/x64/Debug/ColliderCircle.obj
Binary file not shown.
Binary file modified HighLevelAPI/x64/Debug/ColliderLine.obj
Binary file not shown.
Binary file modified HighLevelAPI/x64/Debug/ColliderPoint.obj
Binary file not shown.
Binary file modified HighLevelAPI/x64/Debug/ColliderRectangle.obj
Binary file not shown.
Binary file modified HighLevelAPI/x64/Debug/ColliderTilemap.obj
Binary file not shown.
Binary file modified HighLevelAPI/x64/Debug/Component.obj
Binary file not shown.
Binary file modified HighLevelAPI/x64/Debug/FileOpenHelper.obj
Binary file not shown.
Binary file modified HighLevelAPI/x64/Debug/GameObject.obj
Binary file not shown.
Binary file modified HighLevelAPI/x64/Debug/GameObjectFactory.obj
Binary file not shown.
Binary file modified HighLevelAPI/x64/Debug/GameObjectManager.obj
Binary file not shown.
91 changes: 1 addition & 90 deletions HighLevelAPI/x64/Debug/HighLevelAPI.log
Binary file modified HighLevelAPI/x64/Debug/HighLevelAPI.tlog/CL.command.1.tlog
Binary file not shown.
Binary file modified HighLevelAPI/x64/Debug/HighLevelAPI.tlog/CL.read.1.tlog
Binary file not shown.
Binary file modified HighLevelAPI/x64/Debug/HighLevelAPI.tlog/CL.write.1.tlog
Binary file not shown.
Binary file modified HighLevelAPI/x64/Debug/Intersection2D.obj
Binary file not shown.
Binary file modified HighLevelAPI/x64/Debug/Level.obj
Binary file not shown.
Binary file modified HighLevelAPI/x64/Debug/Matrix2DStudent.obj
Binary file not shown.
Binary file modified HighLevelAPI/x64/Debug/MeshHelper.obj
Binary file not shown.
Binary file modified HighLevelAPI/x64/Debug/Parser.obj
Binary file not shown.
Binary file modified HighLevelAPI/x64/Debug/Physics.obj
Binary file not shown.
Binary file modified HighLevelAPI/x64/Debug/ResourceManager.obj
Binary file not shown.
Binary file modified HighLevelAPI/x64/Debug/Serializable.obj
Binary file not shown.
Binary file modified HighLevelAPI/x64/Debug/SoundManager.obj
Binary file not shown.
Binary file modified HighLevelAPI/x64/Debug/Space.obj
Binary file not shown.
Binary file modified HighLevelAPI/x64/Debug/SpaceManager.obj
Binary file not shown.
Binary file modified HighLevelAPI/x64/Debug/Sprite.obj
Binary file not shown.
Binary file modified HighLevelAPI/x64/Debug/SpriteSource.obj
Binary file not shown.
Binary file modified HighLevelAPI/x64/Debug/SpriteText.obj
Binary file not shown.
Binary file modified HighLevelAPI/x64/Debug/SpriteTilemap.obj
Binary file not shown.
Binary file modified HighLevelAPI/x64/Debug/Tilemap.obj
Binary file not shown.
Binary file modified HighLevelAPI/x64/Debug/Transform.obj
Binary file not shown.
Binary file modified HighLevelAPI/x64/Debug/stdafx.obj
Binary file not shown.
Binary file added HighLevelAPI/x64/Release/Animation.obj
Binary file not shown.
Binary file added HighLevelAPI/x64/Release/BetaHigh_x64.pch
Binary file not shown.
Binary file not shown.
Binary file added HighLevelAPI/x64/Release/CameraController.obj
Binary file not shown.
Binary file added HighLevelAPI/x64/Release/Collider.obj
Binary file not shown.
Binary file added HighLevelAPI/x64/Release/ColliderCircle.obj
Binary file not shown.
Binary file added HighLevelAPI/x64/Release/ColliderLine.obj
Binary file not shown.
Binary file added HighLevelAPI/x64/Release/ColliderPoint.obj
Binary file not shown.
Binary file added HighLevelAPI/x64/Release/ColliderRectangle.obj
Binary file not shown.
Binary file added HighLevelAPI/x64/Release/ColliderTilemap.obj
Binary file not shown.
Binary file added HighLevelAPI/x64/Release/Component.obj
Binary file not shown.
Binary file added HighLevelAPI/x64/Release/FileOpenHelper.obj
Binary file not shown.
Binary file added HighLevelAPI/x64/Release/GameObject.obj
Binary file not shown.
Binary file added HighLevelAPI/x64/Release/GameObjectFactory.obj
Binary file not shown.
Binary file added HighLevelAPI/x64/Release/GameObjectManager.obj
Binary file not shown.
93 changes: 93 additions & 0 deletions HighLevelAPI/x64/Release/HighLevelAPI.log
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added HighLevelAPI/x64/Release/Intersection2D.obj
Binary file not shown.
Binary file added HighLevelAPI/x64/Release/Level.obj
Binary file not shown.
Binary file added HighLevelAPI/x64/Release/Matrix2DStudent.obj
Binary file not shown.
Binary file added HighLevelAPI/x64/Release/MeshHelper.obj
Binary file not shown.
Binary file added HighLevelAPI/x64/Release/Parser.obj
Binary file not shown.
Binary file added HighLevelAPI/x64/Release/Physics.obj
Binary file not shown.
Binary file added HighLevelAPI/x64/Release/ResourceManager.obj
Binary file not shown.
Binary file added HighLevelAPI/x64/Release/Serializable.obj
Binary file not shown.
Binary file added HighLevelAPI/x64/Release/SoundManager.obj
Binary file not shown.
Binary file added HighLevelAPI/x64/Release/Space.obj
Binary file not shown.
Binary file added HighLevelAPI/x64/Release/SpaceManager.obj
Binary file not shown.
Binary file added HighLevelAPI/x64/Release/Sprite.obj
Binary file not shown.
Binary file added HighLevelAPI/x64/Release/SpriteSource.obj
Binary file not shown.
Binary file added HighLevelAPI/x64/Release/SpriteText.obj
Binary file not shown.
Binary file added HighLevelAPI/x64/Release/SpriteTilemap.obj
Binary file not shown.
Binary file added HighLevelAPI/x64/Release/Tilemap.obj
Binary file not shown.
Binary file added HighLevelAPI/x64/Release/Transform.obj
Binary file not shown.
Binary file added HighLevelAPI/x64/Release/stdafx.obj
Binary file not shown.
3 changes: 3 additions & 0 deletions LevelEditor/LevelEditor.vcxproj.user
Binary file modified LevelEditor/x64/Debug/LevelEditor.exe
Binary file not shown.
Binary file modified LevelEditor/x64/Debug/LevelEditor.ilk
Binary file not shown.
18 changes: 1 addition & 17 deletions LevelEditor/x64/Debug/LevelEditor.log
Binary file modified LevelEditor/x64/Debug/LevelEditor.pdb
Binary file not shown.
Binary file modified LevelEditor/x64/Debug/LevelEditor.tlog/CL.command.1.tlog
Binary file not shown.
Binary file modified LevelEditor/x64/Debug/LevelEditor.tlog/CL.read.1.tlog
Binary file not shown.
Binary file modified LevelEditor/x64/Debug/LevelEditor.tlog/CL.write.1.tlog
Binary file not shown.
Binary file modified LevelEditor/x64/Debug/LevelEditor.tlog/link.read.1.tlog
Binary file not shown.
Binary file modified LevelEditor/x64/Debug/LevelEditor.tlog/link.write.1.tlog
Binary file not shown.
Binary file modified LevelEditor/x64/Debug/LevelEditorLevel.obj
Binary file not shown.
Binary file modified LevelEditor/x64/Debug/LevelEditorUI.obj
Binary file not shown.
Binary file modified LevelEditor/x64/Debug/LevelManagerLevel.obj
Binary file not shown.
Binary file modified LevelEditor/x64/Debug/Main.obj
Binary file not shown.
Binary file modified LevelEditor/x64/Debug/vc142.idb
Binary file not shown.
Binary file modified LevelEditor/x64/Debug/vc142.pdb
Binary file not shown.

0 comments on commit 482e049

Please sign in to comment.