Commit Graph

46 Commits

Author SHA1 Message Date
Noah4ever
e59b767daf Grenade Fix
Grenade is now a Sphere.
set Commented the [Command] on CmdFireBullet in Shoot.cs to see how it is in multiplayer
2021-12-09 13:33:54 +01:00
Noah4ever
3a1a279530 Grenades damage at player
Grenades now remove the correct damage
2021-12-08 20:53:40 +01:00
Noah4ever
1e432ad802 Grenade damage
If player is in sphere around grenade he gets damage
2021-12-08 17:26:58 +01:00
Noah4ever
59a55bf5fd Grenades
Fixed some issues.
Grenades work now.
2021-12-08 17:18:23 +01:00
Noah4ever
56f5aec9cc Grenades
[+] added
+ grenade.cs script
+ grenades can be thrown
+ grenades "explode" and spawn "explosion" (currently only a 50% transparent cube)

- NEEDS TO BE TESTED => BUG FIXED
2021-12-08 15:31:13 +01:00
Noah4ever
95f94d062d deleted old "SearchForNext"
Julius hat was besseres gemacht :(
2021-11-30 10:16:28 +01:00
juliuse98
cf5d47eca9 SearchForNext Overhaul 2021-11-29 12:21:32 +01:00
Noah4ever
59ff72d498 Weapons are now in correct position
When u switch or pickup weapons u have them now in your hand.

- Scrollup doesnt work on the highest weapon index (will be fixed soon)
- Shooting with the hand will give an error because there is no animation "shoot" on the hand (PLEASE someone make an animation for the hand!!!!)
2021-11-29 11:22:03 +01:00
juliuse98
58092d6b7e Procedual Animation Hand Fix
See "Procedual Animation Hand Fix" issue
2021-11-28 20:21:47 +01:00
Noah4ever
20080a4dd5 Weapons WORK NOW
Jetzt wirklich
2021-11-25 12:45:55 +01:00
Noah4ever
c09ff3ca75 Weapon Switch/Standard Hand
ja alles irgendwie
klappt jetzt
2021-11-25 11:24:16 +01:00
Noah4ever
a5fef8f5e0 idk 2021-11-22 16:26:15 +01:00
Noah4ever
420dd1199a more error correction 2021-11-21 20:51:29 +01:00
Noah4ever
35837c18cd Error correction on last commit 2021-11-21 18:28:34 +01:00
Noah4ever
c4eac172fe Weapon Switching/Pickup/Throwing
+ weapon switching works
+ weapon pickup works
+ weapon throwing works

ntba weapon in correct position
ntba weapon switch/pickup/throw animation
2021-11-21 18:00:23 +01:00
Noah4ever
a40aec3874 Weapon Switching/pickup/throw
[+] added
+ added pickup weapons
+ added throw weapons
+ added weapon switching
+ scrolling searches for next active weapon

[n] needs to be added
n weapon in correct position after pickup
n after weapon throw -> next active weapon needs to be equipt
n throw/pickup/switch weapon animation
2021-11-20 15:47:58 +01:00
Noah4ever
facc42b03f Weapon Switch 2021-11-16 17:50:32 +01:00
Noah4ever
7299b292a7 Weapon switching 2021-11-16 13:06:10 +01:00
Noah4ever
eaee767535 Weapon Switching
+ started weapon switching
+ added only get active weapon (if you have rifle and pistole and you drop rifle you cant scroll to rifle slot)
2021-11-16 13:05:27 +01:00
Noah4ever
1ac8585934 Weapon Fix
shoot.cs paar sachen
2021-11-15 12:59:05 +01:00
Noah4ever
f9527c17fd Weapon pickup
+ started pickup weapon script
2021-11-15 12:53:19 +01:00
Noah4ever
728dd06d3d Update Shoot.cs 2021-11-12 13:25:05 +01:00
juliuse98
1b0d941f07 Merge FIX 2021-11-12 11:14:06 +01:00
Noah4ever
dd4da20ec3 Weapon
idk
2021-11-12 08:23:51 +01:00
Noah4ever
6e13025624 Weapon usw.
etc....
2021-11-09 13:58:34 +01:00
Noah4ever
a8d816b639 Merge remote-tracking branch 'origin/Player-Animation' into weapons-without-scriptableobjects 2021-11-09 11:18:16 +01:00
Noah4ever
93faf526d5 Weapon Pointing 2021-11-09 11:11:32 +01:00
juliuse98
ea8394bd16 Camera recoil 2021-11-08 22:56:15 +01:00
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
cede4fb741 Oh Shit 2021-11-06 14:36:12 +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
312b51656b Headbob
-Added Headbob
2021-11-04 08:15:48 +01:00
Noah4ever
1644ff12cc Weapon 2021-11-01 11:31:34 +01:00
Noah4ever
3c7a401487 Weapon 2021-10-19 14:36:53 +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
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