Cain Kilgore
2f857a6d1a
Forgot a file
2017-07-25 06:05:06 +01:00
Seth Alves
a3f4aeb182
code review
2017-07-24 19:41:30 -07:00
Seth Alves
c4d909927a
make atp-client work again
2017-07-24 19:23:39 -07:00
Seth Alves
d1037a49ae
Merge branch 'master' of github.com:highfidelity/hifi into script-getmeshes-for-models
2017-07-24 19:23:30 -07:00
Mike Moody
1bf2855e9b
Created script for spherical gravity.
2017-07-24 18:47:24 -07:00
Mike Moody
62efb32671
Created script for spherical gravity.
2017-07-24 18:39:09 -07:00
Mike Moody
e900dae708
Created script for spherical gravity.
2017-07-24 18:34:58 -07:00
Cain Kilgore
280a7a7e42
Fixing Styling, added Preference to Tablet, Moved Location to Avatar Tuning
2017-07-25 01:48:55 +01:00
Seth Alves
766c6f48c3
third person camera is alt+G rather than alt+O
2017-07-24 17:43:01 -07:00
utkarshgautamnyu
5771ee27e1
Update DomainGatekeeper.cpp
2017-07-24 17:33:01 -07:00
Anthony J. Thibault
33a1d6e225
Merge branch 'master' into feature/secondary-pose-support
2017-07-24 17:27:33 -07:00
Anthony J. Thibault
9f6641ed10
Shoulder puck calibration work in progress
...
* AnimInverseKinematics: debug draw for secondary targets
* AnimInverseKienmatics: better clean up of ik target debug draw
* GeometryUtil: added findPlaneFromPoints()
* ViveControllerManager: external dependency on eigen
* ViveControllerManager: record history of left/right hand controllers
* ViveControllerManager: use history to determine user shoulder location for better calibration
* ViveControllerManager: pass defaultToReferenceMat by const ref to calibrate functions.
* CMake: added external depenency to eigen linear algebra library.
2017-07-24 17:22:48 -07:00
Zach Fox
c22798a8e6
Offset tablet position to left of screen per feedback
2017-07-24 17:16:07 -07:00
Mike Moody
036a16c0b3
readded line that caused colflict.
2017-07-24 16:51:23 -07:00
Mike Moody
697830b80b
Merge branch 'master' of git://github.com/highfidelity/hifi into 21374
2017-07-24 16:50:38 -07:00
Mike Moody
4c78fba2cc
Removed line that caused colflict.
2017-07-24 16:50:33 -07:00
Seth Alves
97756e6140
accidently deleted a break
2017-07-24 16:12:03 -07:00
Seth Alves
82a787a753
use alt+h for mirror-mode
2017-07-24 16:04:11 -07:00
Andrew Meadows
8c55476c65
fix motor direction when walking upside down
...
also maintain worldUp and remove unnecessary cruft
2017-07-24 16:00:13 -07:00
Andrew Meadows
4994283247
remove unnecessary state check
2017-07-24 16:00:13 -07:00
Andrew Meadows
f598b1f1f5
fix spelling typo in comment
2017-07-24 16:00:13 -07:00
Andrew Meadows
29be9aee65
move nextAttitude() from AvatarData to MyAvatar
2017-07-24 16:00:13 -07:00
Andrew Meadows
f0871c6878
avoid unnecessary and expensive gets
2017-07-24 16:00:13 -07:00
Seth Alves
e53badf88b
use alt+f for 1st person camera and alt+o for 3rd
2017-07-24 15:56:37 -07:00
Cain Kilgore
84609f27e3
Final Change - They're now Radio Boxes.
2017-07-24 23:53:03 +01:00
Seth Alves
afc7eaff8d
Merge branch 'bug-camera-mode-mods' of github.com:druiz17/hifi into bug-camera-mode-mods
2017-07-24 15:21:37 -07:00
Chris Collins
8b978beb31
Merge pull request #11022 from 1P-Cusack/21463
...
WL21463 - entitySelectionTool: use multiarg findRayIntersection inste…
2017-07-24 15:13:21 -07:00
Mike Moody
7de164f1ab
moved below a check that returns.
2017-07-24 15:06:45 -07:00
utkarshgautamnyu
884bdb3b7e
Update DomainGatekeeper.cpp
2017-07-24 14:57:22 -07:00
utkarshgautamnyu
7c62ed6dac
made sendRequest depend on hasValidAccessToken being true
2017-07-24 14:46:32 -07:00
Rob Kayson
507368726f
added dart scripts
2017-07-24 14:38:22 -07:00
Cain Kilgore
9c152ddc6f
Ticking left will keep it on left, not right
2017-07-24 22:30:43 +01:00
Zach Fox
223ed5b59a
Hack to mod tablet orientation when clicking context overlay
2017-07-24 14:29:06 -07:00
humbletim
de6975b227
add missing cursor-*.pngs
2017-07-24 17:16:13 -04:00
Seth Alves
23cb7d8bee
Merge pull request #11030 from MiladNazeri/editJs-edit
...
Fix Parent Joint in edit js WL # 21471 :
2017-07-24 14:11:48 -07:00
Andrew Meadows
a44b33ab11
Merge pull request #11023 from jherico/audio_deadlock
...
Fix for audio deadlock & audio device selection
2017-07-24 14:03:29 -07:00
Mike Moody
a4585b9400
Merge branch 'master' of git://github.com/highfidelity/hifi into 21374
2017-07-24 13:31:27 -07:00
Cain Kilgore
9ff7891c88
Fixed reference error, Gustavo should build now.
2017-07-24 19:56:02 +01:00
Chris Collins
c90442137c
Merge pull request #11032 from Atlante45/stable
...
Stable => Master
2017-07-24 11:42:59 -07:00
Atlante45
d21ca3f1fc
Merge branch 'stable' of https://github.com/highfidelity/hifi into stable
2017-07-24 11:41:02 -07:00
Cain Kilgore
64ba159adf
Updating Small Reference
2017-07-24 19:12:14 +01:00
Cain Kilgore
fd2264f7c9
removed duplicate
2017-07-24 19:05:49 +01:00
Cain Kilgore
e6fd85f45a
Some code cleanup
2017-07-24 19:02:40 +01:00
Cain Kilgore
42742ba1f9
Changed the Return to a String "left/right" instead.
2017-07-24 18:31:16 +01:00
Brad Hefta-Gaub
0ba8d43522
Merge pull request #10994 from vladest/avatar_default_speeds
...
Change default mouse speeds for avatar
2017-07-24 10:13:27 -07:00
Stephen Birarda
26be7e1a01
Merge pull request #10999 from birarda/bug/html-path-on-mac-build
...
fix create tab load on OS X
2017-07-24 10:12:40 -07:00
Chris Collins
ceb218f4cc
Merge pull request #10798 from humbletim/add-persistent-console-history
...
Save JS "Console..." history across sessions
2017-07-24 09:24:04 -07:00
milad
1ce1204a64
WORKLIST ISSUE # 21471 : FIX PARENT JOINT IN EDIT JS
...
In entityPropeties.js
line #1079 says:
elParentJointIndex.addEventListener('change', createEmitNumberPropertyUpdateFunction('parentJointIndex'));
The problem should be fixed by changing it to:
elParentJointIndex.addEventListener('change', createEmitNumberPropertyUpdateFunction('parentJointIndex', 0));
createEmitNumberPropertyUpdateFunction() is parsing the value as a
float to a default decimal position of 4. Looks like it only accepts
integers. By adding in that 0 as a second argument, it should coerce the
value to one that will be recognized by the UI/backend.
2017-07-24 10:06:44 -05:00
Cain Kilgore
a4cf27402d
Tabs and Cleanup of Code
2017-07-24 06:27:14 +01:00
Cain Kilgore
630922dd95
Dominant Hands Branch Initial Commit
...
Adds a new option in the Avatar Basics section of the Avatar Settings.
API Accessible Functions:
MyAvatar.getUseAlternativeHand()
MyAvatar.setUseAlternativeHand()
Defaults to false (Right Hand). Will return True if set to Left Hand.
2017-07-24 06:18:24 +01:00
