howard-stearns
|
46061a2a15
|
initial with pal
|
2018-07-16 11:54:05 -07:00 |
|
Zach Fox
|
b5862c0ede
|
Merge pull request #13583 from zfox23/specCamBumpVersion
Bump version of Spec Cam QML to 2.3
|
2018-07-11 10:38:59 -07:00 |
|
Seth Alves
|
4cf706dd96
|
Merge pull request #13574 from AndrewMeadows/grab-kinematic-children
more correct kinematic motion of grabbed things
|
2018-07-11 10:34:44 -07:00 |
|
Sam Gateau
|
377c072e6d
|
Merge pull request #13557 from Zvork/bloom
Fix Bloom on Mac and hopefully Windows AMD (bug #15434)
|
2018-07-11 19:29:44 +02:00 |
|
Zach Fox
|
1a554e658d
|
Bump version of Spec Cam QML to 2.3
|
2018-07-11 09:47:11 -07:00 |
|
Zach Fox
|
9a1ad6aba2
|
Merge pull request #13578 from zfox23/MS16600_dupeSpecCams
Fix MS16600: Prevent duplicate Spectator Camera models after crash
|
2018-07-11 09:34:54 -07:00 |
|
Zach Fox
|
9729457222
|
Merge pull request #13563 from zfox23/MS16480_disableOverlays
Fix MS16480: Disable active ContextOverlays when disabling ContextOverlayInterface
|
2018-07-11 08:50:35 -07:00 |
|
Zach Fox
|
2fad55e5d0
|
Prevent PAL from re-enabling ContextOverlayInterface when it's not supposed to
|
2018-07-10 15:56:13 -07:00 |
|
Zach Fox
|
d3c0236602
|
Merge branch 'master' of github.com:highfidelity/hifi into MS16480_disableOverlays
|
2018-07-10 15:02:05 -07:00 |
|
Zach Fox
|
b573b16df8
|
Fix MS16600: Prevent duplicate Spectator Camera models after crash
|
2018-07-10 14:12:21 -07:00 |
|
Howard Stearns
|
5cf6cc0270
|
Merge pull request #13575 from howard-stearns/fix-connections-count
fix PAL connections count
|
2018-07-10 14:58:15 -05:00 |
|
howard-stearns
|
8b713a437f
|
don't store undefined in a qml int.
|
2018-07-10 12:14:31 -07:00 |
|
howard-stearns
|
886df959d1
|
expose totalPages and totalEntries, and use the later to display
connections count
|
2018-07-10 11:26:23 -07:00 |
|
Andrew Meadows
|
8ea18e3359
|
integrate active kinematic even when grabbed
|
2018-07-10 11:20:18 -07:00 |
|
Andrew Meadows
|
dd6be374fa
|
cleanup and optimization rotational integration
|
2018-07-10 11:18:38 -07:00 |
|
Andrew Meadows
|
9171fcbe8b
|
explicit insert/erase into _simpleKinematicEntities
|
2018-07-10 11:17:13 -07:00 |
|
Andrew Meadows
|
0b87df45b5
|
cleanup return statement
|
2018-07-10 11:16:56 -07:00 |
|
Anthony Thibault
|
1d33f51ca4
|
Merge pull request #13528 from amantley/integratedStepping
Step Detection From Head and Hands Tracking
|
2018-07-10 09:59:22 -07:00 |
|
Wayne Chen
|
28583ad2a2
|
Merge pull request #13571 from wayne-chen/unusedLambdaCaptureVariables
Removing unused variables from lambda capture expressions
|
2018-07-10 08:56:38 -07:00 |
|
Wayne Chen
|
8f23fb01a4
|
removing unused variables
|
2018-07-10 07:30:02 -07:00 |
|
Wayne Chen
|
bf5cdb0e5f
|
removing unused variables from lambda capture expressions
|
2018-07-09 22:31:49 -07:00 |
|
John Conklin II
|
81f5631ce9
|
Merge pull request #13386 from ElderOrb/FB13949
AvatarApp
|
2018-07-09 15:20:18 -07:00 |
|
amantley
|
cb421fd5b0
|
fixed build errors for mac and linux
|
2018-07-09 15:09:45 -07:00 |
|
John Conklin II
|
25406fa464
|
Merge pull request #13495 from thoys/feat/create/native-windows
Create App: Native windows
|
2018-07-09 14:25:13 -07:00 |
|
amantley
|
a2f8e024fb
|
added avatar constants changed for posterior and head velocity
|
2018-07-09 13:59:56 -07:00 |
|
amantley
|
55ae08c071
|
Merge remote-tracking branch 'upstream/master' into integratedStepping
|
2018-07-09 13:55:59 -07:00 |
|
amantley
|
b2d77ef51a
|
bracket spacing
|
2018-07-09 13:54:18 -07:00 |
|
amantley
|
7ed8f17b57
|
tweaked posterior threshold and head velocity threshold
|
2018-07-09 13:49:21 -07:00 |
|
David Back
|
8f1ad8e367
|
Merge pull request #13538 from dback2/editHandleMacFix
Edit handle undefined event fix
|
2018-07-09 12:08:18 -07:00 |
|
amantley
|
a3417cace9
|
implemented code review changes. 1. checking for divide by zero before glm::normalize. 2. clearing the ring buffer on reset. 3. renaming _standingHeightMode to _currentStandingHeight
|
2018-07-09 11:58:02 -07:00 |
|
Wayne Chen
|
ce0ffe4292
|
Merge pull request #13551 from cmpt376edits/master
Improve punctuation on README.md
|
2018-07-09 11:44:16 -07:00 |
|
John Conklin II
|
79b2858220
|
Merge pull request #13543 from ctrlaltdavid/M16392
Create snap-to-grid and translation fixes
|
2018-07-09 11:39:26 -07:00 |
|
Zach Fox
|
01eb3eddab
|
Fix MS16480: Disable active ContextOverlays when disabling ContextOverlayInterface
|
2018-07-09 10:49:11 -07:00 |
|
David Back
|
d4f43a56f2
|
Merge pull request #13556 from dback2/deselectInput
Change deselecting entities to Ctrl + D and prevent W/A/S/D/E/Q movements with Ctrl
|
2018-07-09 10:40:33 -07:00 |
|
John Conklin II
|
e6801c303a
|
Merge pull request #13432 from SimonWalton-HiFi/avatar-identity-request
Implement AvatarRequestIdentity and use if interface gets unknown avatar data
|
2018-07-09 10:07:19 -07:00 |
|
David Back
|
17220b9360
|
Merge pull request #13549 from dback2/parentChildCopy
Re-parent entities after duplicating and duplicate children with parents
|
2018-07-09 10:06:18 -07:00 |
|
John Conklin II
|
55405cc61e
|
Merge pull request #13561 from dback2/pointingAtOverlaysFix
Fix pointing at non-web overlays
|
2018-07-09 10:04:15 -07:00 |
|
Thijs Wenker
|
8ac8b10f98
|
Merge pull request #13521 from MiladNazeri/Fix-JSDoc-Readme
Fixed Readme instructions on JSDoc
|
2018-07-09 18:55:34 +02:00 |
|
Thijs Wenker
|
b1884b0841
|
CR fixes
|
2018-07-09 16:38:53 +02:00 |
|
Brad Hefta-Gaub
|
f8f206c2f9
|
Merge pull request #13450 from misslivirose/master
MS14398: Make tutorial not grabbable
|
2018-07-07 21:18:15 -07:00 |
|
David Back
|
3bcc727d47
|
check controller triggered in checkControllerMove
|
2018-07-06 18:57:32 -07:00 |
|
David Back
|
f33fae30ed
|
Merge branch 'editHandleMacFix' of github.com:dback2/hifi into editHandleMacFix
|
2018-07-06 18:56:09 -07:00 |
|
amantley
|
defd6f88e6
|
started changes suggested by code review, ie mode computation
|
2018-07-06 18:17:13 -07:00 |
|
David Back
|
d04c2eaf73
|
Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleMacFix
|
2018-07-06 18:01:16 -07:00 |
|
Alexander Ivash
|
425209189d
|
reduce precision
|
2018-07-07 03:03:24 +03:00 |
|
David Back
|
f815ad1ddd
|
tabs
|
2018-07-06 17:02:41 -07:00 |
|
David Back
|
c271e1aae4
|
fix triggering at non-web overlays
|
2018-07-06 17:02:29 -07:00 |
|
Alexander Ivash
|
7feb9910c9
|
use rotation degrees instead of quaternions for comparison
re-query entity properties after editing it to get actual changes
|
2018-07-07 02:36:19 +03:00 |
|
Alexander Ivash
|
4716be01f6
|
eliminate binding loop which could lead to not updating spinbox UI
|
2018-07-07 02:36:19 +03:00 |
|
Alexander Ivash
|
168584169c
|
do not close avatarapp on hiding tablet
|
2018-07-07 02:36:19 +03:00 |
|