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

62 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
8523320e14 Merge branch 'player-controller' 2021-11-04 08:20:52 +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
DerTyp187
4a4ee14fb8 changes version to 2021.2 2021-11-03 07:31:44 +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
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
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
juliuse98
a1f13cd6c6 Added Map1 
-Added Map1
-Added Prefabs for the Network Manager
 2021-10-30 18:22:18 +02:00
DerTyp187
f2e8de1537 idk 2021-10-28 08:29:41 +02:00
DerTyp187
57ee0da640 Merge branch 'main' into player-controller 2021-10-25 13:08:12 +02:00
DerTyp187
5921e33205 updated mirror added testofflinescene 2021-10-25 13:03:25 +02:00
DerTyp187
93244c5160 Create SceneTemplateSettings.json 2021-10-25 09:23:28 +02:00
DerTyp187
e509a919b6 CHANGED TO MIRROR 2021-10-25 09:20:01 +02:00
juliuse98
e59f509df6 PlayerController 
-Set up the player Prefab
-Added sprinting
-Added speed up and speed down
 2021-10-22 11:09:11 +02:00
juliuse98
18d90a2119 Fixed Neck 
Fixed the Player Controller Prefab
 2021-10-21 22:03:07 +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
5b3b780234 little changes 2021-10-20 14:24:39 +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
30b2f8f4b2 Installed MLAPI 2021-10-19 08:48:38 +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
DerTyp187
1deb6add0d Update TestScene.unity 2021-10-14 20:19:01 +02:00
DerTyp187
666e4f479f added PlayerClass with Sync 2021-10-14 20:16:38 +02:00
DerTyp187
e057a569a5 Added Kills & Deaths Lists 2021-10-14 14:56:29 +02:00
DerTyp187
469fd047bd Add HealthSystem and Base Structure of DeadSystem 
HEALTH
 - Set Health of a player
 - Subtract Health from a player
 - Add Health to a player

DEAD
 - Player Dies
 - Another Player gets a kill
 2021-10-13 18:52:06 +02:00