Code

VR Side: Unity/Server Connections#142

Code

Open

jasmine-bae wants to merge 109 commits intomasteraugcog/ISAACS_Interface:masterfrom vrSideaugcog/ISAACS_Interface:vrSideCopy head branch name to clipboard

+808,235-240,482

Commits

Commits on Sep 24, 2020

• Initial commit, set up ServerConnections.cs

  jasmine-bae

  committed
  1fa4c8e

  Copy full SHA for 1fa4c8e

Commits on Sep 30, 2020

• setup drone_v2 skeleton

  Huw-man

  committed
  8f782f9

  Copy full SHA for 8f782f9

Commits on Oct 3, 2020

• basic structure setup

  PeruDayani

  committed
  2ca2450

  Copy full SHA for 2ca2450

• Merge branch 'master' of https://github.com/immersive-command-system/ImmersiveDroneInterface_2 into vrSide

  jasmine-bae

  committed
  3da75b4

  Copy full SHA for 3da75b4

• Upgraded worldproperties and dronebuttons to drone_v2

  jasmine-bae

  committed
  3a7afb0

  Copy full SHA for 3a7afb0

• server connection work

  PeruDayani

  committed
  582a5d2

  Copy full SHA for 582a5d2

• fixed merge conflicts

  PeruDayani

  committed
  c093feb

  Copy full SHA for c093feb

• basic server connections

  Huw-man

  committed
  f23fdca

  Copy full SHA for f23fdca

Commits on Oct 8, 2020

• Initial commit, set up ServerConnections.cs

  jasmine-bae

  committed
  86f56b1

  Copy full SHA for 86f56b1

• setup drone_v2 skeleton

  

  Huw-man

  authored and

  jasmine-bae

  committed
  629731d

  Copy full SHA for 629731d

• basic structure setup

  

  PeruDayani

  authored and

  jasmine-bae

  committed
  4969c01

  Copy full SHA for 4969c01

• Upgraded worldproperties and dronebuttons to drone_v2

  jasmine-bae

  committed
  abab529

  Copy full SHA for abab529

• broke unity but added dictionary

  jasmine-bae

  committed
  548df92

  Copy full SHA for 548df92

• changed to ordered dict

  jasmine-bae

  committed
  3196fe9

  Copy full SHA for 3196fe9

Commits on Oct 10, 2020

• Merge branch 'vrSide' into fixingit

  PeruDayani

  authored
  a1e64e7

  Copy full SHA for a1e64e7

• Merge pull request #153 from immersive-command-system/fixingit

  Show description for bdb802f
  PeruDayani

  authored
  bdb802f

  Copy full SHA for bdb802f

• fixed remaining errors

  PeruDayani

  committed
  205ea20

  Copy full SHA for 205ea20

• Added new dictionary in addition to queue, compatability with Drone_v2

  jasmine-bae

  committed
  3653b09

  Copy full SHA for 3653b09

• server add drone method

  PeruDayani

  committed
  f6f0fb9

  Copy full SHA for f6f0fb9

• Merge branch 'vrSide' of https://github.com/immersive-command-system/ImmersiveDroneInterface_2 into vrSide

  PeruDayani

  committed
  105319d

  Copy full SHA for 105319d

• Merged with Jasmine's work

  PeruDayani

  committed
  ac82526

  Copy full SHA for ac82526

• new tasks decided, worksession successfull

  PeruDayani

  committed
  9e56b8d

  Copy full SHA for 9e56b8d

• updated some more upgrades

  jasmine-bae

  committed
  ccb3647

  Copy full SHA for ccb3647

Commits on Oct 15, 2020

• starting worksession oct 14

  jasmine-bae

  committed
  1851dd1

  Copy full SHA for 1851dd1

• Fixed Droneproperties.cs, debugged Waypoint.cs & WaypointProperties.cs although more fixes needed

  akhilvemuri

  committed
  e76b7bf

  Copy full SHA for e76b7bf

Commits on Oct 17, 2020

• Casting Drone to DroneV2 using as operator

  akhilvemuri

  committed
  33effcf

  Copy full SHA for 33effcf

• need to fixup serverconnections

  jasmine-bae

  committed
  4f24a95

  Copy full SHA for 4f24a95

Commits on Oct 24, 2020

• fixed minor errors

  PeruDayani

  committed
  ccd3023

  Copy full SHA for ccd3023

• broken testing features

  PeruDayani

  committed
  16f6e7b

  Copy full SHA for 16f6e7b

• Added some custom messages for allDronesAvailable

  jasmine-bae

  committed
  e7fa009

  Copy full SHA for e7fa009

• Merge branch 'vrSide' of https://github.com/immersive-command-system/ImmersiveDroneInterface_2 into vrSide

  jasmine-bae

  committed
  dbc397f

  Copy full SHA for dbc397f

• Custom messages added

  akhilvemuri

  committed
  9aa3993

  Copy full SHA for 9aa3993

• fixing errors

  PeruDayani

  committed
  0f0afa9

  Copy full SHA for 0f0afa9

• Merge branch 'vrSide' of https://github.com/immersive-command-system/ImmersiveDroneInterface_2 into vrSide

  PeruDayani

  committed
  8e78b11

  Copy full SHA for 8e78b11

• fixed errors and completed testing

  PeruDayani

  committed
  5b65658

  Copy full SHA for 5b65658

• Returns -1 for _id in QueryTopicsMsg.cs

  akhilvemuri

  committed
  edd210d

  Copy full SHA for edd210d

Commits on Nov 19, 2020

• set up skeleton for sensors in serverconnection.cs

  jasmine-bae

  committed
  7ceb741

  Copy full SHA for 7ceb741

• doing lamp sensor

  jasmine-bae

  committed
  f656c06

  Copy full SHA for f656c06

Commits on Nov 21, 2020

• fixed some changes to serverconnections.cs, still doesnt display drones but does connect to server

  jasmine-bae

  committed
  3c2bec9

  Copy full SHA for 3c2bec9

Commits on Dec 3, 2020

• Added template for SensorV2 scripts

  akhilvemuri

  committed
  49fafa1

  Copy full SHA for 49fafa1

• Added template for ServerV2 scripts

  akhilvemuri

  committed
  36d3db4

  Copy full SHA for 36d3db4

• Added template for SensorV2

  akhilvemuri

  committed
  b9ddbb5

  Copy full SHA for b9ddbb5

• changed ip address to my local

  

  Jasmine Bae

  committed
  4331e62

  Copy full SHA for 4331e62

Commits on Jan 16, 2021

• Fixed all custom mesages, adding functionality to drone-server topics

  

  Jasmine Bae

  committed
  e56717e

  Copy full SHA for e56717e

Commits on Jan 17, 2021

• still working on ServerConnections/drone services

  

  Jasmine Bae

  committed
  3650021

  Copy full SHA for 3650021

Commits on Jan 23, 2021

• finished drone operations for serverconnections.cs, test with server no work

  jasmine-bae

  committed
  95ad6d4

  Copy full SHA for 95ad6d4

Commits on Feb 5, 2021

• fixed up serverconnections.cs, fixed bug with rosBridgeLib Render(), getting some responses from server

  jasmine-bae

  committed
  46d1bf7

  Copy full SHA for 46d1bf7

Commits on Feb 6, 2021

• debugged submodule

  jasmine-bae

  committed
  a6165a4

  Copy full SHA for a6165a4

• pushed changes to try and fix UpdateWaypoints and ControlDrone

  jasmine-bae

  committed
  dad0473

  Copy full SHA for dad0473

Commits on Feb 10, 2021

• added first 3d recon mesh in Assets/Models

  orrblue

  committed
  a04e64a

  Copy full SHA for a04e64a

Commits on Feb 13, 2021

• Fixed up DroneMenu (ready for testing)

  jasmine-bae

  committed
  c438565

  Copy full SHA for c438565

Commits on Feb 14, 2021

• starting switching to ROS #

  jasmine-bae

  committed
  0be1dfe

  Copy full SHA for 0be1dfe

• Merge branch 'vrSide' of https://github.com/immersive-command-system/ImmersiveDroneInterface_2 into vrSide

  jasmine-bae

  committed
  bb886ad

  Copy full SHA for bb886ad

Commits on Feb 21, 2021

• switched to 2019 and integrated ROS Sharp

  akhilvemuri

  committed
  eed0f24

  Copy full SHA for eed0f24

• Merge branch 'vrSide' of https://github.com/immersive-command-system/ImmersiveDroneInterface_2 into vrSide

  jasmine-bae

  committed
  a567185

  Copy full SHA for a567185

• changed to 2019 v2

  akhilvemuri

  committed
  76e367a

  Copy full SHA for 76e367a

• Merge branch 'vrSide' of https://github.com/immersive-command-system/ImmersiveDroneInterface_2 into vrSide

  jasmine-bae

  committed
  2515753

  Copy full SHA for 2515753

• removed unused Assets

  akhilvemuri

  committed
  e04f9bc

  Copy full SHA for e04f9bc

• Merge branch 'vrSide' of https://github.com/immersive-command-system/ImmersiveDroneInterface_2 into vrSide

  jasmine-bae

  committed
  1eb5f6c

  Copy full SHA for 1eb5f6c

Commits on Feb 27, 2021

• saving mesh and main scene settings

  orrblue

  committed
  6fba9c7

  Copy full SHA for 6fba9c7

• some changes to ros service calls, will test next week

  jasmine-bae

  committed
  9f8faa2

  Copy full SHA for 9f8faa2

Commits on Feb 28, 2021

• added UI functionality for setting drone speed

  jasmine-bae

  committed
  f860504

  Copy full SHA for f860504

Commits on Mar 1, 2021

• shader for zed mesh

  WeiyanZhu

  committed
  e4d828c

  Copy full SHA for e4d828c

• add zed mesh sensor type

  WeiyanZhu

  committed
  6436d70

  Copy full SHA for 6436d70

• change sensor type name

  WeiyanZhu

  committed
  92b8c29

  Copy full SHA for 92b8c29

• make shader in mesh visualizer changeable

  WeiyanZhu

  committed
  4b7d5af

  Copy full SHA for 4b7d5af

Commits on Mar 2, 2021

• readded and changed .dll files

  akhilvemuri

  committed
  fb34cd4

  Copy full SHA for fb34cd4

Commits on Mar 3, 2021

• Merge pull request #168 from WeiyanZhu/meshChangeMaterial

  Show description for 8ed504d
  orrblue

  authored
  8ed504d

  Copy full SHA for 8ed504d

• Merge branch '3d-recon' of https://github.com/immersive-command-system/ImmersiveDroneInterface_2 into 3d-recon

  orrblue

  committed
  d58d55b

  Copy full SHA for d58d55b

Commits on Mar 6, 2021

• removed rossharp temporarily

  akhilvemuri

  committed
  0e76182

  Copy full SHA for 0e76182

• fixed .gitmodules ?

  akhilvemuri

  committed
  8b964e4

  Copy full SHA for 8b964e4

Commits on Mar 7, 2021

• fixed issues with submodules

  jasmine-bae

  committed
  9b310fc

  Copy full SHA for 9b310fc

• switching to ROS#, visual studio solution not working on my computer

  jasmine-bae

  committed
  1272669

  Copy full SHA for 1272669

Commits on Mar 8, 2021

• merge conflict resolved

  orrblue

  committed
  964c5e2

  Copy full SHA for 964c5e2

Commits on Mar 11, 2021

• visualize 2 meshes

  orrblue

  committed
  bd7dc09

  Copy full SHA for bd7dc09

Commits on Mar 20, 2021

• added custom messages rossharp

  akhilvemuri

  committed
  767efe0

  Copy full SHA for 767efe0

Commits on Mar 21, 2021

• working on transferring to ros#

  jasmine-bae

  committed
  2b303d6

  Copy full SHA for 2b303d6

Commits on Mar 22, 2021

• alldronesavailable ros# subscriber & publisher

  akhilvemuri

  committed
  4de5c0f

  Copy full SHA for 4de5c0f

• alldronesavailable ros#

  akhilvemuri

  committed
  3d63632

  Copy full SHA for 3d63632

Commits on Apr 3, 2021

• made all drones available, drone gameobject not made in unity

  jasmine-bae

  committed
  b118f40

  Copy full SHA for b118f40

Commits on Apr 10, 2021

• fixed infinite recursion, maybe

  jasmine-bae

  committed
  34208dc

  Copy full SHA for 34208dc

• adding uploadmission actions, fixed serverconnection2 bug

  jasmine-bae

  committed
  b277b4e

  Copy full SHA for b277b4e

Commits on Apr 11, 2021

• controlDrone action (editor version) complete

  akhilvemuri

  committed
  460bf38

  Copy full SHA for 460bf38

• sorted merge conflict

  akhilvemuri

  committed
  bc301e7

  Copy full SHA for bc301e7

Commits on Apr 17, 2021

• everything fixed maybe

  jasmine-bae

  committed
  edc9bdf

  Copy full SHA for edc9bdf

• set speed action client added

  akhilvemuri

  committed
  d198b0f

  Copy full SHA for d198b0f

• controldrone works, upload mission results aren't recieved

  jasmine-bae

  committed
  d613159

  Copy full SHA for d613159

• fixed set speed kinda:

  akhilvemuri

  committed
  2a58461

  Copy full SHA for 2a58461

• Merge branch 'vrSide' of https://github.com/immersive-command-system/ImmersiveDroneInterface_2 into vrSide

  akhilvemuri

  committed
  460c8a2

  Copy full SHA for 460c8a2

• combined set speed stuff

  akhilvemuri

  committed
  534f22d

  Copy full SHA for 534f22d

• restored accidentally deleted folder

  akhilvemuri

  committed
  ed41506

  Copy full SHA for ed41506

Commits on May 1, 2021

• quick name changes

  akhilvemuri

  committed
  3b2b7ab

  Copy full SHA for 3b2b7ab

• added comments to controlDrone, setSpeed, uploadMission action client scripts

  akhilvemuri

  committed
  753f90d

  Copy full SHA for 753f90d

• added more comments + Drone_v2 & ServerConnections2

  akhilvemuri

  committed
  2ab81d1

  Copy full SHA for 2ab81d1

• merged from master

  akhilvemuri

  committed
  8c843bf

  Copy full SHA for 8c843bf

Commits on May 6, 2021

• zed2marker transform matrix sets mesh location, still incorrectly

  orrblue

  committed
  8aa9dbf

  Copy full SHA for 8aa9dbf

• updated rosbridge lib

  orrblue

  committed
  1365bed

  Copy full SHA for 1365bed

Commits on May 7, 2021

• switching to 3d recon rosbridgelib

  orrblue

  committed
  f5356b6

  Copy full SHA for f5356b6

• End of day May 6th mapping flight

  orrblue

  committed
  3043592

  Copy full SHA for 3043592

Commits on Jul 19, 2021

• add RFS B100 hardcoded WPs

  orrblue

  committed
  453e741

  Copy full SHA for 453e741

Commits on Aug 4, 2021

• add safe hardcoded WPs for mapping B100 at RFS

  orrblue

  committed
  eafe209

  Copy full SHA for eafe209

Commits on Sep 22, 2021

• transform mesh with matrix (still using hardcoded matrix)

  WeiyanZhu

  committed
  0d66479

  Copy full SHA for 0d66479

Commits on Sep 25, 2021

• receive Matrix4x4 from drone

  WeiyanZhu

  committed
  d01d7c5

  Copy full SHA for d01d7c5

• Merge branch '3d-recon-wayne' into vrSide

  WeiyanZhu

  authored
  c5dbcb8

  Copy full SHA for c5dbcb8

• Merge pull request #1 from immersive-command-system/vrSide

  Show description for b603668
  WeiyanZhu

  authored
  b603668

  Copy full SHA for b603668

Commits on Sep 26, 2021

• Merge pull request #171 from WeiyanZhu/3d-recon-wayne

  Show description for cf6cb40
  WeiyanZhu

  authored
  cf6cb40

  Copy full SHA for cf6cb40

• Merge pull request #172 from immersive-command-system/wayne

  Show description for ff6b9e6
  WeiyanZhu

  authored
  ff6b9e6

  Copy full SHA for ff6b9e6

• use Main.unity that was in VRSide

  WeiyanZhu

  committed
  7779691

  Copy full SHA for 7779691

• Merge pull request #173 from immersive-command-system/wayne

  Show description for e729c0d
  WeiyanZhu

  authored
  e729c0d

  Copy full SHA for e729c0d