Commit Graph

Select branches

Hide Pull Requests

enemy_dev

guns

integrate_astronaut

isFalling_checker

level-design

main

mhampel1-patch-1

quickfix

#1

#10

#13

#14

#23

#25

#26

#27

#28

#29

#31

#33

#6

#9

Mono Color

• 5480c3216c Merge pull request 'Early Merge of Level Design into Main' (#33) from level-design into main main enemy_dev mhampel1 2023-11-28 01:59:39 +0100
• 4f451e5afc updated lights, updated scripts level-design MarcoHampel 2023-11-27 19:54:52 -0500
• 97cdb4cc76 added hallway and movmeent MarcoHampel 2023-11-21 19:16:08 -0500
• f49be2edab Developing a testing level MarcoHampel 2023-11-21 12:55:26 -0500
• 330b54f917 Merge pull request 'Merge Guns Into Main' (#31) from guns into main mhampel1 2023-11-21 02:35:09 +0100
• a758aa515c Prep Merge branch 'main' into guns guns MarcoHampel 2023-11-20 20:34:09 -0500
• 85f9449bf3 added bullets MarcoHampel 2023-11-20 20:18:41 -0500
• 357d531662 Auto stash before merge of "guns" and "origin/guns" MarcoHampel 2023-11-17 19:55:38 -0500
• 88bba3561c Merge pull request 'Added isFalling variable to PlayerAnimation' (#29) from isFalling_checker into main Osveta.mp4 2023-11-18 01:53:51 +0100
• 76e65ba44e Added isFalling variable to PlayerAnimation isFalling_checker Osvetamp4 2023-11-17 19:49:27 -0500
• 5da6cc62d3 added sphere targeting MarcoHampel 2023-11-17 19:06:59 -0500
• d83ac78af1 Updated Gun Mode to not raycast when gun is not drawn MarcoHampel 2023-11-13 19:49:06 -0500
• ea356d22ef Updated to aim on aim button clicked and shifted camera. MarcoHampel 2023-11-12 12:28:08 -0500
• 668a0fe388 Player Integrated with base animations. integrate_astronaut MarcoHampel 2023-09-17 17:24:48 -0400
• b2d1e1f4af finally fixed input! MarcoHampel 2023-11-06 20:13:59 -0500
• 1e4151a7d6 Merge pull request 'Merge Guns into Main' (#28) from guns into main mhampel1 2023-10-17 00:51:52 +0200
• ad7590ffac updated to have aiming MarcoHampel 2023-10-13 19:08:15 -0400
• cd0541c3f5 updated project files MarcoHampel 2023-10-13 19:03:29 -0400
• 6d5a5c12a0 sln added test mhampel1-patch-1 MarcoHampel 2023-10-09 19:21:04 -0400
• ccc6e270ed Update '.gitignore' mhampel1 2023-10-10 01:20:08 +0200
• c05ac50454 gun aiming and moving added MarcoHampel 2023-10-02 21:07:15 -0400
• 987f002ba2 Merge pull request 'readded the gun toggle event 2' (#27) from quickfix into main mhampel1 2023-09-28 03:23:36 +0200
• 6ad75ef9cc readded the gun toggle event 2 quickfix MarcoHampel 2023-09-27 21:22:58 -0400
• 3e062da899 Merge pull request 'Readded Gun Toggle Event' (#26) from weapons2 into main mhampel1 2023-09-28 03:16:12 +0200
• 666d168efe readded gun toggle event to event graph MarcoHampel 2023-09-27 21:14:13 -0400
• abcd4f5740 royalty free music from unity imported (#25) mhampel1 2023-09-28 03:00:33 +0200
• 90d9db59d2 Merge branch 'main' into music-import mhampel1 2023-09-28 03:00:21 +0200
• 97e255047b Merge Weapons into Main (#23) mhampel1 2023-09-28 03:00:02 +0200
• fc80b26826 royalty free music from unity imported MarcoHampel 2023-09-26 20:09:21 -0400
• dde1917b85 added gun model to player and modified blueprint to have gun dissapear on toggle MarcoHampel 2023-09-26 19:49:20 -0400
• 2298b536ef Added state machine for entering and leaving gun mode. MarcoHampel 2023-09-26 19:25:27 -0400
• 1212363f87 Loaded idle and movement gun animations into project MarcoHampel 2023-09-22 23:47:45 -0400
• 68931a91ef added pistol 3d model + mats MarcoHampel 2023-09-22 22:38:06 -0400
• c2b301e5fe Merge branch 'volumetrics' into main Madhav Kapa 2023-09-22 22:30:14 -0400
• e9fb0083b9 Merge remote-tracking branch 'origin/main' into volumetrics MarcoHampel 2023-09-22 22:25:15 -0400
• 2344da39b5 Title added MarcoHampel 2023-09-22 22:14:51 -0400
• b292643d99 Merge pull request 'steam stuff' (#14) from steam into main madhavkapa 2023-09-23 01:41:44 +0200
• 167cdac7a7 Merge branch 'main' into steam madhavkapa 2023-09-23 01:41:36 +0200
• 5231bf9aff steam stuff Madhav Kapa 2023-09-22 19:40:19 -0400
• e273d42466 Merge pull request 'Revert "Merge pull request 'ds_controller support' (#10) from nonx-input_controllers into main"' (#13) from revertds into main madhavkapa 2023-09-23 00:46:10 +0200
• 196bd4547c Revert "Merge pull request 'ds_controller support' (#10) from nonx-input_controllers into main" mhampel1 2023-09-19 01:42:07 +0200
• 07fe6b9ee6 Slight modifications to Orange Material MarcoHampel 2023-09-19 22:50:45 -0400
• a54351ca11 Added Pack and Volumetrics. MarcoHampel 2023-09-19 22:31:50 -0400
• bab889485a Merge pull request 'ds_controller support' (#10) from nonx-input_controllers into main mhampel1 2023-09-19 01:42:07 +0200
• ba05d894bc ds_controller support Madhav Kapa 2023-09-18 19:40:39 -0400
• 58a5fd1656 Merge pull request 'character_dev' (#9) from character_dev into main madhavkapa 2023-09-19 01:23:38 +0200
• a0d8c1c414 Merge character_dev into main. (#6) mhampel1 2023-09-18 04:49:22 +0200
• a6f161820b Cleaned up Characters folder. MarcoHampel 2023-09-17 22:15:40 -0400
• 34ffb3e64d Finished base line Animation System for Astronaut. MarcoHampel 2023-09-17 22:10:41 -0400
• 630f2e1d5b Working Animation integration. WIP. MarcoHampel 2023-09-17 21:39:53 -0400
• 5a357ada99 Imported animations into astronaut in Unreal. MarcoHampel 2023-09-17 17:31:27 -0400
• d9e576906c Merge pull request 'first push' (#1) from new_branch into main madhavkapa 2023-09-16 07:02:45 +0200
• 3941fd1ac3 first push MarcoHampel 2023-09-15 23:55:04 -0400
• d8a6175425 set up new branch MarcoHampel 2023-09-13 20:33:23 -0400
• 2ec39d75cb create game Madhav Kapa 2023-09-12 21:51:28 -0400
• 3b827606d7 Initial commit mhampel1 2023-09-13 03:44:11 +0200