James B. Pollack
f8ff0da901
trying to fix interaction with grab script...
2016-07-07 19:22:42 -07:00
Brad Davis
c644c87e69
Fix glow line vanishing, improve transparency interaction
2016-07-07 19:01:41 -07:00
Anthony J. Thibault
0d454cd45e
Equip hotspots render when your hand is near them.
2016-07-07 17:28:23 -07:00
James B. Pollack
7fa1dc7053
make thumb and trigger work in any order and on either button released
2016-07-07 16:36:40 -07:00
Seth Alves
11542aeca2
pick against avatar's capsule and then against the T-pose mesh
2016-07-07 16:36:25 -07:00
James B. Pollack
71392bc1b2
change to sphere now that sphere alpha works.
2016-07-07 16:30:30 -07:00
Brad Hefta-Gaub
4c100ecc95
Merge pull request #8203 from jherico/zorder
...
Ensure newly shown windows are popped to the top of the zorder
2016-07-07 16:14:50 -07:00
Brad Hefta-Gaub
33d13956b7
Merge pull request #8206 from jherico/sphere_alpha
...
Fix rendering of overlay spheres with alpha
2016-07-07 15:39:29 -07:00
James B. Pollack
5c83db3b28
take care of naughty intervals
2016-07-07 14:37:51 -07:00
SamGondelman
99fc472d77
fixed errors in Browser.qml and UpdateDialog.qml
2016-07-07 14:06:57 -07:00
Brad Davis
828be94089
Fix rendering of overlay spheres with alpha
2016-07-07 14:04:59 -07:00
Brad Davis
8ca3630cfa
Support glow effect in 3D line overlays
2016-07-07 13:36:48 -07:00
Brad Davis
790f74da1d
Support geometry shaders
2016-07-07 13:36:47 -07:00
Anthony J. Thibault
aba6924dc7
Fix MyAvatar name and url accessors to JS.
...
Q_INVOKABLE does not support returning references.
MyAvatar.getFullAvatarURLFromPreferences() now returns a QUrl instead of a reference.
MyAvatar.getFullAvatarModelName() now returns a QString instead of reference.
This should fix the JS API for these methods, they will now receive a JS string instead of undefined.
2016-07-07 13:33:36 -07:00
Andrew Meadows
e4828b03b1
fix crash when building shape before model loaded
2016-07-07 13:32:30 -07:00
Brad Davis
23700dc90f
Ensure newly shown windows are popped to the top of the zorder
2016-07-07 13:16:59 -07:00
James B. Pollack
4a9f6e677c
add new target model
2016-07-07 12:52:24 -07:00
James B. Pollack
be770c8177
make thumb and trigger mode an option
2016-07-07 12:39:11 -07:00
Brad Hefta-Gaub
348c7491b8
Merge pull request #8198 from jherico/gpu_perf_testing
...
Rendering performance testing tool
2016-07-07 12:28:14 -07:00
Brad Hefta-Gaub
6e724d246a
Merge pull request #8200 from jherico/batch_cache
...
Batch optimizations
2016-07-07 12:26:49 -07:00
James B. Pollack
93081e73d8
thumb and trigger
2016-07-07 12:12:22 -07:00
Brad Hefta-Gaub
eafd8999bc
Merge pull request #8202 from jherico/cpu_opt_modelbounds
...
Optimize updateModelBounds
2016-07-07 11:52:44 -07:00
James B. Pollack
bd3fa60927
Merge branch 'viveteleporter' of github.com:imgntn/hifi into viveteleporter
2016-07-07 11:45:42 -07:00
James B. Pollack
8212ada4de
introduce delay
2016-07-07 11:42:41 -07:00
Brad Hefta-Gaub
6d78c9e7ad
Merge pull request #8201 from huffman/fix/add-missing-loading-images
...
Add missing loading images for Asset Browser
2016-07-07 11:35:43 -07:00
Brad Davis
dfdc1ca1c6
Ensuring render thread is highest priority
2016-07-07 11:14:56 -07:00
Brad Davis
b73fe24848
PR feedback
2016-07-07 11:12:55 -07:00
Brad Davis
eff1c65388
Reduce the number of temporary objects in batch commands
2016-07-07 11:12:55 -07:00
Brad Davis
721cd79b57
Aggressive batch pre-allocation
2016-07-07 11:12:54 -07:00
Brad Davis
c7382ea886
Optimize updateModelBounds
2016-07-07 11:11:26 -07:00
Brad Davis
5be238db08
Suppressing glew link warnings
2016-07-07 11:10:59 -07:00
Brad Davis
09f2a10613
Add rendering performance tool
2016-07-07 11:10:58 -07:00
Ryan Huffman
d2fedee656
Add missing loading images for Asset Browser
2016-07-07 10:22:52 -07:00
Seth Alves
6786a07ac2
Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars
2016-07-07 09:53:24 -07:00
Brad Hefta-Gaub
7724065298
Merge pull request #8196 from howard-stearns/loaded-machine
...
an objective test of basic performance on struggling machines
2016-07-07 09:02:31 -07:00
Brad Hefta-Gaub
abcd1e0062
Merge pull request #8164 from SamGondelman/macHMDPreview
...
Added Mac preview image if VSync is enabled
2016-07-07 09:01:40 -07:00
Brad Hefta-Gaub
c9fd4894be
Merge pull request #8189 from jherico/entity_script_safety
...
Don't trigger entity scripts without scripting interface
2016-07-07 09:01:18 -07:00
Brad Hefta-Gaub
10500d0773
Merge pull request #8191 from howard-stearns/basic-hand-controller-edit
...
basic hand-controller editing
2016-07-07 08:58:54 -07:00
James B. Pollack
3c3bad4d3b
Merge remote-tracking branch 'upstream/master' into viveteleporter
2016-07-07 01:36:39 -07:00
James B. Pollack
54e0c131a5
cleanup and protect against some interval naughtiness
2016-07-06 18:30:50 -07:00
James B. Pollack
5626938fb4
add instant mode
2016-07-06 18:13:42 -07:00
Brad Davis
5220b52cd9
Don't trigger entity scripts without scripting interface
2016-07-06 18:13:15 -07:00
James B. Pollack
1728878982
working smooth arrival
2016-07-06 17:52:18 -07:00
SamGondelman
d05a27e0e6
embed image locally
2016-07-06 17:27:53 -07:00
Brad Hefta-Gaub
41a74f7652
Merge pull request #8193 from huffman/fix/model-overlay-dims
...
Fix model overlays not correctly scaling
2016-07-06 16:17:22 -07:00
Howard Stearns
74ef82f800
add 'dynamic' property as a load
2016-07-06 16:15:02 -07:00
Andrew Meadows
3c4f9f8016
refert debug hack
2016-07-06 15:51:17 -07:00
Anthony J. Thibault
2db8160568
handControllerGrab improvements
...
* Made handControllerGrab eslint clean
* A model overlay is used instead of a sphere to draw equip hotspots.
* The equip hotspot model will grow in size by 10% when hand is near enough to equip it.
* The hand controller will now perform a haptic pulse when your hand is near enough to an equip hotspot.
* Near triggers events will also perform a haptic pulse
2016-07-06 15:46:14 -07:00
James B. Pollack
5cb585aec3
remove debug prints
2016-07-06 15:25:01 -07:00
James B. Pollack
696169ed37
terminate lines at intersection
2016-07-06 15:19:10 -07:00
