janis/defrain-shooter-unity
0
0
Fork 0
mirror of https://github.com/DerTyp7/defrain-shooter-unity.git synced 2026-09-21 11:49:29 +02:00
Code Issues Packages Projects Releases Wiki Activity
176 Commits 17 Branches 0 Tags
5fd5f27ac6b8308e91d20ac8ffa6a258897d779d
Commit Graph
80 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Janis M 80a44e6d3e Merge branch 'main' of https://github.com/DerTyp187/defrain 2022-01-18 10:33:42 +01:00
Janis M 3bcc95612d fixed homescene 2022-01-18 10:33:36 +01:00
DerTyp187 eff2619acd added test sound 2022-01-02 14:42:03 +01:00
DerTyp187 9027425c70 Update AudioManager.cs 2022-01-02 14:05:57 +01:00
DerTyp187 be50ec5eed created audio manager and Sound class 2022-01-02 14:01:18 +01:00
DerTyp187 8c6d063e53 idfk 2021-12-22 23:10:29 +01:00
DerTyp187 e0c379d9d6 fixed hover bug 2021-12-22 23:08:22 +01:00
DerTyp187 4eed64f73b Merge branch 'Better-HomeScene' 2021-12-22 23:02:02 +01:00
DerTyp187 089a89b094 changed bg in scene 2021-12-22 23:01:33 +01:00
DerTyp187 64ff77be53 changeds bg 2021-12-22 23:01:15 +01:00
DerTyp187 b62dbc5afa backbtn 2021-12-22 22:57:09 +01:00
DerTyp187 405f59f764 added brightness method 2021-12-21 22:07:09 +01:00
DerTyp187 da164e4e90 finished inputfield prefab 2021-12-21 21:51:34 +01:00
Janis M 5205b9553f inputscript 2021-12-21 14:35:56 +01:00
Janis M 559b9d9f38 inputfield 2021-12-21 14:29:03 +01:00
Janis M 3350cf5c41 added input field script 2021-12-21 13:55:53 +01:00
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
DerTyp187 8072265797 Ready Up and Clean Up 2021-12-15 00:18:24 +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
DerTyp187 76cf463d23 added Team Lists 2021-11-29 11:18:27 +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
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
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
DerTyp187 c1711713b9 Merge branch 'main' into game-manager 2021-11-01 11:51:14 +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
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 8ce3b6cef1 Merge branch 'main' into Player-Animation 2021-10-25 13:07:26 +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
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
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
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
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
DerTyp187 7ba5aa69eb Added Documentation for Join/Leave List 2021-10-13 17:35:59 +02:00
DerTyp187 6c951b26da Update TestScene.unity 2021-10-13 15:04:25 +02:00
DerTyp187 eaaddb3f67 Added Basic PlayerMaster 2021-10-13 15:03:16 +02:00
DerTyp187 c1af73f04c Merge branch 'main' of https://github.com/DerTyp187/3d-shooter 2021-10-13 14:10:44 +02:00
DerTyp187 c14da9168d Added GameManager 2021-10-13 14:10:07 +02:00
DerTyp187 5e15b47d35 mb fixed CharacterController; FpsCount 2021-10-13 08:50:54 +02:00
DerTyp187 475110316b Update TestScene.unity 2021-10-12 19:38:30 +02:00
DerTyp187 db14a3c933 Added buggy PlayerController 2021-10-12 19:38:20 +02:00
DerTyp187 bfac9e07a2 Textures + Basic PlayerController 2021-10-10 13:50:04 +02:00
DerTyp187 bf81c10e49 Created Project 2021-10-10 12:28:45 +02:00