SamGondelman
c9d2d40e1e
possibly fix registration offset issue
2017-10-03 14:44:11 -07:00
Anthony J. Thibault
7dfa80f666
Bug fix for offset of animated parts of oculus touch controller display
...
Ensure position/rotations are updated with a consistent scale and
are animated correctly as the controller values change.
2017-10-01 17:52:59 -07:00
SamGondelman
572986bfad
fix modeloverlay visible change
...
(cherry picked from commit 0bb27a7165
2017-10-01 13:40:00 -07:00
SamGondelman
b8ea6c22fa
no tpose when switching avatars
...
(cherry picked from commit fcfac9efc0
2017-09-29 13:47:09 -07:00
Zach Fox
5509be7d33
Merge branch 'RC-56' of https://github.com/highfidelity/hifi into RC-56
2017-09-29 13:42:37 -07:00
Anthony J. Thibault
4fd4479497
Oculus: Bug fix for head offset on large/small scaled avatars.
...
(cherry picked from commit d8e2cbf871
2017-09-29 13:28:40 -07:00
Zach Fox
96b6a2f013
Fix entity add after incomplete rezCertified implementation
...
(cherry picked from commit 0f66fb41fd
2017-09-29 13:27:21 -07:00
Seth Alves
a1c52ea638
Merge pull request #11477 from samcake/flash
...
Fixing the broken "on hud" overlay's render transform
2017-09-27 17:42:15 -07:00
samcake
29da0c663f
Merge branch 'master' of https://github.com/highfidelity/hifi into flash
2017-09-27 16:21:55 -07:00
Sam Gateau
287f4f1d71
Merge pull request #11466 from SamGondelman/mirrorCrash
...
Fix mirror and fade threading crashes
2017-09-27 16:17:04 -07:00
Seth Alves
3016ce0a2b
Merge pull request #11470 from sethalves/fix-grab-vs-trigger
...
set grabbable and other checkboxes correctly if userData is blank
2017-09-27 15:24:37 -07:00
samcake
3bd6e35e30
Fixing the broken on hud overlay's render transform
2017-09-27 15:19:21 -07:00
Sam Gateau
f25e4203fd
Merge pull request #11469 from SamGondelman/tPose
...
Don't constantly reload animGraph if URL didn't change
2017-09-27 14:46:05 -07:00
Zach Fox
7ad3a5a1e3
Commerce: Tons of Interface changes ( #11463 )
...
* canRez(Tmp)Certified()
* CertifiedItem beginnings
* Skeleton of verifyOwnerChallenge()
* Controlled failure; updateLocation() skeletion
* Controlled failure on checkout page with ctrl+f
* Skeleton Purchases first-use tutorial
* Initial progress on new setup
* Security pic tip
* Skeleton Certificate page
* Updates to Certificate
* General progress; setup is nearly complete
* Better buttons; last step almost done
* Initial progress on wallet home
* Completed recent transactions
* Security page
* Scrollbar
* Fix auth error text
* PassphraseSelection
* Change security pic
* Minor layout changes; beginnings of emulated header
* Various layout changes; wallet nav bar
* Help screen
* Quick onaccepted change
* First pass at new purchases
* Small style updates
* Some error progress
* Lightbox in purchases
* Collapse other help answers when clicking on another
* REZZED notif
* Commerce Lightbox
* Lots of new interactions in Purchases
* Hook up 'view certificate'
* Fix errors, fix close button on cert
* Purchases timer; much faster filter
* Add debugCheckout
* Purchase updates
* GlyphButton; separator; Checkout Success; Ledger fix; debug modes
* Lock glyph below security pic should be white
* Various fixes, round 1
* Circular mask
* Passphrase change button fix; TextField error edge highlighting
* Recent Activity fixes
* Various changes
* Standard Security Pic location
* Color changes
* Filter bar changes
* Styling for multiple owned items
* Minor language change
* Header dropdown (harder than expected)
* Small fixes
* View backup instructions
* marketplaces.js onCommerceScreen
* Beginnign of new injection
* Marketplace injection changes
* Purchase button style changes
* More button styling
* MY PURCHASES button
* marketplace onUsernameChanged
* New help QA
* Help text changes etc
* Downscale security image, reducing filesize
* Lots of bugfixes
* Cleanup before PR
* Only open cert during inspection if commerce switch is on
* Help text changes
* Purchase status incl. change to confirmed; Help text; Open Explorer to hifikey
* Quick glyph change
* New 'wallet not set up' flow for when entering Purchases or Checkout without set-up wallet
2017-09-27 14:43:51 -07:00
anshuman64
9e1a181cbc
Merge pull request #11473 from ElderOrb/case7926
...
7926 Create Mode: the keyboard tray is not styled correctly
2017-09-27 14:35:10 -07:00
Seth Alves
2e92d40c8d
Merge pull request #11475 from druiz17/bugs
...
Fix EntitySelectioTool and improve far rotate
2017-09-27 14:05:35 -07:00
druiz17
58a00a89d7
remove debug print
2017-09-27 12:58:11 -07:00
SamGondelman
553829f7ab
make sure FadeEffect dependency is created early
2017-09-27 11:58:35 -07:00
druiz17
cea3c002dd
improving far rotate
2017-09-27 11:47:26 -07:00
beholder
3677718e48
7926 Create Mode: the keyboard tray is not styled correctly
2017-09-27 21:33:18 +03:00
druiz17
38096b48d9
fixing entitySelectionTool
2017-09-27 10:52:56 -07:00
Sam Gateau
88097bb39f
Merge pull request #11447 from AndrewMeadows/lod-auto-adjust
...
LODManager uses batchTime and engineRunTime for automatic LOD adjustment
2017-09-27 10:51:46 -07:00
Seth Alves
eb6c99456d
Merge branch 'master' of github.com:highfidelity/hifi into fix-grab-vs-trigger
2017-09-27 10:01:24 -07:00
Brad Hefta-Gaub
3500705d0c
Merge pull request #11427 from ElderOrb/case7723
...
7723 Tablet Should Rotate Faster when using Create app
2017-09-26 22:05:45 -07:00
Seth Alves
ae42d56cd6
Merge pull request #11465 from hyperlogic/bug-fix/teleporter-near-scale
...
Teleport.js: can now teleport small distances with small avatar scale
2017-09-26 19:05:14 -07:00
Seth Alves
ce3e5eb1a3
set grabbable and other checkboxes correctly if userData is blank or malformed. near-trigger blocks near-grab
2017-09-26 18:56:27 -07:00
SamGondelman
306cf883fe
don't reload animGraph if url didn't change
2017-09-26 18:18:41 -07:00
Sam Gateau
9317ad38aa
Merge pull request #11462 from highfidelity/game-render-interface
...
Moving transform evaluation out from render loop to gameplay loop / fixing tablet tearing
2017-09-26 17:40:23 -07:00
Seth Alves
f384cde471
Merge pull request #11467 from sethalves/fix-near-trigger
...
Fix near trigger
2017-09-26 17:27:05 -07:00
Dante Ruiz
410baaf7bc
Merge pull request #11464 from druiz17/controller-dispatacher-bugs
...
fix auto dropping and re-grabbing loop
2017-09-26 16:46:34 -07:00
Seth Alves
8180acbffc
use same trigger test as in isReady
2017-09-26 16:29:22 -07:00
anshuman64
ca4d5ef807
Merge pull request #11454 from ElderOrb/case7877
...
7877 Unexpected Behavior when pressing Enter on Input Field
2017-09-26 16:26:42 -07:00
SamGondelman
49512c95d7
possibly fix threading crashes, mirror and fade
2017-09-26 16:21:36 -07:00
Andrew Meadows
dafadf82bb
Merge pull request #11458 from jherico/fix/tablet_latency
...
Fix long tablet lag on first load
2017-09-26 16:18:31 -07:00
Andrew Meadows
a0cfd87674
Merge pull request #11348 from jherico/android_new
...
Working on new android toolchain & sample
2017-09-26 16:00:09 -07:00
Bradley Austin Davis
9d18fd3a46
Merge branch 'master' into android_new
2017-09-26 15:59:01 -07:00
Seth Alves
a478506da3
Merge branch 'master' of github.com:highfidelity/hifi into fix-near-trigger
2017-09-26 15:52:22 -07:00
samcake
badb45c921
fixing the web surface now getting scaled when the table t is grabbed is fixed
2017-09-26 15:20:45 -07:00
Seth Alves
644532dd59
only send startNearTrigger once
2017-09-26 15:17:23 -07:00
druiz17
5a1242a1ac
fix spelling error
2017-09-26 15:06:31 -07:00
druiz17
76c1fe688c
fix auto dropping
2017-09-26 14:52:01 -07:00
Bradley Austin Davis
e42068f681
Merge branch 'master' into android_new
2017-09-26 14:31:29 -07:00
Anthony J. Thibault
a7cfb5d635
teleport.js: fix for TELEPORT_CANCEL_RANGE with large/small avatar scale
2017-09-26 14:21:25 -07:00
Andrew Meadows
909e5e86b1
Merge pull request #11442 from vladest/fix_dde_visibility
...
Fix dde visibility
2017-09-26 14:19:47 -07:00
Anthony J. Thibault
f081c36f25
ViveControllerManager: Code review feedback on PR #11422
2017-09-26 14:19:31 -07:00
Anthony J. Thibault
c26d04dca1
Teleport.js: Fix message bugs, and made eslint clean
...
* 'Hifi-Teleport-Ignore-Add' and 'Hifi-Teleport-Ignore-Remove' messages should now should work
* 'Hifi-Teleport-Disabler' message should now work
2017-09-26 13:58:00 -07:00
samcake
a8770e1077
Merge branch 'master' of https://github.com/highfidelity/hifi into game-render-interface
2017-09-26 13:14:24 -07:00
samcake
510b446409
mergine with master, resolving conflict
2017-09-26 13:13:46 -07:00
Seth Alves
a871a6db1d
Merge pull request #11430 from sethalves/fix-parent-grab
...
Fix parent grab
2017-09-26 13:00:16 -07:00
Seth Alves
7397a123c5
Merge pull request #11345 from SamGondelman/textAA
...
Text3D Overlays and Entities fixes and no-AA
2017-09-26 12:26:08 -07:00
