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
155 Commits 17 Branches 0 Tags
7bb3a90a1b9753e6be1826b80996ed70ba696a98
Commit Graph

155 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Janis M
7bb3a90a1b worked on InpuTField 2021-12-21 13:52:10 +01:00
Janis M
6a06e21a96 u 2021-12-21 10:24:41 +01:00
DerTyp187
dedeb7567f ghdx 2021-12-20 16:43:13 +01:00
DerTyp187
4902fb2816 added new HomeSceneBtns 2021-12-17 00:45:39 +01:00
DerTyp187
7faa5f9a76 Finished Merge 
- Old NetworkManager delete in testscene (new one is "NetManager" and comes from the HomeScene via "DoNotDestroy-Object")

- set up lobbymanager, netmanager
 2021-12-16 22:16:09 +01:00
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
14ad07036e Merge branch 'Lobby-System' 2021-12-16 21:57:42 +01:00
DerTyp187
dc62dddb11 updated to 2021.2.7f 
had to updated because of Lobby-System Merge
 2021-12-16 21:57:14 +01:00
DerTyp187
3206cccb80 updated 2021-12-16 21:54:05 +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
acae797f36 deleted home scene 2021-12-16 21:19:57 +01:00
DerTyp187
831346c4b0 fixed inputfields 2021-12-16 00:40:47 +01:00
DerTyp187
82dc2c3c6c absoulter basic join kram klappt 2021-12-16 00:04:36 +01:00
Noah4ever
21c03f5b00 added 4 assets 
+ jerrycan1
+ stonewall1
+ stonewall2
+ streetlantern1
 2021-12-15 14:06:53 +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
DerTyp187
8072265797 Ready Up and Clean Up 2021-12-15 00:18:24 +01:00
Noah4ever
bdf043d299 Quick bug fixes 
fixed pickup weapon
fixed drop weapon
changed switch weapon
 2021-12-14 20:18:18 +01:00
Noah4ever
0fc8c6e08c Distance to grenade explosion camera shake 
if you are close to the grenade you get more camera shake
 2021-12-13 21:52:38 +01:00
Noah4ever
b2b997307b CameraShake 
Camera shake is working now
 2021-12-13 16:02:11 +01:00
Noah4ever
a2ac91bf6e Camera Shake, WeaponSwitch Animation 
Added camera shake. Its not working.. i dont know why.
WeaponSwitch is also not working
 2021-12-12 18:19:36 +01:00
Noah4ever
9512d9dac1 DebugCanvas and ShootDebug 
Fixed DebugAmmunitionText on DebugCanvas
Added hitForce on Weapons. When you hit an object with a rigidbody its going to fly back a little bit
 2021-12-10 15:38:59 +01:00
Noah4ever
14a8f084d3 PostProcessing & Universal RP 
added PostProcessing and Universal Render Pipeline from the Packet Manager.
You can disable PostProcessing (If it lags too much) by disabling PostProcessingVolume in the Hierarchy.

added some fancy lights to the test scnee
added dirt texture to the camera
added bloom to the lights
added light to explosion from grenade
 2021-12-10 09:22:32 +01:00
Noah4ever
e0b4b94412 idk 2021-12-09 16:33:13 +01:00
Noah4ever
df14f7bdd7 Update issue templates 
Added "Bug report" and "Feature request"
 2021-12-09 15:00:50 +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
DerTyp187
e8499c91d1 Switching Teams with btns 2021-12-09 13:12:02 +01:00
DerTyp187
b3ee44a9e3 added new home scene 2021-12-08 22:21:21 +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
DerTyp187
76cf463d23 added Team Lists 2021-11-29 11:18:27 +01:00
Noah4ever
ad1e0cfeef Merge branch 'main' of https://github.com/DerTyp187/defrain 2021-11-29 08:16:33 +01:00
Noah4ever
919cb095a8 kein plan was das alles ist 2021-11-29 08:16:14 +01:00
juliuse98
58092d6b7e Procedual Animation Hand Fix 
See "Procedual Animation Hand Fix" issue
 2021-11-28 20:21:47 +01:00
DerTyp187
c56f1d4a49 added Ready, NameChange, LobbyTitleChange 
Added the function "AuthHost" (lobby.cs) )which can be used to check if the request comes from a host
 2021-11-28 20:20:11 +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
DerTyp187
95219e730e odku 2021-11-26 16:02:03 +01:00
DerTyp187
9cd80c86e0 prefabs 2021-11-26 09:07:42 +01:00
DerTyp187
f238d16f8e added scene 2021-11-26 08:56:05 +01:00
DerTyp187
62e35c6b7d version 2021-11-26 08:53:40 +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