Dante Ruiz
37c51a7246
Merge branch 'menu-updates' of github.com:vladest/hifi into menu-updates
2018-05-16 10:41:40 -07:00
Dante Ruiz
e676348c4f
fixing some menu reog bugs
2018-05-16 10:40:28 -07:00
vladest
72838f6d34
Implemented radio button preferences. Reimplemented snap smooth turn to radio buttons
2018-05-16 17:06:31 +02:00
vladest
5127cb0ea6
Merge branch 'master' into menu-updates
2018-05-16 14:37:00 +02:00
vladest
a9930d53a9
Reorder VR menu
2018-05-16 14:25:58 +02:00
John Conklin II
aca261af3e
Merge pull request #12939 from Cristo86/android_places_goto
...
Android Search & Go To
2018-05-15 16:43:38 -07:00
John Conklin II
1313d28b9d
Merge pull request #13112 from sethalves/fix-overlay-asan-warning
...
Fix overlay asan warning
2018-05-15 14:51:05 -07:00
John Conklin II
a6cda2166a
Merge pull request #13158 from highfidelity/stable
...
RC67.1 stable mergeback to master
2018-05-15 14:01:06 -07:00
John Conklin II
ce1231910c
Merge pull request #13140 from Cristo86/android_avatar_name
...
@SamGondelman We just do a quick 5-10 minute Windows check, just to make sure Windows/Mac weren't broken by the change.
2018-05-15 13:22:15 -07:00
vladest
7ea6181520
Merge branch 'master' into menu-updates
2018-05-15 21:54:45 +02:00
vladest
dd05afa974
Remove double setting
2018-05-15 21:43:43 +02:00
Vladyslav Stelmakhovskyi
5ab76ab240
Merge pull request #3 from druiz17/menu-updates
...
Added back some menus
2018-05-15 21:14:30 +02:00
Gabriel Calero
b80597a436
Restore display plugin activation/deactivation
2018-05-15 15:51:11 -03:00
Dante Ruiz
c6ff301aac
Merge branch 'menu-updates' of github.com:vladest/hifi into menu-updates
2018-05-15 11:32:23 -07:00
Dante Ruiz
71633105de
adding back some menus
2018-05-15 11:31:58 -07:00
Gabriel Calero
306b8cc68a
Set HomeActivity transparent to avoid texture corruption (black and white)
2018-05-15 15:14:17 -03:00
vladest
e2a8ee2a4c
Fixed About date format. Increased space between logo and build info
2018-05-15 20:02:29 +02:00
Dante Ruiz
931c8f5abe
Merge pull request #13110 from ctrlaltdavid/21866
...
Don't unnecessarily scroll HTML content when keyboard is raised
2018-05-15 11:00:38 -07:00
Seth Alves
79b5882c73
quiet compiler when building with clang on Linux
2018-05-15 11:00:08 -07:00
Seth Alves
78a8e8e500
quiet asan warning
2018-05-15 11:00:08 -07:00
Seth Alves
24404afe26
Merge pull request #13115 from sethalves/fix-autoAdjustLOD-asan
...
fix divide-by-zero asan warning in LODManager::autoAdjustLOD
2018-05-15 10:58:00 -07:00
Seth Alves
6da59d15e5
Merge pull request #13167 from dback2/lowercaseUnequip
...
Desktop equip: fix unequipping with capital U
2018-05-15 10:55:19 -07:00
John Conklin II
574a52fdbe
Merge pull request #13154 from NissimHadar/perfTest_1
...
Added method to test namespace to save JSON object to a file.
2018-05-15 10:30:34 -07:00
John Conklin II
e9cb46a2a5
Merge pull request #13169 from hyperlogic/bug-fix/remove-unused-menu-item
...
OpenVR: Remove reference to HMD Standing Mode menu item
2018-05-15 10:30:00 -07:00
John Conklin II
a76be78386
Merge pull request #13163 from sethalves/fix-near-grab-to-hips
...
fix near-grab attaching entity to hips
2018-05-15 10:28:36 -07:00
Howard Stearns
39ccfc86ef
Merge pull request #13168 from zfox23/MS_15090
...
MS15090: Fix gifting when running marketplaces.js separately
2018-05-15 10:12:29 -07:00
vladest
a6ef459723
Open browser within Interface
2018-05-15 16:07:32 +02:00
vladest
fee3cc0aca
Implemented backend for About dialog
2018-05-15 15:49:20 +02:00
vladest
58f04121b7
Correct link colors
2018-05-15 06:22:10 +02:00
Vladyslav Stelmakhovskyi
3f0688db41
Merge pull request #2 from druiz17/menu-updates
...
fixinig the controller settings page and have edit > entities on by default
2018-05-15 06:16:59 +02:00
Dante Ruiz
82422edb59
fixinig the controller settings page and have menu option on by default
2018-05-14 18:51:39 -07:00
NissimHadar
d4d2f3c957
Moved ownership of test location into the Test Scripting class.
2018-05-14 16:32:04 -07:00
NissimHadar
8e3844a235
Merge branch 'master' of github.com:highfidelity/hifi into perfTest_1
2018-05-14 16:23:36 -07:00
Zach Fox
e15a800639
Merge pull request #13166 from zfox23/showInvalidItemsInPurchases
...
Show invalidated items in My Purchases
2018-05-14 15:42:29 -07:00
Howard Stearns
d7121265d0
Merge pull request #13150 from howard-stearns/fix-lastEdited-vs-pal
...
fix lastEdited vs pal
2018-05-14 15:12:07 -07:00
vladest
2a3004079e
About UI
2018-05-14 23:22:06 +02:00
Anthony J. Thibault
ed726c9d77
OpenVR: Remove reference to HMD Standing Mode menu item
...
This menu item has not existed for over a year.
I was sometimes seeing a crash on startup when the display plugin
attempted to reference this menu item.
2018-05-14 13:51:13 -07:00
John Conklin II
c57b0a957d
Merge pull request #13138 from AndrewMeadows/avoid-div-by-zero
...
avoid div by zero when measuring RigidBody effective acceleration
2018-05-14 13:41:08 -07:00
Zach Fox
83cae54601
Show 'invalidated' label for valid = false
2018-05-14 13:34:20 -07:00
Zach Fox
fbec285923
Merge branch 'master' of github.com:highfidelity/hifi into showInvalidItemsInPurchases
2018-05-14 13:17:46 -07:00
Zach Fox
a881d07e59
MS15090: Fix gifting when running marketplaces.js separately
2018-05-14 13:12:58 -07:00
Sam Gateau
aa75af5ca4
Merge pull request #12814 from Zvork/shadow
...
Shadow bug fix : incorrect shadow map far plane when casting shadow on non-'shadow casters'
2018-05-14 13:00:15 -07:00
David Back
ac78e14585
fix unequipping with capital U
2018-05-14 11:44:25 -07:00
Cristian Luis Duarte
e7abf3c7be
Android - Display Names - Use my avatar uuid directly when finding ray intersection
2018-05-14 15:26:57 -03:00
NissimHadar
b5096758fb
Merge branch 'master' of github.com:highfidelity/hifi into perfTest_1
2018-05-14 10:44:57 -07:00
Cristian Luis Duarte
97a493d113
Android - Delay workaround to avoid joystick/controls issues
2018-05-14 14:41:31 -03:00
Sam Gateau
d57ddbd3bf
Merge pull request #13139 from NissimHadar/missingImagesMDfiles
...
Autotester: Now remembers the previous folder.
2018-05-14 10:40:00 -07:00
NissimHadar
5f219e27f7
Merge branch 'master' of github.com:highfidelity/hifi into perfTest_1
2018-05-14 10:35:48 -07:00
Zach Fox
2a1c2ba7b1
PurchasedItem logic
2018-05-14 09:54:05 -07:00
Zach Fox
81ebb681bb
Show invalidated items in My Purchases
2018-05-14 09:35:34 -07:00
