Eiren Rain
1dea626422
Eclipse formatting ( #176 )
...
* Make eclipse formatter better follow our conventions and format all of it
* Don't join wrapped lines to allow for hand-formatting
* Fix formatting of switch statements and add breaks in enum declarations
* Use new formatter by @thebutlah, adjust formatter more
2022-05-16 20:05:46 +03:00
Eiren Rain
910e32bb3e
Merge pull request #166 from Futurabeast/clean-get-tracker-by-id
...
Change getTrackerById
2022-05-03 15:33:18 +03:00
Eiren Rain
6ad3c862ce
Merge pull request #171 from TheButlah/fix_concurrent_modification_datafeed
...
Fix concurrent modification in DataFeedHandler
2022-05-03 15:27:43 +03:00
Eiren Rain
05819baf97
Merge pull request #173 from TheButlah/trackerpos_from_role
...
Computed trackers use TrackerRole to determine TrackerPosition, if null
2022-05-03 15:25:52 +03:00
Ryan Butler
ec9e7d94bc
Fix position and rotation getting mixed up in flatbuffer
2022-05-03 03:24:22 -04:00
Ryan Butler
a800749b87
Fix concurrent modification in DataFeedHandler
2022-05-03 00:41:25 -04:00
Ryan Butler
76fe83452e
Computed trackers use TrackerRole to determine TrackerPosition, if null
2022-05-02 23:45:57 -04:00
Eiren Rain
94c079815f
Merge pull request #168 from TheButlah/fix_computed_tracker_num
...
Computed trackers should use their tracker id as their num
2022-05-02 13:47:43 +03:00
Ryan Butler
7f67135e69
Computed trackers should use their tracker id as their num
2022-05-02 02:58:24 -04:00
Ryan Butler
a1717bbf7a
Fix invalid flatbuffer offsets
2022-05-02 02:09:33 -04:00
Eiren Rain
c99375364d
Merge pull request #165 from deiteris/use-foreach
...
Refactor for to foreach
2022-05-01 16:02:24 +03:00
lucas lelievre
413332462f
more readable version of it
2022-04-30 23:06:14 +02:00
lucas lelievre
18386d57d6
Better tracker id with no possible null pointer exception
2022-04-30 22:50:32 +02:00
lucas lelievre
f72045438e
Change getTrackerById
2022-04-30 21:58:26 +02:00
Yury
17f74c693c
Refactor for to foreach
2022-04-30 20:34:13 +03:00
lucas lelievre
3fb87a4688
Fix iteration on the sensors, i used the key of the map instead of the index of the array
2022-04-30 04:03:53 +02:00
lucas lelievre
d0ee364fb9
Fix conflicts with main
2022-04-28 14:30:40 +02:00
lucas lelievre
3a80ad0632
Change the formating to tabs
2022-04-28 03:44:24 +02:00
lucas lelievre
ad3b697517
New formatting rules
2022-04-27 22:40:03 +02:00
lucas lelievre
7ac7f7d424
New formatting rules
2022-04-27 22:29:09 +02:00
lucas lelievre
ba58f4df6a
Reformat the formatter
2022-04-27 22:25:28 +02:00
lucas lelievre and TheDevMinerTV
297bfddf6c
Update src/main/java/dev/slimevr/NetworkProtocol.java
...
Co-authored-by: TheDevMinerTV <[email protected] >
2022-04-27 22:21:09 +02:00
lucas lelievre and TheDevMinerTV
e4d0aca744
Update src/main/java/dev/slimevr/bridge/BridgeThread.java
...
Co-authored-by: TheDevMinerTV <[email protected] >
2022-04-27 22:21:05 +02:00
lucas lelievre and TheDevMinerTV
8b5ac226c3
Update src/main/java/dev/slimevr/bridge/BridgeThread.java
...
Co-authored-by: TheDevMinerTV <[email protected] >
2022-04-27 22:21:00 +02:00
lucas lelievre and TheDevMinerTV
cfc264fa33
Update src/main/java/dev/slimevr/bridge/BridgeThread.java
...
Co-authored-by: TheDevMinerTV <[email protected] >
2022-04-27 22:20:49 +02:00
lucas lelievre
9e12958ca6
reformat all
2022-04-27 21:39:54 +02:00
lucas lelievre
8609fb9e97
Fix Converting FORWARD rotation to FRON
2022-04-27 21:30:54 +02:00
lucas lelievre
9f3f34ce70
Reformat protocol
2022-04-26 02:07:45 +02:00
lucas lelievre
23f9b3b276
Sync with lastest server
2022-04-25 00:21:32 +02:00
lucas lelievre
1e74deede3
Current progress
2022-04-24 19:53:56 +02:00
loucass003
2317ad94f5
Update submodule to solarxr-protocol
2022-04-24 01:20:55 +02:00
Louka
de101b3576
Fix hip when not using legs
...
disables pelvis averaging if user isn't using knee trackers.
2022-04-20 21:26:36 -04:00
lucas lelievre
9fbfc43655
Clean packages
2022-04-16 16:40:30 +02:00
loucass003
e3e37023e8
More rpc stuff
2022-04-15 01:17:16 +02:00
Michael Gschwandtner
0bcaed719b
Merge branch 'SlimeVR:main' into main
2022-04-14 16:06:17 +02:00
Michael Gschwandtner
c77d73c460
Rename configPath variable
2022-04-14 16:04:37 +02:00
loucass003
9fc5d41e1b
protocol rework Sets -> Map
2022-04-14 09:15:01 +02:00
Eiren Rain
ac0cb9e9cb
Merge pull request #149 from Louka3000/hand-tracking
...
Hand tracking support + elbows without controllers
2022-04-12 20:22:32 +03:00
lucas lelievre
52fa670293
Datafeed almost done
2022-04-12 09:07:18 +02:00
Louka
0b2491ead5
Properly handle elbows with hand tracking
...
Instead of moving the controller chains to the slimevr hand, now just make the computed elbows affected by the elbow from the slimevr hand chain.
Also refactored some stuff to replace "upper arm distance" by "elbow offset". Idek if it's useful but it may be so I'm keeping it.
2022-04-11 18:39:30 -04:00
Michael Gschwandtner
1723d19882
Make VRServer config path variable
...
Add a constructor that accepts a path to the config file
2022-04-12 00:37:46 +02:00
Louka
416f96fe44
Merge branch 'main' into hand-tracking
2022-04-11 17:41:32 -04:00
Eiren Rain
7b700b4a0c
Merge pull request #154 from mgschwan/main
...
Make WebSocketVRBridge compatible with Android
2022-04-11 21:37:50 +03:00
Eiren Rain
bde578fb9d
Merge pull request #151 from Louka3000/neck-tracking
...
Neck tracking support owo
2022-04-11 21:05:37 +03:00
Michael Gschwandtner
c41dc490ed
Make WebSocketVRBridge compatible with Android
...
Change JSONObject.optFloat (does not exist on Android) to optDouble
2022-04-11 16:00:42 +02:00
Erimel
8f19afee88
Merge branch 'SlimeVR:main' into hand-tracking
2022-04-07 01:18:50 -04:00
Louka
784ec877d8
Make filter dependent on tracker tps
...
Why was this in the wrong place wth
2022-04-06 20:35:47 -04:00
Eiren Rain
48c509ef54
Merge pull request #152 from mgschwan/main
...
Add full reset command to WebSocket bridge
2022-04-06 15:43:56 +03:00
Louka
ecbeaf10ed
Remove unnecessary code
...
Also makes my code a whole lot clearer damn.
Now I can understand it myself!!! :P
2022-04-05 18:02:30 -04:00
Michael Gschwandtner
c8e4918b4e
Merge branch 'SlimeVR:main' into main
2022-04-05 22:17:55 +02:00