Commit Graph

59 Commits

Author SHA1 Message Date
Noah4ever
a98545f078 Merge branch 'main' into weapons-without-scriptableobjects 2021-11-08 13:08:55 +01:00
Noah4ever
908af2441f Weapon Pointing
+ weapon points to raycast from camera
2021-11-08 13:06:53 +01:00
juliuse98
c6cd50a4f8 Full Recoil animation 2021-11-08 12:55:58 +01:00
juliuse98
352e22225f Basic Recoil 2021-11-07 16:29:21 +01:00
juliuse98
360ceb55f3 added fire animation and fire rate 2021-11-06 17:07:06 +01:00
juliuse98
4fc928f530 Gun holding with inverse kinematics 2021-11-06 15:42:57 +01:00
Noah4ever
2667b45c78 Weapon Pointing
started making weapon point at crosshair when shooting
2021-11-06 15:09:47 +01:00
juliuse98
7cb0140a74 Merge branch 'main' into Player-Animation 2021-11-06 14:57:31 +01:00
juliuse98
05ecaa5131 kein plan 2021-11-06 14:56:30 +01:00
juliuse98
cede4fb741 Oh Shit 2021-11-06 14:36:12 +01:00
Noah4ever
e62ccb452b Merge branch 'main' into weapons-without-scriptableobjects 2021-11-05 14:03:16 +01:00
Noah4ever
89db851a1e Network Weapons
+ started weapons with Mirror
2021-11-05 13:58:29 +01:00
juliuse98
908e69d4fe Added Stuff 2021-11-05 13:41:43 +01:00
juliuse98
2868c0e89e fixed merge 2021-11-04 08:45:48 +01:00
juliuse98
6ba99d7ead Merge branch 'game-manager' 2021-11-04 08:23:17 +01:00
juliuse98
6c1b72cc12 Merge branch 'player-info' 2021-11-04 08:21:22 +01:00
juliuse98
312b51656b Headbob
-Added Headbob
2021-11-04 08:15:48 +01:00
DerTyp187
8967b780dd updated debug canvas 2021-11-04 08:07:46 +01:00
DerTyp187
fa0a7fc9cf fixed github bug 2021-11-03 07:46:31 +01:00
juliuse98
8bca7b7379 Sprinting
-Added sprinting in the Player Controller
2021-11-01 14:55:41 +01:00
juliuse98
134c2ac4e0 Merge branch 'main' into player-controller 2021-11-01 14:39:47 +01:00
juliuse98
0e22401957 Merge branch 'player-controller' of https://github.com/DerTyp187/defrain into player-controller 2021-11-01 14:32:33 +01:00
juliuse98
0e780162db Merge branch 'player-controller' 2021-11-01 14:32:06 +01:00
juliuse98
314c3faf30 Ground Angle Check
-Added GroundAngleCheck
2021-11-01 14:30:00 +01:00
DerTyp187
c1711713b9 Merge branch 'main' into game-manager 2021-11-01 11:51:14 +01:00
Noah4ever
1878c6f291 Merge branch 'weapons-without-scriptableobjects' 2021-11-01 11:32:48 +01:00
Noah4ever
1644ff12cc Weapon 2021-11-01 11:31:34 +01:00
DerTyp187
30a30d7ef5 idk 2 2021-11-01 08:45:45 +01:00
DerTyp187
2fc1a3f063 Merge branch 'player-controller' of https://github.com/DerTyp187/defrain into player-controller 2021-11-01 08:44:49 +01:00
juliuse98
b8a4d57c27 Player Controller
-Added dedicated "Mouse Look" script
-Added Ground Angle function
2021-10-31 22:28:22 +01:00
DerTyp187
f2e8de1537 idk 2021-10-28 08:29:41 +02:00
DerTyp187
5921e33205 updated mirror added testofflinescene 2021-10-25 13:03:25 +02:00
DerTyp187
e509a919b6 CHANGED TO MIRROR 2021-10-25 09:20:01 +02:00
DerTyp187
bd712107b7 fixes 2021-10-21 18:31:30 +02:00
DerTyp187
ebf1078775 added network movement 2021-10-21 14:21:11 +02:00
DerTyp187
9f66155cd7 Merge branch 'player-controller' 2021-10-21 08:45:40 +02:00
DerTyp187
9de8a58fe5 Update PlayerMaster.cs 2021-10-21 08:42:05 +02:00
DerTyp187
c913fff83a added NetworkManager compontent 2021-10-20 07:53:44 +02:00
Noah4ever
3c7a401487 Weapon 2021-10-19 14:36:53 +02:00
juliuse98
9168a4aa8b Neck Control
Added a neck feature to the player camera
2021-10-19 08:56:05 +02:00
DerTyp187
0ce5bb61d6 installed mlapi 2021-10-19 08:49:36 +02:00
DerTyp187
add5beeb47 added base team class 2021-10-19 07:26:40 +02:00
Noah4ever
631938fa22 Weapon Pickup start
+ started weapon pickup
2021-10-18 19:24:56 +02:00
Noah4ever
0c274a031f Weapon Animation, Ammunition
+ fixed USP animation
+ fixed shooting with CTRL
+ added working ammunition
2021-10-18 18:13:06 +02:00
Noah4ever
c4d3f8590c Weapons start_2
+ added shooting animation
+ added idle animation
2021-10-18 16:48:47 +02:00
DerTyp187
c5162f3082 Merge branch 'player-master' into game-master 2021-10-18 09:02:50 +02:00
DerTyp187
c07aec7cc8 init 2021-10-18 09:00:26 +02:00
DerTyp187
266f1a0aca Update PlayerMaster.cs 2021-10-18 08:57:32 +02:00
Noah4ever
20830538db Weapon start
Started working on weapons.

+ added USP weapon
    - added materials
+ added Weapon.cs script
    - Implemented shooting
+ added WeaponSwitch.cs script
+ added WeaponHolder
+ added particles (muzzleflash, muzzlesmoke)
+ added additional camera for weapon clipping
2021-10-17 03:48:47 +02:00
DerTyp187
add984e36c adde ServerPlayer 2021-10-15 14:18:45 +02:00