janis/defrain-shooter-unity
1
0
Fork 0
mirror of https://github.com/DerTyp7/defrain-shooter-unity.git synced 2025-10-29 12:52:07 +01:00
Code Issues Packages Projects Releases Wiki Activity
178 Commits 17 Branches 0 Tags
main
Commit Graph

45 Commits

Author SHA1 Message Date
DerTyp187
0beeed4540 Merging retry 2021-12-16 22:08:59 +01:00
DerTyp187
151f63c9fb Revert "Merging" 
This reverts commit b180875539.
 2021-12-16 22:03:10 +01:00
DerTyp187
b180875539 Merging 2021-12-16 22:01:55 +01:00
DerTyp187
131d40dcda Revert "Merge branch 'Lobby-System'" 
This reverts commit f19e634ee9, reversing
changes made to 21c03f5b00.
 2021-12-16 21:41:38 +01:00
DerTyp187
f19e634ee9 Merge branch 'Lobby-System' 2021-12-16 21:40:56 +01:00
DerTyp187
82dc2c3c6c absoulter basic join kram klappt 2021-12-16 00:04:36 +01:00
Noah4ever
572344254d Little fix on player, added trigger collider on usp 
@juliuse98 needs to fix when looking up the weapon gets to far away an the hands look strange. Tried to fix it a bit. Its no a little better but NOT completely fixed.

USP has now a collider that is a trigger. When the weapon is clipping through the wall (befor that the collider should trigger and the player puts the weapon upright) ITS NOT WORKING but the structure is there... (All collider gets disabled when you pick up a weapon)
 2021-12-15 13:19:10 +01:00
Noah4ever
0b7ff6f5f1 Grenade Data Location 
Grenade data is now on Grenade.cs and not on Weapon.cs.
You need both scripts to make a grenade work
 2021-12-09 14:55:06 +01:00
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
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
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
juliuse98
a4fb6b9f33 Player walk animations 
-Added walk animation
-Added strafe animation
-Added animation blending for strafe and walk
-Added method that controls animation parameters based on movement speed

-smol canvas fix
 2021-11-28 18:54:24 +01:00
Noah4ever
20080a4dd5 Weapons WORK NOW 
Jetzt wirklich
 2021-11-25 12:45:55 +01:00
Noah4ever
859dda5899 Merge branch 'main' into weapons-without-scriptableobjects 2021-11-25 11:27:29 +01:00
Noah4ever
c09ff3ca75 Weapon Switch/Standard Hand 
ja alles irgendwie
klappt jetzt
 2021-11-25 11:24:16 +01:00
juliuse98
6bbe58799d Alles alter 2021-11-24 12:54:43 +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
f9527c17fd Weapon pickup 
+ started pickup weapon script
 2021-11-15 12:53:19 +01:00
juliuse98
1b0d941f07 Merge FIX 2021-11-12 11:14:06 +01:00
juliuse98
dd44099bab Merge branch 'Player-AnimationFIX' 2021-11-12 08:27:48 +01:00
juliuse98
a31989b459 I Think i Fixed Everyting 2021-11-11 20:26:03 +01:00
Noah4ever
a8d816b639 Merge remote-tracking branch 'origin/Player-Animation' into weapons-without-scriptableobjects 2021-11-09 11:18:16 +01:00
juliuse98
df60a95c80 aim down sights 2021-11-08 17:24:54 +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
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
juliuse98
908e69d4fe Added Stuff 2021-11-05 13:41:43 +01:00
Noah4ever
5a4d0cc659 Merge remote-tracking branch 'origin/Maps' 2021-11-01 11:40:09 +01:00
Noah4ever
1878c6f291 Merge branch 'weapons-without-scriptableobjects' 2021-11-01 11:32:48 +01:00
juliuse98
a1f13cd6c6 Added Map1 
-Added Map1
-Added Prefabs for the Network Manager
 2021-10-30 18:22:18 +02:00
juliuse98
8c2c3e10db Player Animations 
-Configured the human avatar and avatar masks
-Added aiming animation
-Added Idle animation
 2021-10-25 08:32:50 +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
Noah4ever
631938fa22 Weapon Pickup start 
+ started weapon pickup
 2021-10-18 19:24:56 +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
bfac9e07a2 Textures + Basic PlayerController 2021-10-10 13:50:04 +02:00