Zach Fox
6c7096b0d7
Fix login button injection on individual item page
2017-10-18 14:53:39 -07:00
David Rowe
5b6d33bcb2
Missing semicolon
2017-10-18 20:29:34 +13:00
David Rowe
f74c33f597
Fix importing entities from URL
2017-10-18 17:44:36 +13:00
Bradley Austin Davis
9e46e288b1
Merge pull request #11604 from SamGondelman/endSphere
...
Scale LaserPointer end overlay in C++
2017-10-17 16:37:35 -07:00
SamGondelman
aee817fbbc
scale end sphere in c++ for controller modules
2017-10-16 13:31:25 -07:00
milad
97c255c59e
Fix for fogbugz:8382 to shutdown debug window on reload scripts
2017-10-16 16:12:54 -04:00
Seth Alves
fe9f142bf6
Merge pull request #11562 from druiz17/fix-release-grab
...
include release message to controller modules
2017-10-13 13:06:18 -07:00
Brad Hefta-Gaub
9f3331ec19
Merge pull request #11587 from druiz17/stylus-fix
...
Fix Stylus in Tablet + Grab with Hand Results in the other Stylus being Dysfunctional
2017-10-13 12:42:26 -07:00
Dante Ruiz
d14e6b6e5a
Merge pull request #11450 from ElderOrb/case7722
...
7722 Add onHover Outline to Tablet "X" Button
2017-10-13 11:38:38 -07:00
druiz17
6799b9ca13
fix stylus
2017-10-13 09:34:08 -07:00
Brad Hefta-Gaub
1bba5ff812
Merge pull request #11554 from sethalves/import-av-entities
...
Import av entities
2017-10-12 13:30:53 -07:00
beholder
8c7462f012
fine-tuning based on discussion with Anshuman
2017-10-12 22:21:40 +03:00
beholder
9c15af9fbe
raise highlight above button overlay to reduce flickering
2017-10-12 14:46:01 +03:00
Zach Fox
99109fe8e5
Merge pull request #11567 from zfox23/commerce_daveIntegration3
...
2017-10-10 Commerce Frontend Updates
2017-10-11 11:07:03 -07:00
Zach Fox
c2733a4186
Fix notification bug
2017-10-11 09:47:16 -07:00
druiz17
67944c40a1
Merge branch 'master' of github.com:highfidelity/hifi into fix-release-grab
2017-10-11 09:13:01 -07:00
Atlante45
6dd49f5c32
Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master
2017-10-10 16:53:34 -07:00
Sam Gateau
f143c28625
Merge pull request #11542 from SamGondelman/bubbleBoy
...
Move HUD and HUD overlay rendering out of display plugin
2017-10-10 14:26:20 -07:00
druiz17
e77ac9fd10
include release message
2017-10-10 13:47:33 -07:00
Zach Fox
1c0a564155
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_daveIntegration3
2017-10-10 12:36:06 -07:00
Zach Fox
b105248dd7
Merge pull request #11555 from zfox23/commerce_daveIntegration2
...
2017-10-09 Commerce Frontend Updates
2017-10-10 12:34:30 -07:00
Seth Alves
4a3b59ea61
Merge pull request #11560 from druiz17/far-grab-nondynamic
...
Far grab non-dynamic entities
2017-10-10 12:29:38 -07:00
Zach Fox
be2b241629
Lots of progress; don't yet have some things
2017-10-10 12:20:48 -07:00
druiz17
013e15c9a2
made requested changes
2017-10-10 10:54:56 -07:00
Zach Fox
8d0d9a159f
Bugfixes
2017-10-10 10:38:19 -07:00
Melissa Brown
662bb6c103
Merge pull request #11338 from 1P-Cusack/FogBugz/Case_6491_Part7
...
[Case 6491] Remainder of entitySelectionTool clean up (details below).
2017-10-10 10:36:14 -07:00
druiz17
a179df29fb
mouse grab non-dynamic entities
2017-10-10 10:31:40 -07:00
druiz17
d0eb6a3ad0
remove comments
2017-10-10 09:45:41 -07:00
druiz17
003395b256
removing whitespace
2017-10-10 09:43:02 -07:00
druiz17
fc41155ce1
saving work
2017-10-10 09:17:01 -07:00
Zach Fox
733df8391f
Round 2
2017-10-09 12:27:56 -07:00
Seth Alves
23f41457be
Revert "Revert "fix importing of avatar entities""
...
This reverts commit 28a8b18060
2017-10-09 11:52:43 -07:00
Thijs Wenker
895f79fd80
Merge pull request #11548 from ctrlaltdavid/move-shapes
...
Move Shapes app files from scripts directory to marketplace directory
2017-10-09 02:37:15 +02:00
Thijs Wenker
bd74386997
Merge pull request #11543 from ctrlaltdavid/21496
...
Add script that tests setting your listening position and orientation
2017-10-09 01:15:22 +02:00
David Rowe
765f3fc381
Move Shapes app files from scripts directory to marketplace directory
2017-10-09 10:38:40 +13:00
Seth Alves
28a8b18060
Revert "fix importing of avatar entities"
2017-10-07 16:54:05 -07:00
David Rowe
596ce8e9c1
Add script that tests setting your listening position and orientation
2017-10-07 21:46:56 +13:00
Brad Hefta-Gaub
62fc193bff
Merge pull request #11532 from sethalves/import-av-entities
...
fix importing of avatar entities
2017-10-06 17:59:54 -07:00
Thijs Wenker
77a36bf788
Merge pull request #10892 from ctrlaltdavid/vr-edit-a
...
VR edit app
2017-10-07 02:19:00 +02:00
David Rowe
3fbaf250a4
Increase delay in kicking off physics
2017-10-07 11:50:31 +13:00
SamGondelman
b4a3ab9204
fix debugDeferredLighting
2017-10-06 15:46:10 -07:00
SamGondelman
7e6d5d9d98
merge with master
2017-10-06 14:57:08 -07:00
Seth Alves
8d00731620
Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities
2017-10-06 07:20:34 -07:00
LaShonda Hopper
2f082d9e86
[Case 6491] Fixes issue in normalizeDegrees from last commit (details below).
...
The range of the function is targeting (-180, 180] such that
the statement:
if (degrees < -180)
should be:
if (degrees <= -180)
to account for degrees being -180.
Changes Committed:
modified: scripts/system/libraries/entitySelectionTool.js
2017-10-06 10:11:26 -04:00
LaShonda Hopper
707569b230
[Case 6491] More efficient version of normalizeDegrees function (details below).
...
Refactoring the original normalizeDegrees function to be
more efficient as suggested via:
https://github.com/highfidelity/hifi/pull/11338#pullrequestreview-67520585
Changes Committed:
modified: scripts/system/libraries/entitySelectionTool.js
2017-10-06 09:50:24 -04:00
David Rowe
105457b388
Don't unbusubscribe from possibly shared channel
2017-10-06 13:27:08 +13:00
David Rowe
5c72a41163
Delete some redundant code
2017-10-06 11:14:07 +13:00
David Rowe
5587a2fdf8
Fix creating an entity while a tool is active
2017-10-06 11:13:53 +13:00
druiz17
3139f5ef2a
improve mouseHMD exit logic
2017-10-05 15:12:58 -07:00
druiz17
ba50fcc509
fix mouse dissapearing in desktop mode
2017-10-05 15:07:49 -07:00
