Delanir
3d8951a5e0
Replace Paint Source Entity by Overlay
2017-08-16 18:25:01 +01:00
Delanir
066598fe3f
Add Support to different UV modes in the finger paint script and deactivate "paint hand"
2017-08-16 18:25:01 +01:00
Delanir
0a97cfd736
Change UVMode updateGeometry Function
2017-08-16 18:25:01 +01:00
Delanir
ed5515a2d4
Add new Property to polyline to enable different uv modes. 2
2017-08-16 18:25:00 +01:00
Delanir
faf57f068c
Override hand animation for finger paint.
...
Paint hand stays in a pointing position while in paint mode.
2017-08-16 18:25:00 +01:00
Delanir
59719a13b6
Move fingerPaint folder into "scripts/system" and add fingerPaint script to DEFAULT_SCRIPTS_SEPARATE
2017-08-16 18:23:04 +01:00
Delanir
5acc7ae4c9
Add fingerPaint script (intermediate version) to script-archive folder
...
Added folder fingerPaint inside script-archive. In order to run this
intermediate version of the fingerPaint script, load
fingerPaint/fingerPaint.js .
2017-08-16 18:20:14 +01:00
David Kelly
73e943daaf
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/makeMeSomeKeys
2017-08-16 10:13:08 -07:00
Brad Hefta-Gaub
714027d2e2
Merge pull request #11196 from hyperlogic/bug-fix/avatar-capsule-issues
...
Fix for incorrectly sized avatar capsule collision
2017-08-16 09:58:39 -07:00
Zach Fox
c024bd2d83
Merge pull request #11195 from zfox23/commerce_securityImage1
...
Commerce: First pass at security images (NOT FINAL)
2017-08-16 09:57:55 -07:00
Artur Gomes
f794079c62
Merge remote-tracking branch 'upstream/master'
2017-08-16 17:54:35 +01:00
SamGondelman
86cc938a47
Merge remote-tracking branch 'upstream/master' into sharks
2017-08-16 09:54:12 -07:00
Artur Gomes
07a16d658b
Add sections to brushes tab.
...
Add preview of special effects.
Fix polyline poinst disappearing (using 48 points for now as a quick
fix)
Fix dynamic saturation and brightness effect being to strong.
2017-08-16 17:21:19 +01:00
Seth Alves
58a63a14fb
Merge branch 'controller-dispatcher-1' of github.com:sethalves/hifi into controller-dispatcher-1
2017-08-16 09:14:10 -07:00
Seth Alves
91f2e2b773
Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1
2017-08-16 09:13:54 -07:00
Seth Alves
a0231898e6
Merge branch 'sharks' of github.com:SamGondelman/hifi into controller-dispatcher-1
2017-08-16 09:13:45 -07:00
Dante Ruiz
e48c14ec23
fixed tablet spawn position for oculus menu button
2017-08-16 09:08:55 -07:00
vladest
a87a93d991
Implemented input dialog async functions
2017-08-16 15:35:51 +02:00
David Rowe
f1fe3be1f4
Merge branch 'master' into vr-edit-a
2017-08-17 00:13:08 +12:00
David Rowe
90c2036be7
Fix physics options labels being displayed when options pane opens
2017-08-17 00:08:09 +12:00
David Rowe
2287e16ea7
Set physics values per picklist items
2017-08-17 00:04:14 +12:00
vladest
8326600274
Merge branch 'master' into modal_dialogs_async
2017-08-16 13:48:47 +02:00
David Rowe
2c2f866c82
Close picklist if click elsewhere
2017-08-16 21:33:34 +12:00
David Rowe
f9de451b30
Make picklist label display "CUSTOM" when slider value is changed
2017-08-16 21:11:10 +12:00
David Rowe
30e9b8ea45
Update picklist label when item is picked
2017-08-16 20:56:08 +12:00
David Rowe
bfaae7c220
Add picklist options
2017-08-16 20:22:24 +12:00
Olivier Prat
9691c957e4
Merge branch 'master' of git://github.com/highfidelity/hifi into fadeinvertfix
2017-08-16 09:41:49 +02:00
Liv
36ff82db6b
Merge pull request #11056 from misslivirose/feat/domain-setup
...
[Protocol Change] Allow specified users/groups to replace domain content from within Interface
2017-08-15 20:29:25 -07:00
David Rowe
c705bb7fad
Add picklist button
2017-08-16 14:55:44 +12:00
David Rowe
cca862b6ba
Apply physics to just the root entity
2017-08-16 13:47:14 +12:00
David Rowe
b1938bafea
Apply slider values to entities
2017-08-16 13:40:06 +12:00
Anthony J. Thibault
aef19c6f97
Rig: Use a registry to prevent use after free crashes/corruption
...
Create a global registry to hold all the currently active Rig instances.
Use this registry and it's mutex to prevent accessing the rig after it has already been destroyed,
or is in the process of being destroyed on the main thread.
2017-08-15 18:28:51 -07:00
Seth Alves
9f0109881e
Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1
2017-08-15 18:05:23 -07:00
Seth Alves
572930b30f
Merge branch 'sharks' of github.com:SamGondelman/hifi into controller-dispatcher-1
2017-08-15 18:05:09 -07:00
Seth Alves
243cffb98d
oops
2017-08-15 18:05:06 -07:00
SamGondelman
a641fb7a7f
rename qvector findRayIntersection to avoid script conflicts
2017-08-15 18:03:52 -07:00
Seth Alves
3082c357f9
cloning sort-of works... cloning an equipable doesn't
2017-08-15 17:54:04 -07:00
Anthony J. Thibault
e9b8e5431d
Fix for incorrectly scaled bounding volumes when switching avatars
...
Make sure to explicitly set the _geometryToRigTransform in Rig::initJointStates().
This should fix small bounding volume when switching from the Gamebot avatar (which has 0.008 scaling)
to another avatar (which ususally have 0.01 scaling).
2017-08-15 17:26:51 -07:00
Zach Fox
2fa1bd25a8
Clipping and mipping!
2017-08-15 16:45:46 -07:00
Zach Fox
984a5aea2c
You can now spawn infinite copies of items you've previously purchased
2017-08-15 16:32:23 -07:00
Zach Fox
5c157a7397
Move security image to top left
2017-08-15 16:24:14 -07:00
Zach Fox
ccf2d71036
V1 done
2017-08-15 16:11:34 -07:00
Stephen Birarda
a59103aad5
truncate filename for relative path URL in RR
2017-08-15 15:38:47 -07:00
Zach Fox
29a9ae28e9
Fixes
2017-08-15 15:36:28 -07:00
Liv
1ae4a5c019
remove class from function call
2017-08-15 15:30:43 -07:00
Stephen Birarda
100ac65975
store relative path URL in resource request on redirect
2017-08-15 15:27:44 -07:00
Stephen Birarda
96672becc6
read redirected path info in MappingRequest
2017-08-15 15:19:20 -07:00
Zach Fox
d376630bde
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_securityImage1
2017-08-15 15:03:02 -07:00
Zach Fox
768eb7f91c
Getting closer
2017-08-15 15:02:28 -07:00
Seth Alves
4bfbab294d
near-trigger works?
2017-08-15 14:53:58 -07:00
