howard-stearns
baa9139881
Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into vive-ui
2016-06-21 17:02:23 -07:00
Howard Stearns
c600b65f45
Merge pull request #8114 from jherico/vive-keyboard
...
Don't trigger keyboard on revealing the overlay layer
2016-06-21 17:00:36 -07:00
howard-stearns
d6095d1f11
Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui
2016-06-21 16:52:22 -07:00
Howard Stearns
3879312968
Merge pull request #8116 from ZappoMan/cleanupPlugins
...
remove dead refereince to PluginContainer.h from space mouse
2016-06-21 16:51:06 -07:00
Brad Hefta-Gaub
d9e8026cd6
Merge pull request #8113 from AndrewMeadows/fix-kinematic-motion
...
fix setting velocity of inactive kinematic RigidBody
2016-06-21 16:32:04 -07:00
Brad Hefta-Gaub
f2f7e21eaf
remove dead refereince to PluginContainer.h from space mouse
2016-06-21 16:17:43 -07:00
Brad Davis
f3bad3a63b
Don't trigger keyboard on revealing the overlay layer
2016-06-21 16:04:06 -07:00
howard-stearns
8421931c56
Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui
2016-06-21 14:47:45 -07:00
Brad Hefta-Gaub
5878927bd0
Merge pull request #8050 from ZappoMan/cleanupPlugins
...
Cleanup plugins
2016-06-21 13:53:22 -07:00
Howard Stearns
7e88772e85
Merge pull request #8106 from howard-stearns/triggering-change
...
triggering change
2016-06-21 13:51:12 -07:00
Brad Hefta-Gaub
c18f5e19f5
Merge pull request #8090 from zzmp/doc/metadata-script
...
add example script for metadata from metaverse
2016-06-21 13:42:10 -07:00
Brad Davis
c928de6051
Merge pull request #8099 from howard-stearns/turn-hud-reset-behavior-on-by-default
...
turn hud reset behavior on by default
2016-06-21 13:33:23 -07:00
Brad Davis
f475dd1d85
Merge pull request #8100 from howard-stearns/minimize-trigger-distance-to-hud
...
minimize trigger distance to hud
2016-06-21 13:33:16 -07:00
Zach Pomerantz
c8ead2ad04
conform to coding braces standard
2016-06-21 13:28:15 -07:00
Howard Stearns
cd09c61f31
Merge pull request #8108 from jherico/vive-toolbars
...
Additional toolbar work
2016-06-21 13:26:09 -07:00
Brad Hefta-Gaub
5dcf5031a3
Merge pull request #8111 from zzmp/feat/domain-hours-metadata
...
add operating hours to domain
2016-06-21 13:14:13 -07:00
Howard Stearns
4f71f621f7
Merge pull request #8102 from hyperlogic/feature/remove-grip-button
...
Use trigger to both grab and equip objects
2016-06-21 13:09:11 -07:00
Brad Hefta-Gaub
160a5de271
CR feedback
2016-06-21 12:49:42 -07:00
Brad Hefta-Gaub
c322317878
rework plugins to not depend on PluginContainer unless they want to
2016-06-21 12:07:05 -07:00
Anthony J. Thibault
972c292857
Fix for equip-hotspot being visible for whiteboard markers
2016-06-21 11:59:11 -07:00
Zach Pomerantz
c784fa42e9
log failure to fetch metadata
2016-06-21 11:34:23 -07:00
Brad Davis
cf57e71f1a
Merge pull request #8112 from howard-stearns/do-not-tilt-keyboard
...
do not tilt virtual keyboard
2016-06-21 11:33:53 -07:00
Brad Davis
ec87e2fe90
Merge pull request #8107 from zzmp/fix/metadata-tags-hosts-restrictions
...
fix metadata tags, hosts, restriction
2016-06-21 11:33:32 -07:00
Zach Pomerantz
52170eb12e
use refs for domain metadata parsing
2016-06-21 11:21:20 -07:00
Andrew Meadows
31706a3909
force activate kinmatic objects when necessary
2016-06-21 10:38:44 -07:00
samcake
117a39d52a
Merge pull request #8103 from SamGondelman/compileShaderFix
...
Reduce GLShader::compileShader log spam
2016-06-21 10:30:05 -07:00
howard-stearns
2ac6dc8798
do not tilt virtual keyboard
2016-06-21 09:48:01 -07:00
Zach Pomerantz
807596596f
fix badging, parsing of operating hours
2016-06-21 00:18:38 -07:00
Zach Pomerantz
7fa7abdb1d
add operating hours to domain-server settings/UI
2016-06-20 22:58:20 -07:00
Anthony J. Thibault
2ed88bca6d
Bug fix for bow and arrow.
...
* before this change the releaseEquip message was not getting sent to the bow,
which it would use to re-enable the grab script via the 'Hifi-Hand-Disabler' msg.
2016-06-20 17:24:36 -07:00
Brad Davis
0bc4beeffd
Fix initial toolbar positioning
2016-06-20 17:09:30 -07:00
howard-stearns
bfb697bc77
No hysteresis.
2016-06-20 17:04:23 -07:00
Zach Pomerantz
4e0aeea2b8
add time offset to domain-server UI
2016-06-20 16:19:19 -07:00
Anthony J. Thibault
8817bbea09
reduce log spam
2016-06-20 15:53:33 -07:00
Brad Hefta-Gaub
10d79945d1
Merge pull request #8101 from humbletim/fix-entity-lifetime-guards
...
Fix entity lifetime guards (re: canRez/canRezTmp)
2016-06-20 15:52:54 -07:00
Brad Hefta-Gaub
d5c6296db5
Merge pull request #8095 from SamGondelman/skeletonFix
...
Fix skeleton switching bug
2016-06-20 15:52:40 -07:00
Brad Davis
37e9f66639
Additional toolbar work
2016-06-20 15:41:21 -07:00
Anthony J. Thibault
e5159ad213
Added "Developer > Hands > Drop Without Shake" menu option
2016-06-20 14:50:15 -07:00
Zach Pomerantz
cfe9ac32d4
fix narrowing warning by casting -1
2016-06-20 14:46:20 -07:00
Zach Pomerantz
25b21dacda
clean domain metadata and update acl
2016-06-20 13:44:14 -07:00
Anthony J. Thibault
408f65100b
Bug fix for dropping near-grabbed entities via thump press.
2016-06-20 13:34:05 -07:00
Anthony J. Thibault
8792812884
Change raw for loop to Array.prototype.forEach instead
2016-06-20 13:26:41 -07:00
howard-stearns
cd1780efef
brush clearing
2016-06-20 13:21:06 -07:00
Anthony J. Thibault
359483d9ba
coding standard fix
2016-06-20 11:43:42 -07:00
Anthony J. Thibault
a14bbe4e68
Remove /* style multi-line comments
2016-06-20 11:40:59 -07:00
Zach Pomerantz
40f2d36487
fix hosts/tags in domain-server settings
2016-06-20 11:38:38 -07:00
Anthony J. Thibault
35276c3893
Use Array.prototype.filter instead of my hand rolled filter function
2016-06-20 11:30:40 -07:00
Anthony J. Thibault
7ccbc9e6eb
Primary thumb press can be used to drop an equipped object
2016-06-20 11:22:56 -07:00
Zach Pomerantz
1c188a270d
Merge pull request #8087 from zzmp/feat/send-domain-descriptors
...
send domain metadata to metaverse for authed domains
2016-06-20 11:22:01 -07:00
SamGondelman
34d18da4e4
remove mutable
2016-06-20 11:11:54 -07:00
