Alexia Mandeville
dcf2e00bd7
Adding placeholder text
2018-09-05 14:55:12 -07:00
Sam Gateau
12ec56875e
Merge pull request #13867 from SamGondelman/recurse
...
findRayIntersection/findParabolaIntersection performance improvements
2018-08-30 09:49:16 -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
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
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
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
Ryan Huffman
19f27ec911
Merge pull request #13810 from ctrlaltdavid/M11360
...
Don't auto-action entry in HMD file dialog when single-click
2018-08-14 12:57:28 -07:00
Seth Alves
832eefd3a2
Merge pull request #13752 from ctrlaltdavid/M17208
...
Improve text in Avatar app's pop-ups
2018-08-14 08:48:04 -07:00
unknown
c622a587e3
Merge branch 'master' of https://github.com/highfidelity/hifi into createEntitiesGrabbable
2018-08-11 07:59:56 -07:00
Zach Fox
57d2f04f14
Merge pull request #13799 from davidkelly/dk/17340
...
Only update gain if it really changed
2018-08-10 16:20:24 -07:00
Zach Fox
096be16bb1
Only restart timer if feedMouseArea doesn't contain mouse
2018-08-10 15:32:44 -07:00
Zach Fox
1a6a55680c
PropagateComposedEvents
2018-08-10 15:30:32 -07:00
John Conklin II
644ff1eafa
Merge pull request #13655 from amantley/animationBlendChanges
...
New Default Strafe Animations Plus Animation Tuning Support
2018-08-10 15:03:30 -07:00
Alexander Ivash
5ba68cbfac
remove attachments menu item / dialogs / related components
2018-08-11 00:50:32 +03:00
David Rowe
3a356de49f
Don't auto-action entry in HMD file dialog when single-click on it
2018-08-11 09:46:11 +12:00
Alexander Ivash
c1ebadfdd8
adjust text in 'get wearables' popup
2018-08-11 00:43:39 +03:00
unknown
5d1cc3696a
Merge branch 'master' of https://github.com/highfidelity/hifi into createEntitiesGrabbable
2018-08-10 12:10:57 -07:00
Alexander Ivash
9b9e30e829
add 'Tip: You can use hand controllers to grab and adjust your wearables' if in HMD
2018-08-10 20:14:15 +03:00
David Kelly
2b5ecd6b5f
remove extraneous log
2018-08-10 10:12:32 -07:00
Zach Fox
e39dd250cd
Things will 'just work' once backend is in place
2018-08-10 10:01:09 -07:00
Zach Fox
1699d3ed6a
Wording change in Availability
2018-08-10 09:35:40 -07:00
Alexander Ivash
3bfe173371
allow saving wearables right after adding new one
2018-08-10 19:15:35 +03:00
Alexander Ivash
9304d6c5c4
reset UI to default state & disable controls on removing last wearable
2018-08-10 18:42:08 +03:00
Alexander Ivash
90fb0d7be6
add possibility to add wearable from external url
2018-08-10 17:59:11 +03:00
Alexander Ivash
9234813e08
bring back 'get more' wearables button
2018-08-10 14:54:15 +03:00
Alexander Ivash
1771e4c742
better handling of 'modified' inside AdjustWearables dialog
2018-08-10 12:58:45 +03:00
Alexander Ivash
e900e034a3
couple Spinbox fixes:
...
- stop resetting value in 'valueFromText'. The issue with such approach is that is is not possible to understand whether value was really changed or, for example, focus did change
- instead, propagate validator to TextInput which makes not possible to type bad text (which eliminate the reason for original fix)
- specify correct inputMethodHints to guide onscreen keyboards
2018-08-10 12:58:45 +03:00
Alexander Ivash
56194bba8e
bind 'is soft' to backend API, always show 'Hips' for soften entity
2018-08-10 12:58:45 +03:00
Alexander Ivash
da68a8906e
show displayText if specified (to allow override combobox current value)
2018-08-10 12:58:45 +03:00
Alexander Ivash
550e39ac84
add possibility to change joints using combobox
2018-08-10 12:58:45 +03:00
Alexander Ivash
f8c1ba48ad
update UI accordingly to the updated mockup
2018-08-10 12:58:44 +03:00
Alexander Ivash
a85ed2a2f5
show 'edit wearables' button even if avatar doesn't have any wearables
2018-08-10 12:58:44 +03:00
David Kelly
3b7d1cb6cf
Only update gain if it really changed
...
and only fire UserActivity if we really do change the gain
2018-08-09 14:55:07 -07:00
