ori agranat
|
cd21186bf7
|
added json serializer and de serializer
|
2019-11-12 19:28:46 +02:00 |
|
ori agranat
|
e1f908e0a1
|
Merge remote-tracking branch 'origin/dev' into ui-integration
# Conflicts:
# Main/src/main/java/com/chameleonvision/network/NetworkManager.java
# Main/src/main/java/com/chameleonvision/vision/process/CVProcess.java
# Main/src/main/java/com/chameleonvision/vision/process/PipelineResult.java
# Main/src/main/java/com/chameleonvision/vision/process/VisionProcess.java
# Main/src/main/java/com/chameleonvision/web/ServerHandler.java
|
2019-10-24 02:12:04 +03:00 |
|
ori agranat
|
081fc1f9a2
|
Revert "Merge branch 'speckle-rejection' into 'ui-integration'"
This reverts merge request !21
|
2019-10-23 23:03:32 +00:00 |
|
Matt M
|
910d377440
|
Create speckle rejection code and add to VisionProcess
Isn't yet added to the GUI
|
2019-10-23 21:39:47 +00:00 |
|
ori agranat
|
91a1338022
|
changed all double and int data type to Number
added pipeline change handle in ui
|
2019-10-14 23:35:29 +03:00 |
|
Banks Troutman
|
d56a27c017
|
Cleanups, fixed isValid glitch
|
2019-10-10 15:07:56 -04:00 |
|
ori agranat
|
eb65156548
|
merge bugfix
|
2019-10-07 21:15:17 +03:00 |
|
Banks Troutman
|
61b09f2bf3
|
Merge branch 'networkmanager' into dev
# Conflicts:
# Main/src/main/java/com/chameleonvision/util/MathHandler.java
# Main/src/main/java/com/chameleonvision/vision/camera/Camera.java
# Main/src/main/java/com/chameleonvision/vision/camera/CameraManager.java
# Main/src/main/java/com/chameleonvision/vision/process/VisionProcess.java
|
2019-10-07 14:08:01 -04:00 |
|
Banks Troutman
|
47307e1fbd
|
Networking bugfixes, added PixelFormat to resolution selection
|
2019-10-06 21:49:17 -04:00 |
|
Banks Troutman
|
3db2f30ea7
|
Continued rework of networking, added root check
|
2019-10-06 17:26:17 -04:00 |
|
Banks Troutman
|
7699766091
|
Begin network rewrite
|
2019-10-04 15:55:45 -04:00 |
|
Banks Troutman
|
b87d31e465
|
Added method for arg handling, added NT server mode and NT server host args
|
2019-10-01 02:19:32 -04:00 |
|