Wayne Chen
e721844b10
Merge branch 'master' of https://github.com/highfidelity/hifi into loginOnLaunch
2018-09-10 10:10:16 -07:00
John Conklin II
472675f9a8
Merge pull request #13956 from hyperlogic/feature/improve-anim-stats
...
Move animation stats into its own Menu
2018-09-07 14:51:46 -07:00
Anthony Thibault
6508533a15
Remove anim stats from plain ole stats.
...
There are still present in anim stats tho.
2018-09-06 17:58:40 -07:00
Wayne Chen
e76ebf7a0b
changing location of shortcuts
2018-09-06 17:29:16 -07:00
Anthony Thibault
acc7f1f168
Moved AnimStats into its own qml panels.
...
Added state machine tracking as well.
2018-09-06 16:18:58 -07:00
Zach Fox
0e785f9bdb
Fix MS17877: Persist Connections table sort choice
2018-09-06 15:35:26 -07:00
John Conklin II
152ec3d631
Merge pull request #13945 from davidkelly/dk/17915
...
volume slider on individual users in PAL remembers setting now
2018-09-06 12:55:46 -07:00
Wayne Chen
a5038850f1
right align forgot user/pw shortcuts
2018-09-06 11:37:35 -07:00
Wayne Chen
385027321b
fixing the eye open/closed pw image
2018-09-06 11:18:35 -07:00
Ryan Huffman
80b5f90160
Merge pull request #13857 from thoys/fix/interactiveWindows/onlyOnTopWhileMainWindowActive
...
MS17463: only show InteractiveWindow on top of interface window
2018-09-06 10:15:20 -07:00
Wayne Chen
3f1eba418d
modifying location of links for user/pw
2018-09-06 00:07:23 -07:00
Wayne Chen
6d055ba136
changing sign up label
2018-09-05 23:49:49 -07:00
Wayne Chen
78fa52285f
adding show password toggle in textfield
2018-09-05 23:48:21 -07:00
Wayne Chen
7a136812bf
Merge branch 'login-update' of https://github.com/alexiamandeville/hifi into loginOnLaunch
2018-09-05 20:05:19 -07:00
Anthony Thibault
3a3ffcc98c
First pass at improving anim stats.
2018-09-05 18:14:06 -07:00
Alexia Mandeville
901de120a6
Removing flavortext
2018-09-05 17:20:49 -07:00
Alexia Mandeville
1e697ad45f
Removing labels, adding flavor text, moving links
2018-09-05 16:25:18 -07:00
David Kelly
b022697dfa
volume slider on users fixed
2018-09-05 15:36:07 -07:00
Alexia Mandeville
dcf2e00bd7
Adding placeholder text
2018-09-05 14:55:12 -07:00
Thijs Wenker
62d4b1805d
Merge branch 'master' of github.com:highfidelity/hifi into fix/interactiveWindows/onlyOnTopWhileMainWindowActive
2018-09-05 17:25:14 +02:00
Sam Gateau
9e2a540bab
Merge branch 'master' of github.com:highfidelity/hifi into black
2018-08-30 12:12:24 -07:00
Sam Gateau
12ec56875e
Merge pull request #13867 from SamGondelman/recurse
...
findRayIntersection/findParabolaIntersection performance improvements
2018-08-30 09:49:16 -07:00
Sam Gateau
349f782697
Merge branch 'master' of github.com:highfidelity/hifi into black
2018-08-29 16:07:50 -07:00
Zach Fox
67e57a9487
Merge pull request #13849 from zfox23/MS16003_backCloses
...
Fix MS16003: In PAL/GoTo WebView, 'BACK' closes app when you can't go back
2018-08-29 14:29:12 -07:00
SamGondelman
0c8a4cc81e
merge with master
2018-08-28 17:31:51 -07:00
Thijs Wenker
c4d43b3fbc
CR fixes
2018-08-28 19:43:59 +02:00
Thijs Wenker
c05fe7f0b7
Merge branch 'master' of github.com:highfidelity/hifi into fix/interactiveWindows/onlyOnTopWhileMainWindowActive
2018-08-28 00:00:44 +02:00
Thijs Wenker
efa3fa7907
Don't always on top InteractiveWindows (Windows OS)
2018-08-27 20:42:06 +02:00
Sam Gateau
8f8bcc1901
Merge branch 'master' of github.com:highfidelity/hifi into black
2018-08-24 15:23:37 -07:00
John Conklin II
477fba4b15
Merge pull request #13847 from AndrewMeadows/workload-avatars-002
...
workload tracks other avatars and adds/removes from physics simulation accordingly
2018-08-24 12:43:51 -07:00
SamGondelman
3d048c77ba
Merge remote-tracking branch 'upstream/master' into recurse
2018-08-24 11:39:05 -07:00
Sam Gateau
699240027e
Merge branch 'master' of https://github.com/highfidelity/hifi into black
2018-08-23 19:29:14 -07:00
SamGondelman
b5b7167644
add to stats
2018-08-23 17:56:24 -07:00
Andrew Meadows
10d0833c19
use DynamicsWorld::numCollisionObjects instead of our own count
2018-08-23 15:57:54 -07:00
Zach Fox
dddb2141f0
Implement Wallet Security feature - Auto Logout checkbox
2018-08-23 15:45:29 -07:00
Zach Fox
a1d88a8588
Merge howard/wallet-locker2 into my branch
2018-08-23 14:45:16 -07:00
Andrew Meadows
777b90bdc0
add 'physics body count' to debug stats
2018-08-23 12:59:28 -07:00
Sam Gateau
473f8d0ca5
Working on the LOD system
2018-08-23 11:39:47 -07:00
John Conklin II
32562511e8
Merge pull request #13782 from ElderOrb/FB17184
...
Add Support for Managing Avatar Entities to the Avatar App
2018-08-22 10:20:04 -07:00
Alexander Ivash
cfb820762d
bulk adjusting to coding guidelines
2018-08-22 00:42:01 +03:00
Zach Fox
a378435683
Fix MS16003: In PAL/GoTo WebView, 'BACK' closes app when you can't go back
2018-08-21 10:20:51 -07:00
Alexander Ivash
9f92ff5de9
fix for duplicating wearables on saving
...
note: the issue was caused by newly-introduced code converting between attachments & entities
fix removes attachments-related code because attachments are deprecated and converted into entities on the fly
2018-08-18 16:38:35 +03:00
Alexander Ivash
3bcd6f4a25
take 'relayParentJoints' into account during wearables comparison
2018-08-18 16:33:30 +03:00
Alexander Ivash
877bce23d2
explicitely specify localRotations on joint change, otherwise it will be updated by engine
2018-08-18 16:32:31 +03:00
John Conklin II
02f53c4ee5
Merge pull request #13808 from dback2/createEntitiesGrabbable
...
Use Create Entities as Grabbable option when adding asset to world
2018-08-16 09:22:23 -07:00
elderorb
ea22fdb400
Merge branch 'master' into FB17184
2018-08-16 02:08:47 +03:00
Kerry Ivan Kurian
6a34bde49c
Merge pull request #13825 from roxanneskelly/autoScroll
...
Auto scroll
2018-08-14 20:56:53 -07:00
Roxanne Skelly
50b0a458ce
Changes as requested by zfox23 - Start and stop timers on hover only if scroll is enabled.
2018-08-14 16:32:56 -07:00
Roxanne Skelly
5a8da4ce97
Fix 'hover-to-pause' functionality of AutoScroll Featured Stories list in the goto app
2018-08-14 15:28:22 -07:00
Roxanne Skelly
987d8569ae
Merge branch 'autoScrollGoTo' of https://github.com/zfox23/hifi into autoScroll
2018-08-14 15:27:22 -07:00
