Anthony Thibault
95f821d61a
Merge pull request #6732 from sethalves/set-model-entity-joints
...
hook up a way for scripts to set model-entity joint state
2016-01-05 17:31:18 -08:00
Brad Davis
e4913a56ab
Merge pull request #6775 from sethalves/fix-polyvox-rendering
...
update polyvox shader to track changes in packDeferredFragment
2016-01-05 20:24:33 -05:00
Brad Davis
4a9c558809
Merge pull request #6776 from Atlante45/fix/lambda-crash
...
Cleanup web entity connections
2016-01-05 20:23:51 -05:00
Seth Alves
722fe46a27
Merge pull request #6777 from AndrewMeadows/whitespace
...
nothing but whitespace
2016-01-05 17:14:19 -08:00
Clément Brisset
a2135dfdd2
Merge pull request #6720 from ctrlaltdavid/20760
...
Fix particle radius and rgba start, middle, finish interpolation
2016-01-05 16:48:13 -08:00
Andrew Meadows
9ab5ef358a
remove dangling whitespace
2016-01-05 16:44:36 -08:00
Seth Alves
086ea66c04
Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints
2016-01-05 16:24:10 -08:00
David Rowe
4d7ed6b68f
Whitespace
2016-01-06 13:20:44 +13:00
Brad Hefta-Gaub
5fad7aa51b
Merge pull request #6774 from imgntn/targetsfix
...
Fix Wall Targets Collision Callback
2016-01-05 16:18:59 -08:00
James B. Pollack
7c18359fba
cleanup
2016-01-05 16:17:11 -08:00
Atlante45
981c6c7af5
Cleanup web entity connections
2016-01-05 16:08:25 -08:00
Seth Alves
1e69f695b4
update polyvox shader to track changes in packDeferredFragment
2016-01-05 16:06:59 -08:00
James B. Pollack
68e03a08c0
targets fix
2016-01-05 15:43:49 -08:00
Seth Alves
b59934573a
Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints
2016-01-05 13:50:12 -08:00
Seth Alves
f7041136ff
put new property in right place
2016-01-05 13:26:16 -08:00
Brad Hefta-Gaub
c2f2f950fb
Merge pull request #6673 from hyperlogic/tony/get-palm-thread-safe
...
Make Avatar palm position/rotation accessors thread safe
2016-01-05 13:07:47 -08:00
Brad Davis
908c1072ce
Merge pull request #6763 from ZappoMan/scriptMessageBoxesOffscreen
...
move alert and confirm to use offscreen ui
2016-01-05 15:26:48 -05:00
Seth Alves
b222c12857
unmangle merge
2016-01-05 12:21:50 -08:00
Howard Stearns
95e74318df
Merge pull request #6757 from sethalves/improve-grab-action-reliability
...
be more careful about grab action -- if it somehow expires, reinstate it
2016-01-05 12:21:09 -08:00
Seth Alves
719c4562d1
Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints
2016-01-05 11:59:14 -08:00
Philip Rosedale
f30af27ac8
Merge pull request #6770 from birarda/zlib-external
...
use an s3 link for zlib dependency
2016-01-05 11:57:46 -08:00
Seth Alves
cd82383d33
Merge branch 'master' of github.com:highfidelity/hifi into improve-grab-action-reliability
2016-01-05 11:13:38 -08:00
Seth Alves
942e77166e
merge from upstream
2016-01-05 11:11:19 -08:00
Anthony J. Thibault
a21b604746
Simplified implementation of ThreadSafeValueCache
2016-01-05 11:08:08 -08:00
Andrew Meadows
0473891e86
Merge pull request #6671 from sethalves/near-grab-via-parenting
...
queryAACube plumbing
2016-01-05 11:01:28 -08:00
Andrew Meadows
62688d5c07
Merge pull request #6768 from jherico/vr_keys
...
Tweaks for supporting the new QML UI
2016-01-05 10:31:57 -08:00
Seth Alves
212d2d9e8f
merge from upstream
2016-01-05 10:27:45 -08:00
Howard Stearns
5f85e0a4c0
Merge pull request #6769 from hyperlogic/tony/marketplace-avatar-attachment-support
...
Interface support for avatar attachments from Marketplace
2016-01-05 10:17:33 -08:00
Brad Hefta-Gaub
927fe97359
migrate callers of QMessageBox::warning() to OffscreenUi::warning()
2016-01-05 10:17:16 -08:00
Andrew Meadows
43d8c14c16
Merge pull request #6767 from howard-stearns/pid-render-limits
...
render limits fixes
2016-01-05 10:17:04 -08:00
Anthony J. Thibault
9ea6079c64
Merge branch 'master' into tony/get-palm-thread-safe
2016-01-05 10:16:52 -08:00
Andrew Meadows
f888cc93f6
Merge pull request #6752 from imgntn/particle_grab_cleanup
...
Add Dynamic Lifetimes to Grab Beam Particle Systems
2016-01-05 10:12:21 -08:00
Stephen Birarda
139abf704d
use an s3 link for dependencies
2016-01-05 09:58:59 -08:00
Brad Hefta-Gaub
d98c2d1413
migrate callers of QMessageBox::question() to OffscreenUi::question()
2016-01-05 09:39:39 -08:00
Brad Davis
900a0f7f08
Trigger selection is too twitchy
2016-01-05 09:16:44 -08:00
Seth Alves
96f506a98d
code review
2016-01-05 07:27:27 -08:00
Brad Davis
4b6f58dcab
Restoring code commented out for debugging
2016-01-04 20:51:52 -08:00
Brad Davis
8485c89a0e
More work on exposing tools to QML overlay windows
2016-01-04 20:51:52 -08:00
Brad Davis
56ee48a084
Working on focus problems
2016-01-04 20:51:51 -08:00
Brad Davis
e6b59cb0a1
Make it easier for QML dialogs to access the global menu, manipulate the overlay desktop
2016-01-04 20:51:50 -08:00
Brad Davis
41dcc3d52b
QML dialogs should not consume key events when disabled
2016-01-04 20:51:49 -08:00
Seth Alves
ce1b8ae6f0
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
2016-01-04 19:35:36 -08:00
Seth Alves
afc1757adf
Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints
2016-01-04 19:17:45 -08:00
David Rowe
16d4234d55
Get rid of a couple of multiplies
2016-01-05 15:23:25 +13:00
Seth Alves
3db68e3151
add model joints to debugging
2016-01-04 18:16:20 -08:00
Seth Alves
2d246a840f
better packing for qvector of bools
2016-01-04 18:14:29 -08:00
David Rowe
a265ffb631
Get rid of a couple of if statements and duplicate calls
...
Courtesy of Clement
2016-01-05 15:13:22 +13:00
Seth Alves
0b9f92e50f
fix quat (un)packing
2016-01-04 18:01:48 -08:00
Anthony J. Thibault
bac6570655
Interface support for avatar attachments from Marketplace
...
Drag and drop support of ava.json files is also supported and
at the moment the only way to test.
To test:
1. Create a cowboyhat.ava.json file on your hard-drive, with the following contents:
{
"version": "0.1",
"name": "Cowboy Hat",
"modelUrl": "https://s3.amazonaws.com/hifi-public/tony/cowboy-hat.fbx ",
"jointName": "Head",
"transform": {
"rotation": {"x": 0, "y": 0, "z": 0, "w": 1},
"translation": {"x": 0, "y": 0, "z": 0},
"scale": {"x": 1, "y": 1, "z": 1}
},
"isSoft": false
}
2. Create a leatherjacket.ava.json file, with the following contents:
{
"version": "0.1",
"name": "Leather Jacket",
"modelUrl": "https://hifi-content.s3.amazonaws.com/ozan/dev/clothes/coat/coat_rig.fbx ",
"isSoft": true
}
3. Run interface
4. Drag-and-Drop cowboyhat.ava.json onto the main Interface window.
5. You should be prompted wear the 'Cowboy Hat' attachment.
6. If you select 'Yes', the cowboy hat should appear on the avatar.
7. Do the same with leatherjacket.ava.json file.
2016-01-04 17:50:45 -08:00
Seth Alves
69839b4b16
better packing of qvector of quats
2016-01-04 17:50:25 -08:00
