Commit graph

24374 commits

Author SHA1 Message Date
SamGondelman
c9d2d40e1e possibly fix registration offset issue 2017-10-03 14:44:11 -07:00
SamGondelman
b8ea6c22fa no tpose when switching avatars
(cherry picked from commit fcfac9efc0)
2017-09-29 13:47:09 -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
Sam Gateau
287f4f1d71 Merge pull request #11466 from SamGondelman/mirrorCrash
Fix mirror and fade threading crashes
2017-09-27 16:17:04 -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
SamGondelman
553829f7ab make sure FadeEffect dependency is created early 2017-09-27 11:58:35 -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
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
Bradley Austin Davis
e42068f681 Merge branch 'master' into android_new 2017-09-26 14:31:29 -07:00
samcake
510b446409 mergine with master, resolving conflict 2017-09-26 13:13:46 -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
Seth Alves
51d5f86989 Merge pull request #11460 from AndrewMeadows/fix-debug-build-20170926
remove asserts that break Debug build
2017-09-26 12:22:31 -07:00
Seth Alves
913d3c4d12 Merge pull request #11422 from hyperlogic/feature/ant-man2
Secondary IPD fixes
2017-09-26 11:53:45 -07:00
Stephen Birarda
608d42cdf7 Merge pull request #11461 from birarda/bug/too-much-logging
remove noisy logging added by auto baking
2017-09-26 13:29:42 -05:00
Dante Ruiz
e397d49564 Merge pull request #11159 from vladest/modal_dialogs_async
Modal dialogs async
2017-09-26 11:07:42 -07:00
samcake
b5c942f7f6 Merge branch 'master' of https://github.com/highfidelity/hifi into game-render-interface 2017-09-26 10:47:59 -07:00
Stephen Birarda
b77ceab661 remove noisy logging added by auto-baking 2017-09-26 10:45:23 -07:00
Andrew Meadows
ec80846281 Merge pull request #11443 from SamGondelman/sharks
Laser Pointer fixes and updates
2017-09-26 10:22:55 -07:00
Sam Gateau
ff1101cc69 Merge pull request #11453 from Menithal/entity-custom-shader-emit-fix
Experimental Fix: Entity Shader Lightmap use / emissive
2017-09-26 09:39:33 -07:00
Andrew Meadows
67481287ff comment out asserts that fail to compile in Debug 2017-09-26 09:29:43 -07:00
Brad Davis
40c42d35a5 Fix long tablet lag on first load 2017-09-25 17:50:04 -07:00
Menithal
19a290be70 Fixed Entity Shader emmissive
Makes sure that the emissiveAmount information is used correctly for a custom
shader, instead of using specular rgb information to generate the
emissiveness, which was incorrect
2017-09-26 00:12:45 +03:00
SamGondelman
a73fdf4397 fix pointer event properties 2017-09-25 10:19:42 -07:00
Andrew Meadows
cf0dd6f8c3 Merge pull request #11371 from cain-kilgore/21542
WL 21542 - Allow Scripts to change Avatar Gravity [Experimental]
2017-09-23 22:20:52 -07:00
Brad Hefta-Gaub
bafb59e691 Merge pull request #11436 from SamGondelman/missingModels
Fix missing models
2017-09-23 13:56:50 -07:00
Zach Fox
921ebc221e Merge pull request #11431 from zfox23/contextOverlayInterface_fixEnabled
Enable Inspection Mode for all; change Commerce setting name
2017-09-22 17:52:27 -07:00
SamGondelman
86198606e0 add _modelJustLoaded and updateTransforForSkinnedMesh on creation 2017-09-22 17:12:44 -07:00
SamGondelman
cbe621f2b7 add searchRay to RayPickResult, fix precision picking caching with multiple lasers, make laser addition/removal immediate 2017-09-22 15:15:15 -07:00
SamGondelman
bc477608ee fix alpha on glowLines 2017-09-22 13:22:08 -07:00
Zach Fox
430d1b22bb Update angular size and i behavior 2017-09-22 11:41:28 -07:00
Zach Fox
bb9db3ef6d Updates to behavior and shader appearance 2017-09-22 11:24:30 -07:00
Anthony Thibault
20cb02dabb Merge pull request #11440 from hyperlogic/bug-fix/text-entity-rendering
Fix for TextEntity rendering, the translation was incorrect
2017-09-22 11:19:24 -07:00
samcake
061ec69b09 Merge branch 'master' of https://github.com/highfidelity/hifi into game-render-interface 2017-09-22 10:52:30 -07:00
SamGondelman
be27376c52 add comment about bottleneck 2017-09-22 10:21:32 -07:00
Anthony J. Thibault
d3c60f3057 Fix for TextEntity rendering, the translation was incorrect
This was caused by the removal of _dimensions from the SpatiallyNestable scale component.
2017-09-22 09:44:51 -07:00
Brad Davis
549cb77902 Fix dimensions of rendered web entities 2017-09-21 20:59:01 -07:00
SamGondelman
9f12d3a365 fix missing models 2017-09-21 17:57:25 -07:00
Cain Kilgore
0d33976035 Real time changes 2017-09-22 00:38:30 +01:00
Anthony J. Thibault
54e627e2c5 Merge branch 'master' into feature/ant-man2 2017-09-21 13:59:47 -07:00
Ryan Huffman
abbe263142 Fix FBXBaker not properly handling textures with the same name 2017-09-21 13:40:39 -07:00
Ken Cooke
84786ac8e3 Merge pull request #11424 from ctrlaltdavid/21548
Fix recording just made not playing back if reload it
2017-09-21 12:19:23 -07:00
David Rowe
a2d8152a3a Coding standard 2017-09-22 07:13:32 +12:00
Zach Fox
57b5a23373 Enable Inspection Mode for all; change Commerce setting name 2017-09-21 11:18:21 -07:00
samcake
9a9d13e519 Merge branch 'master' of https://github.com/highfidelity/hifi into game-render-interface 2017-09-21 09:05:46 -07:00
Andrew Meadows
6b3b3a7448 Merge pull request #11382 from ElderOrb/case6618
6618 [Worklist] Add Input Field On Top of Keyboard
2017-09-21 08:54:11 -07:00
Andrew Meadows
b803344f0c Merge pull request #11421 from jherico/fix/transform_log_spam
Don't add items to the scene graph until they have a valid parent chain
2017-09-21 08:42:56 -07:00
Ryan Huffman
a56303a3fe Merge pull request #11379 from highfidelity/feat/auto-bake
Add auto baking to Asset Server and mesh compression for FBXs
2017-09-21 08:33:51 -07:00