Seth Alves
3a5f92d7a2
ignoreIK for equipping. change how auto-unequip searches
2016-08-30 11:16:13 -07:00
Brad Davis
eb0a8db0af
Merge pull request #8539 from hyperlogic/bug-fix/snappy-search-beam
...
When trigger is pulled, snap search beam to correct length instead of animating
2016-08-30 11:13:58 -07:00
elisa-lj11
37cc50a14a
Merge remote-tracking branch 'highfidelity/master' into marketplaces_html
2016-08-30 10:45:26 -07:00
elisa-lj11
fa941e4a1b
Merge remote-tracking branch 'origin' into marketplaces_html
2016-08-30 10:42:56 -07:00
Seth Alves
2a9ffc1529
Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions
2016-08-30 10:26:14 -07:00
Seth Alves
7d13f9220c
fix math, renamed a couple variables
2016-08-30 09:55:42 -07:00
Seth Alves
01ee6e9e98
Merge branch 'arrow-actions' of github.com:sethalves/hifi into arrow-actions
2016-08-30 09:42:57 -07:00
Stephen Birarda
74fac8c7c9
Merge pull request #8512 from birarda/shareable-address
...
add shareable address from default name, leverage for steam join/invite
2016-08-30 09:35:24 -07:00
Seth Alves
a9400119ab
Merge branch 'joints-for-controllers' of github.com:sethalves/hifi into arrow-actions
2016-08-30 09:13:16 -07:00
Seth Alves
f4eee8d480
Merge branch 'master' of github.com:highfidelity/hifi into joints-for-controllers
2016-08-30 09:12:53 -07:00
Brad Hefta-Gaub
7397b884e7
support for fbx2016 format
2016-08-30 09:07:39 -07:00
elisa-lj11
6bd41d0dd5
added status bar to marketplace
2016-08-29 18:43:52 -07:00
elisa-lj11
f2e61aa504
added status bar to marketplace
2016-08-29 18:43:32 -07:00
Seth Alves
314b7617ac
Merge pull request #8543 from hyperlogic/bug-fix/entity-pointer-events
...
Bug fix for click events received by entity scripts
2016-08-29 17:57:56 -07:00
James B. Pollack
2b2b2ecbac
caps
2016-08-29 17:44:33 -07:00
Seth Alves
c022c2e705
Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions
2016-08-29 17:43:53 -07:00
James B. Pollack
d3aad53e0e
cleanup
2016-08-29 17:43:32 -07:00
Seth Alves
87fbbd68ae
Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions
2016-08-29 17:37:58 -07:00
Andrew Meadows
2d8bb54b93
fix typo
2016-08-29 17:37:24 -07:00
James B. Pollack
ed2ebd122b
Merge pull request #8542 from imgntn/nobackspace
...
No more delete with backspace in edit.js
2016-08-29 17:31:44 -07:00
James B. Pollack
2a12f2feae
marketplaces html
2016-08-29 17:27:39 -07:00
Andrew Meadows
99acc9045d
disable defaultScripts.js debugging by default
2016-08-29 17:15:01 -07:00
Andrew Meadows
b50d24fb00
don't use Script.resolvePath() in local functions
2016-08-29 17:11:29 -07:00
Brad Hefta-Gaub
f3d157c396
Merge pull request #8500 from jherico/gl_context
...
Custom OpenGL context creation
2016-08-29 16:22:21 -07:00
Anthony J. Thibault
e34aecde49
Bug fix for click events received by entity scripts
...
PointerEvent.isLeftButton should be true even on left button release events.
in a previous PR this behavior was changed. isLeftButton was used as a flag indicating the button state, which would be false on left button release events.
Because we have scripts that rely on the old behavior, I've changed it back to the original and introduced isPrimaryHeld properties instead.
2016-08-29 16:21:39 -07:00
howard-stearns
a48aced7bd
Merge branch 'master' of https://github.com/highfidelity/hifi into restore-WebView-tab-handler
2016-08-29 15:43:42 -07:00
Stephen Birarda
a8272712bb
move forced client selection to apply to all installs
2016-08-29 15:40:45 -07:00
howard-stearns
11f00ed46c
add a hook so that clients can gain access to the new component, window,
...
and request
2016-08-29 14:44:48 -07:00
James B. Pollack
cceae50b90
no more delete with backspace
2016-08-29 14:28:05 -07:00
James B. Pollack
95c627aa71
dev
2016-08-29 14:24:36 -07:00
Zach Pomerantz
f30308b68c
add deeply nested skyboxes
2016-08-29 13:57:14 -07:00
Zach Pomerantz
1971063b9a
clean up Procedural::parseShader
2016-08-29 13:56:39 -07:00
howard-stearns
6272db42da
restore onNewViewRequested
2016-08-29 13:53:08 -07:00
Zach Pomerantz
1e7c00c0c8
fix Skybox::clear to set _empty
2016-08-29 13:40:56 -07:00
Anthony J. Thibault
3ed11d2e5f
When trigger is pulled, snap search beam to correct length instead of animating.
...
This improves interaction on web browser tablets. Instead of the beam shooting
through the tablet and animating back to the surface, it starts at the correct length.
2016-08-29 13:22:57 -07:00
Stephen Birarda
20777bd19a
force default selection of client on install
2016-08-29 13:13:35 -07:00
Stephen Birarda
87ecc65dce
set component requirement in cpack add componeent command
2016-08-29 13:13:35 -07:00
Stephen Birarda
fab2568624
always remove the resources dir, make client required
2016-08-29 13:13:35 -07:00
Stephen Birarda
0e4fb51d09
force cleanup section to be first
2016-08-29 13:13:35 -07:00
Stephen Birarda
c4ec02c4bf
add removal of resources folder during install process
2016-08-29 13:13:35 -07:00
Brad Davis
3890197efe
Merge pull request #8535 from zzmp/fix/skybox-black
...
allow black skybox
2016-08-29 13:11:46 -07:00
Andrew Meadows
b1d472c9ba
workaround for Script.resolvePath() bug
2016-08-29 12:28:59 -07:00
Anthony J. Thibault
dcd91d4398
removed debug flag
2016-08-29 12:04:48 -07:00
Anthony J. Thibault
0f42943bfb
Marketplace tablet is a bit larger and lower DPI.
...
Bug fix for grabbing/equipping large objects, they no longer will drop immediately
if your grab point is too far away from the grabbed entity position.
2016-08-29 11:55:04 -07:00
Howard Stearns
a1ae9eebf2
Merge pull request #8534 from howard-stearns/silence-address-bar-log-warning
...
Silence address bar log warning
2016-08-29 11:48:43 -07:00
Brad Davis
179e3565ef
More render-perf tweaks
2016-08-29 11:22:56 -07:00
Brad Davis
617633b85c
Moving to custom context creation
2016-08-29 11:21:54 -07:00
Zach Pomerantz
5f699072d9
allow black skybox
2016-08-29 10:58:09 -07:00
howard-stearns
01af8899bf
silence address bar dialog qml warning
2016-08-29 10:47:22 -07:00
Seth Alves
55b68ad4b1
fix warning
2016-08-29 10:21:58 -07:00
