Skip to content

Feat: Client Driven UI Art #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 49 commits into from
Dec 7, 2022
Merged
Show file tree
Hide file tree
Changes from 43 commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
af30a9e
update clientdriven sample to 2021.3.12f1
fernando-cortez Nov 2, 2022
68d3842
third person controller assets added
fernando-cortez Nov 2, 2022
030f1e1
dependencies updated
fernando-cortez Nov 2, 2022
78d6b8d
update to NGO 1.0.2
fernando-cortez Nov 3, 2022
25b5023
Merge branch 'chore/clientdriven-LTS-update' into feat/third-person-c…
fernando-cortez Nov 3, 2022
dcfae3a
Merge branch 'feat/third-person-character-controller-assets' into fea…
fernando-cortez Nov 3, 2022
e68b5d4
integration of networked third person character avatar
fernando-cortez Nov 3, 2022
5fb1b9d
using NGO 1.1.0
fernando-cortez Nov 3, 2022
8b9638d
Merge branch 'chore/clientdriven-LTS-update' into feat/third-person-c…
fernando-cortez Nov 3, 2022
67a8371
Merge branch 'feat/third-person-character-controller-assets' into fea…
fernando-cortez Nov 3, 2022
d2a1e60
Merge branch 'develop' into feat/third-person-character-controller-in…
fernando-cortez Nov 4, 2022
1f93e65
WIP targeting Boss Room's utility package commit for ClientNetworkAni…
fernando-cortez Nov 7, 2022
e8086ab
IP window allows for custom IP using UI Toolkit, player apply force r…
fernando-cortez Nov 9, 2022
646ec6f
Merge branch 'develop' into feat/third-person-character-controller-in…
fernando-cortez Nov 9, 2022
1a3868d
feedback: non-alloc raycasts, less spawns, format, etc
fernando-cortez Nov 10, 2022
0a512a1
Merge branch 'develop' into feat/third-person-character-controller-in…
fernando-cortez Nov 10, 2022
dfb8a8f
removing motionspeed animation speed multiplier
fernando-cortez Nov 15, 2022
8af7cc8
player spawned after spawn points are consumed is spawned at world or…
fernando-cortez Nov 15, 2022
e158d2d
feedback on formatting & interactivity
fernando-cortez Nov 17, 2022
8a5a4e6
changlog addition, more feedback changes
fernando-cortez Nov 21, 2022
a1561ab
Merge branch 'develop' into feat/third-person-character-controller-in…
fernando-cortez Nov 21, 2022
c2858a2
MTT stamps for thirdpersoncontroller script
fernando-cortez Nov 21, 2022
5999a81
reordering when iskinematic is enabled
fernando-cortez Nov 21, 2022
0f1e5e2
capsule collider added to ghost players, ingredient is dropped overhead
fernando-cortez Nov 28, 2022
b7cee80
ground layer usage
fernando-cortez Nov 28, 2022
58d43c7
stove collider upsize
fernando-cortez Nov 28, 2022
e123a61
restoring drop overhead, removing fixedupdate usage
fernando-cortez Nov 29, 2022
d37c360
renaming
fernando-cortez Nov 29, 2022
752a067
re-enabling footstep sound on ghost clients
fernando-cortez Nov 30, 2022
a173fc2
UI visual update, as well as renaming / deleting old files from the 2…
jilfranco-unity Nov 30, 2022
55ca074
more description on MTT usage
fernando-cortez Nov 30, 2022
d249861
Merge branch 'feat/third-person-character-controller-integration-IP-U…
jilfranco-unity Nov 30, 2022
0484478
re-added MotionSpeed functionality, any mapping can apply input (inpu…
fernando-cortez Nov 30, 2022
231f2d3
comment feedback
fernando-cortez Nov 30, 2022
df674b7
pickup height bumped up
fernando-cortez Dec 1, 2022
1c23a16
merge develop, fixing in-scene geometry & spawn points
fernando-cortez Dec 1, 2022
62ddb88
documenting NGO workaround to set in-scene NetworkVariable starting v…
fernando-cortez Dec 2, 2022
3c28044
dropzone prefab scale correction
fernando-cortez Dec 2, 2022
e0a2415
removing old host/join component, player motionspeed default param se…
fernando-cortez Dec 2, 2022
b4abf9d
Merge branch 'develop' into feat/third-person-character-controller-in…
fernando-cortez Dec 2, 2022
636cc54
removing workaround on networkvariables on in-scene placed NetworkObj…
fernando-cortez Dec 5, 2022
0db7fd6
Merge branch 'feat/third-person-character-controller-integration-IP-U…
jilfranco-unity Dec 5, 2022
f0ad6ef
Updated description of tutorial in the game UI
jilfranco-unity Dec 6, 2022
9a2aeb8
Merge branch 'develop' into feat/client-driven-ui-art
jilfranco-unity Dec 6, 2022
5a48e9f
Packages lock update and reserialization of a ui texture
jilfranco-unity Dec 6, 2022
d29b1ea
Made outline of words a bit darker to improve legibility against back…
jilfranco-unity Dec 6, 2022
5185596
Fixed up some broken style sheet refs and deleted the old unused font
jilfranco-unity Dec 6, 2022
54be6a8
Merge branch 'develop' into feat/client-driven-ui-art
jilfranco-unity Dec 6, 2022
dd38da1
Merge branch 'develop' into feat/client-driven-ui-art
jilfranco-unity Dec 7, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Basic/ClientDriven/Assets/Fonts.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1,747 changes: 1,747 additions & 0 deletions Basic/ClientDriven/Assets/Fonts/chintzy SDF.asset

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions Basic/ClientDriven/Assets/Fonts/chintzy SDF.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Basic/ClientDriven/Assets/Fonts/chintzy.ttf
Binary file not shown.
21 changes: 21 additions & 0 deletions Basic/ClientDriven/Assets/Fonts/chintzy.ttf.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Basic/ClientDriven/Assets/InputSystem.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,294 @@
{
"name": "StarterAssets_Networked",
"maps": [
{
"name": "Player",
"id": "f62a4b92-ef5e-4175-8f4c-c9075429d32c",
"actions": [
{
"name": "Move",
"type": "Value",
"id": "6bc1aaf4-b110-4ff7-891e-5b9fe6f32c4d",
"expectedControlType": "Vector2",
"processors": "",
"interactions": "",
"initialStateCheck": true
},
{
"name": "Look",
"type": "Value",
"id": "2690c379-f54d-45be-a724-414123833eb4",
"expectedControlType": "Vector2",
"processors": "",
"interactions": "",
"initialStateCheck": true
},
{
"name": "Jump",
"type": "Button",
"id": "8c4abdf8-4099-493a-aa1a-129acec7c3df",
"expectedControlType": "Button",
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "Sprint",
"type": "PassThrough",
"id": "980e881e-182c-404c-8cbf-3d09fdb48fef",
"expectedControlType": "",
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "PickUp",
"type": "Button",
"id": "e7da474d-92b6-41e6-bc91-90d37cd5c73d",
"expectedControlType": "Button",
"processors": "",
"interactions": "",
"initialStateCheck": false
}
],
"bindings": [
{
"name": "WASD",
"id": "b7594ddb-26c9-4ba2-bd5a-901468929edc",
"path": "2DVector(mode=1)",
"interactions": "",
"processors": "",
"groups": "",
"action": "Move",
"isComposite": true,
"isPartOfComposite": false
},
{
"name": "up",
"id": "2063a8b5-6a45-43de-851b-65f3d46e7b58",
"path": "<Keyboard>/w",
"interactions": "",
"processors": "",
"groups": "KeyboardMouse",
"action": "Move",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "down",
"id": "64e4d037-32e1-4fb9-80e4-fc7330404dfe",
"path": "<Keyboard>/s",
"interactions": "",
"processors": "",
"groups": "KeyboardMouse",
"action": "Move",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "left",
"id": "0fce8b11-5eab-4e4e-a741-b732e7b20873",
"path": "<Keyboard>/a",
"interactions": "",
"processors": "",
"groups": "KeyboardMouse",
"action": "Move",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "right",
"id": "7bdda0d6-57a8-47c8-8238-8aecf3110e47",
"path": "<Keyboard>/d",
"interactions": "",
"processors": "",
"groups": "KeyboardMouse",
"action": "Move",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "up",
"id": "bb94b405-58d3-4998-8535-d705c1218a98",
"path": "<Keyboard>/upArrow",
"interactions": "",
"processors": "",
"groups": "KeyboardMouse",
"action": "Move",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "down",
"id": "929d9071-7dd0-4368-9743-6793bb98087e",
"path": "<Keyboard>/downArrow",
"interactions": "",
"processors": "",
"groups": "KeyboardMouse",
"action": "Move",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "left",
"id": "28abadba-06ff-4d37-bb70-af2f1e35a3b9",
"path": "<Keyboard>/leftArrow",
"interactions": "",
"processors": "",
"groups": "KeyboardMouse",
"action": "Move",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "right",
"id": "45f115b6-9b4f-4ba8-b500-b94c93bf7d7e",
"path": "<Keyboard>/rightArrow",
"interactions": "",
"processors": "",
"groups": "KeyboardMouse",
"action": "Move",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "",
"id": "e2f9aa65-db06-4c5b-a2e9-41bc8acb9517",
"path": "<Gamepad>/leftStick",
"interactions": "",
"processors": "StickDeadzone",
"groups": "Gamepad",
"action": "Move",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "ed66cbff-2900-4a62-8896-696503cfcd31",
"path": "<Pointer>/delta",
"interactions": "",
"processors": "InvertVector2(invertX=false),ScaleVector2(x=0.05,y=0.05)",
"groups": "KeyboardMouse",
"action": "Look",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "d1d171b6-19d8-47a6-ba3a-71b6a8e7b3c0",
"path": "<Gamepad>/rightStick",
"interactions": "",
"processors": "InvertVector2(invertX=false),StickDeadzone,ScaleVector2(x=300,y=300)",
"groups": "Gamepad",
"action": "Look",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "1bd55a0b-761e-4ae4-89ae-8ec127e08a29",
"path": "<Keyboard>/space",
"interactions": "",
"processors": "",
"groups": "KeyboardMouse",
"action": "Jump",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "9f973413-5e27-4239-acee-38c4a63feeba",
"path": "<Gamepad>/buttonSouth",
"interactions": "",
"processors": "",
"groups": "Gamepad",
"action": "Jump",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "dc65b89f-9bd3-43fb-92af-d0d87ba5faa4",
"path": "<Keyboard>/leftShift",
"interactions": "",
"processors": "",
"groups": "KeyboardMouse",
"action": "Sprint",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "c8fcd86e-dcfd-4f88-8e93-b638cdbf3320",
"path": "<Gamepad>/leftTrigger",
"interactions": "",
"processors": "",
"groups": "Gamepad",
"action": "Sprint",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "04c89c8b-fa71-46ba-92ff-e6b8e5ecff92",
"path": "<Keyboard>/e",
"interactions": "",
"processors": "",
"groups": "",
"action": "PickUp",
"isComposite": false,
"isPartOfComposite": false
}
]
}
],
"controlSchemes": [
{
"name": "KeyboardMouse",
"bindingGroup": "KeyboardMouse",
"devices": [
{
"devicePath": "<Keyboard>",
"isOptional": false,
"isOR": false
},
{
"devicePath": "<Mouse>",
"isOptional": false,
"isOR": false
}
]
},
{
"name": "Gamepad",
"bindingGroup": "Gamepad",
"devices": [
{
"devicePath": "<Gamepad>",
"isOptional": true,
"isOR": false
},
{
"devicePath": "<XInputController>",
"isOptional": true,
"isOR": false
},
{
"devicePath": "<DualShockGamepad>",
"isOptional": true,
"isOR": false
}
]
},
{
"name": "Xbox Controller",
"bindingGroup": "Xbox Controller",
"devices": []
},
{
"name": "PS4 Controller",
"bindingGroup": "PS4 Controller",
"devices": []
}
]
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading