Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Player model, smooth(ish) movement, better clienttester #2

Merged
merged 11 commits into from
Jul 9, 2017
Merged

Player model, smooth(ish) movement, better clienttester #2

merged 11 commits into from
Jul 9, 2017

Conversation

nesrak1
Copy link
Member

@nesrak1 nesrak1 commented Jul 8, 2017

No description provided.

Enflorence
Enflorence suggested changes Jul 8, 2017
View reviewed changes
Copy link
Contributor

@Enflorence Enflorence left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Before merging this change, take a look at improving the request's code style and reusability. Please take a look at my inline comments and let me know if you have any questions or disagree with any of my findings.

NitroxClient/NitroxClient.csproj Outdated
@@ -37,6 +37,9 @@
<Reference Include="Assembly-CSharp-firstpass">
<HintPath>C:\Program Files (x86)\Steam\steamapps\common\Subnautica\Subnautica_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
</Reference>
<Reference Include="iTween">

This comment was marked as abuse.

Sign in to view

This comment was marked as abuse.

Sign in to view

NitroxClient/GameLogic/PlayerGameObjectManager.cs Outdated
public void UpdatePlayerPosition(String playerId, Vector3 position, Quaternion rotation)
{
GameObject player = GetPlayerGameObject(playerId);
player.SetActive(true);
player.transform.position = position;
player.transform.rotation = rotation;
iTween.MoveTo(player, iTween.Hash("position", position, "easetype", iTween.EaseType.easeInOutSine, "time", 0.05f));

This comment was marked as abuse.

Sign in to view

NitroxClient/GameLogic/PlayerGameObjectManager.cs Outdated
player.transform.position = position;
player.transform.rotation = rotation;
iTween.MoveTo(player, iTween.Hash("position", position, "easetype", iTween.EaseType.easeInOutSine, "time", 0.05f));
iTween.RotateTo(player, iTween.Hash("rotation", rotation.eulerAngles, "easetype", iTween.EaseType.easeInOutSine, "time", 0.05f));

This comment was marked as abuse.

Sign in to view

NitroxClient/GameLogic/PlayerGameObjectManager.cs Outdated
@@ -36,7 +36,13 @@ public GameObject GetPlayerGameObject(String playerId)

private GameObject createOtherPlayer(String playerId)

This comment was marked as abuse.

Sign in to view

ClientTester/Program.cs Outdated
switch (cmd[0])
{
case "chat":
if (cmd.Count < 1) { Console.WriteLine($"\"{cmd[0]}\" does not take {cmd.Count - 1} arguments"); break; }

This comment was marked as abuse.

Sign in to view

ClientTester/Program.cs
@@ -9,6 +13,8 @@ class Program
{
private static readonly string DEFAULT_IP_ADDRESS = "127.0.0.1";

private static Vector3 clientPos = new Vector3(-50f, -2f, -38f);

static void Main(string[] args)

This comment was marked as abuse.

Sign in to view

MarijnS95
MarijnS95 suggested changes Jul 9, 2017
View reviewed changes
Copy link
Member

@MarijnS95 MarijnS95 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A couple nitpicks and ideas. Do with it as you like, and let me know what you think about them.

ClientTester/Commands/CommandManager.cs Outdated

public void TakeCommand(string command)
{
String[] commandArray = Regex.Matches(Console.ReadLine(), @"[\""].+?[\""]|[^ ]+")

This comment was marked as abuse.

Sign in to view

ClientTester/Commands/CommandManager.cs
RegisterCommand(new HelpCommand(commands));
}

public void RegisterCommand(NitroxCommand command)

This comment was marked as abuse.

Sign in to view

ClientTester/Commands/DefaultCommands/BuildCommand.cs
return;
}

if (args.Length > 4)

This comment was marked as abuse.

Sign in to view

This comment was marked as abuse.

Sign in to view

ClientTester/Commands/DefaultCommands/BuildCommand.cs Outdated
{
Name = "build";
Description = "Builds an object with the builder tool.";
Syntax = "build <techtype> <x> <y> <z> [xrot] [yrot] [zrot]";

This comment was marked as abuse.

Sign in to view

ClientTester/Commands/DefaultCommands/ChatCommand.cs

public override void Execute(MultiplayerClient client, string[] args)
{
if (args.Length < 1)

This comment was marked as abuse.

Sign in to view

ClientTester/Commands/DefaultCommands/MoveCommand.cs
float velX = curX - lastX;
float velY = curY - lastY;
client.clientPos += new Vector3(velX / 10f, 0, velY / 10f);
client.PacketSender.UpdatePlayerLocation(client.clientPos, Quaternion.identity, Optional<VehicleModel>.Empty());

This comment was marked as abuse.

Sign in to view

ClientTester/Commands/DefaultCommands/PosCommand.cs Outdated
{
public PosCommand()
{
Name = "drop";

This comment was marked as abuse.

Sign in to view

ClientTester/Commands/DefaultCommands/PosCommand.cs Outdated

public override void Execute(MultiplayerClient client, string[] args)
{
if (args.Length < 4)

This comment was marked as abuse.

Sign in to view

ClientTester/Program.cs Outdated

private static int lastX = -1;

This comment was marked as abuse.

Sign in to view

NitroxClient/GameLogic/MovementHelper.cs Outdated

namespace NitroxClient.GameLogic
{
public class MovementHelper

This comment was marked as abuse.

Sign in to view

@Sunrunner37 Sunrunner37 merged commit 4f4513a into SubnauticaNitrox:master Jul 9, 2017
nesrak1 pushed a commit to nesrak1/Nitrox that referenced this pull request Aug 29, 2017
@Sunrunner37
Merge pull request SubnauticaNitrox#2 from nesrak1/master
b71e0b4 
Player model, smooth(ish) movement, better clienttester
Sunrunner37 pushed a commit that referenced this pull request Oct 6, 2017
@Jannify
Merge pull request #2 from SubnauticaNitrox/master
87195ab 
Pull Request master
@Tibnan Tibnan mentioned this pull request Jan 4, 2019
Closed
Measurity referenced this pull request in Measurity/Nitrox Dec 31, 2019
@Sunrunner37
Merge pull request #2 from killzoms/master
96255f2 
Update to latest Harmony
Measurity referenced this pull request in Measurity/Nitrox Feb 1, 2020
@grandoth
Merge pull request #2 from SubnauticaNitrox/master
ad484b8 
Merge 1.0.1.0
dartasen pushed a commit to dartasen/Nitrox that referenced this pull request Mar 19, 2023
@Measurity
Merge pull request SubnauticaNitrox#2 from 20PercentRendered/linux
6089144 
Servers now work on linux
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MarijnS95 MarijnS95 MarijnS95 requested changes

@Enflorence Enflorence Enflorence requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@nesrak1 @MarijnS95 @Enflorence @Sunrunner37