David Back
|
6c946d7ac5
|
prevent continuous clone calls
|
2018-05-16 11:36:57 -07:00 |
|
David Back
|
6484c866f3
|
Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables
|
2018-05-16 11:35:34 -07:00 |
|
Gabriel Calero
|
fe5da24483
|
Fix spaces
|
2018-05-16 15:12:42 -03: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 |
|
Liv Erickson
|
0b0040a4be
|
Merge branch 'master' of github.com:highfidelity/hifi into clone-server
|
2018-05-16 09:35:08 -07:00 |
|
Sam Gateau
|
523d57d948
|
Merge pull request #13162 from AndrewMeadows/avatar-collisions
avatars collide again
|
2018-05-16 09:25:05 -07:00 |
|
Liv Erickson
|
a1bdc12163
|
Merge branch 'cloneables' of https://github.com/dback2/hifi into clone-server
|
2018-05-16 09:18:04 -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 |
|
Gabriel Calero
|
5afc9c6df3
|
Merge remote-tracking branch 'upstream/master' into android_new_login
|
2018-05-16 12:45:17 -03:00 |
|
David Back
|
1e2d2819d5
|
tweaks
|
2018-05-15 17:36:39 -07:00 |
|
David Back
|
f8fc7bedd7
|
Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables
|
2018-05-15 17:31:43 -07:00 |
|
David Back
|
f74e219029
|
rename properties, add clone avatar entity, remove worldEntityProps arg, fix clone ID cleanup on delete
|
2018-05-15 17:24:14 -07:00 |
|
samcake
|
179801dab6
|
FIxing the transparent ambient lighting bug
|
2018-05-15 17:22:28 -07:00 |
|
Liv Erickson
|
73b6233c3c
|
Merge branch 'cloneables' of https://github.com/dback2/hifi into clone-server
|
2018-05-15 16:54:00 -07: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
|
808fb5a5d9
|
Merge pull request #13173 from Zvork/taabug
TAA fix for highlight
|
2018-05-15 15:32:20 -07:00 |
|
David Rowe
|
f571e90ef5
|
Merge branch 'master' into 21872-b
|
2018-05-16 10:20:53 +12:00 |
|
David Rowe
|
f629022b8c
|
AvatarList API JSDoc stubs
|
2018-05-16 10:16:13 +12: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 |
|
Gabriel Calero
|
4a3001be18
|
Fix clipping on the right edge of login italic text views
|
2018-05-15 18:21:37 -03:00 |
|
David Rowe
|
fdeb0e3305
|
Avatar API JSDoc stubs
|
2018-05-16 09:20:54 +12: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 |
|
Olivier Prat
|
0941e02523
|
Merge branch 'RC67.2' of http://github.com/highfidelity/hifi into taabug
|
2018-05-15 21:14:46 +02: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 |
|
David Back
|
623410a0aa
|
Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables
|
2018-05-15 09:53:24 -07:00 |
|
Zach Fox
|
906678123c
|
Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements
|
2018-05-15 09:43:43 -07:00 |
|
Olivier Prat
|
d10b5a16f2
|
Turned off jitter with FXAA
|
2018-05-15 15:09:02 +02:00 |
|
Olivier Prat
|
bed7752a1a
|
Fixed bug with highlighting and TAA
|
2018-05-15 12:27:04 +02:00 |
|
David Rowe
|
1ca6bd2f0b
|
location getter/setter JSDoc
|
2018-05-15 17:37:45 +12:00 |
|
David Rowe
|
b7a0ff523a
|
LaserPointers API JSDoc stubs
|
2018-05-15 17:36:23 +12:00 |
|