Zach Fox
30a571cc48
Merge pull request #11041 from amvmoody/wl_21472
...
WL 21472: restore snails ability to eat sprouts
2017-07-25 13:07:58 -07:00
Andrew Meadows
2446fcde8e
Merge pull request #11039 from amvmoody/21477
...
WL 21477 Gravity Script
2017-07-25 08:59:22 -07:00
Andrew Meadows
9d1fba3a3b
Merge pull request #10821 from ctrlaltdavid/21418
...
Don't execute body of controllers' plugin update methods if not enabled
2017-07-25 08:51:17 -07:00
Ryan Huffman
9421e6ebb6
Merge pull request #11029 from cain-kilgore/dominant-hands
...
WL 21453 - Add a "Dominant Hand" setting
2017-07-25 08:01:31 -07:00
Cain Kilgore
f9204a7034
Now it should appear..
2017-07-25 09:03:47 +01:00
Mike Moody
34594b914d
Added and removed different normalizations.
2017-07-24 23:55:44 -07:00
Mike Moody
dc53017dd4
Created script to let Snails eat brussel sprouts.
2017-07-24 23:17:13 -07:00
Andrew Meadows
a21da8613c
Merge pull request #11028 from sethalves/script-getmeshes-for-models
...
Script getmeshes for models
2017-07-24 23:01:53 -07:00
Andrew Meadows
942a231a70
Merge pull request #11035 from highfidelity/bug/6740
...
Fixed bug: Disconnected domain (no access token present) is unnecessarily hitting /api/v1/user/friends
2017-07-24 22:43:37 -07:00
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
utkarshgautamnyu
5771ee27e1
Update DomainGatekeeper.cpp
2017-07-24 17:33:01 -07:00
Cain Kilgore
84609f27e3
Final Change - They're now Radio Boxes.
2017-07-24 23:53:03 +01: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
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
Cain Kilgore
9c152ddc6f
Ticking left will keep it on left, not right
2017-07-24 22:30:43 +01: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
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
humbletim
300b926464
only call QList::constFirst when history list isn't empty
2017-07-23 14:12:52 -04:00
Seth Alves
a1107deef1
cleanups
2017-07-23 08:21:50 -07:00
Seth Alves
47ea32f4d3
vertex color support in ModelScriptingInterface
2017-07-23 08:06:26 -07:00
Seth Alves
6e0394865e
fix bug in getNumElements that kept it from working on buffer-views with a non-zero offset
2017-07-23 08:05:09 -07:00
Seth Alves
6f86b266cb
support writing of vertex colors
2017-07-23 08:04:34 -07:00
Seth Alves
5e04e84953
make OBJ reader able to handle files where some vertices have colors and others don't
2017-07-22 11:57:51 -07:00
Seth Alves
71f0899178
Merge branch 'master' of github.com:highfidelity/hifi into script-getmeshes-for-models
2017-07-21 16:19:51 -07:00
Andrew Meadows
bec7f7c644
Merge pull request #11010 from druiz17/bug-tablet-third-person
...
You can now properly grab and move the tablet in third person
2017-07-21 13:33:55 -07:00
vladest
615a3c52e4
Ooops..
2017-07-21 21:26:33 +02:00
Brad Davis
5b5e94700e
Additional audio fixes
2017-07-21 09:52:44 -07:00
Brad Davis
d1c2218a31
Temporary patch for deadlock
2017-07-21 09:52:36 -07:00
vladest
33a8ab2d58
Adjusted according discussion in PR
2017-07-21 18:18:23 +02:00
