John Conklin II
4ce4afe0b1
Merge pull request #13180 from Cristo86/android_no_joystick_fix
...
Fix Joystick/Control not showing up in Samsung after typing address (Android)
2018-05-16 15:41:24 -07:00
Zach Fox
ec29948b15
Merge pull request #13181 from zfox23/MS15103_snapFolderCrash
...
Fix MS15103: Interface crashes on snap if snap dir is deleted
2018-05-16 15:16:58 -07:00
Zach Fox
486f33b4bd
Merge branch 'master' of github.com:highfidelity/hifi into MS15103_snapFolderCrash
2018-05-16 14:14:35 -07:00
Zach Fox
585957409d
Merge pull request #13141 from zfox23/spectatorCameraImprovements
...
Spectator Camera V2
2018-05-16 13:38:07 -07:00
John Conklin II
8d437892cb
Merge pull request #13175 from luiscuenca/fixAvatarDisappearing
...
Fix hips position when flying
2018-05-16 12:37:07 -07:00
Zach Fox
f8215b5999
Fix final? crash
2018-05-16 11:05:21 -07:00
Zach Fox
c3ea176b58
Give me my reticle back!
2018-05-16 10:54:58 -07:00
luiscuenca
7b48dc2370
normalize vector
2018-05-16 10:17:38 -07:00
Zach Fox
c34605f686
GIF snapshots using the Snap app are still weird, but the bug is fixed
2018-05-16 10:15:51 -07:00
Zach Fox
012ae741a5
Fix MS15103: Interface crashes on snap if snap dir is deleted
2018-05-16 09:52:19 -07:00
Sam Gateau
523d57d948
Merge pull request #13162 from AndrewMeadows/avatar-collisions
...
avatars collide again
2018-05-16 09:25:05 -07:00
Cristian Luis Duarte
b5e8adfc39
Use availableSize() to get screen size instead of size() as it returns a wrong screen size on some Samsung devices (misplacing controls that are relative to screen size)
2018-05-16 12:53:39 -03: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
Zach Fox
d904bcd1cd
UX improvements
2018-05-15 14:39:07 -07:00
luiscuenca
4b09f1dc30
Fix vector transformation when calculating flying hip position
2018-05-15 14:19:17 -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
Andrew Meadows
c5773cbe84
restore 'virtual' keyword for overrides
2018-05-15 13:59:22 -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
Zach Fox
9632498422
Bugfixes and Settings button
2018-05-15 13:16:42 -07:00
Gabriel Calero
b80597a436
Restore display plugin activation/deactivation
2018-05-15 15:51:11 -03:00
Zach Fox
bccaa2dbe5
Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements
2018-05-15 11:50:38 -07:00
Gabriel Calero
306b8cc68a
Set HomeActivity transparent to avoid texture corruption (black and white)
2018-05-15 15:14:17 -03: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
Zach Fox
906678123c
Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements
2018-05-15 09:43:43 -07:00
Zach Fox
a54ce96ac2
Clement's CR
2018-05-14 17:46:58 -07:00
Zach Fox
e607c68bea
Thanks Mukul!
2018-05-14 16:48:40 -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
Zach Fox
0c76659324
Starting changes per Mukul!
2018-05-14 15:28:53 -07:00
Zach Fox
43254e2981
Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements
2018-05-14 15:12:44 -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
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
