Brad Davis
|
2687c024eb
|
Fix light color / serialization
|
2018-10-19 14:47:02 -07:00 |
|
Anthony Thibault
|
6cc7c861d1
|
Merge pull request #14221 from hyperlogic/feature/disable-hands-if-too-far-or-at-rest
Disable user hand controllers if they are too far away or not moving.
|
2018-10-19 14:02:32 -07:00 |
|
luiscuenca
|
31d099907a
|
Fix warnings
|
2018-10-19 14:00:52 -07:00 |
|
Anthony Thibault
|
ef74014075
|
Small avatars now have a minimum jump height of 0.25 meters
This should improve the quality of the jump animation and improve the mobility of small avatars.
|
2018-10-19 13:55:56 -07:00 |
|
Sam Gateau
|
388b31acf7
|
Merge pull request #14169 from SamGondelman/highlight
Fix highlight not working after HMD switch
|
2018-10-19 11:58:25 -07:00 |
|
John Conklin II
|
9c841db9fb
|
Merge pull request #14184 from SamGondelman/blendshape
Move blendshape buffers to render thread
|
2018-10-19 11:55:44 -07:00 |
|
Brad Hefta-Gaub
|
7d69951a83
|
Merge pull request #14241 from gcalero/gradle_memory_properties
Setup a higher memory limit for android build
|
2018-10-19 11:19:05 -07:00 |
|
Brad Hefta-Gaub
|
b281c090e3
|
Merge pull request #14012 from alexiamandeville/controlImageUpdate
Adding handshake control to image in Controls Reference
|
2018-10-19 11:15:11 -07:00 |
|
John Conklin II
|
9750cc2416
|
Merge pull request #14173 from sethalves/fix-linux-build
fix build on clang 7
|
2018-10-19 11:13:43 -07:00 |
|
John Conklin II
|
81fbb5a332
|
Merge pull request #14140 from AndrewMeadows/dps-setPos-vs-grab
Make EntityScriptingInterface aware of distributed physics simulation (DPS) rules
|
2018-10-19 10:33:14 -07:00 |
|
Roxanne Skelly
|
955f27fee5
|
Merge branch 'master' of https://github.com/highfidelity/hifi into sysTrayIcons
|
2018-10-19 09:40:10 -07:00 |
|
amantley
|
0837f790eb
|
combo box changes
|
2018-10-19 07:46:16 -07:00 |
|
Flame Soulis
|
1a883b5a32
|
Added HifiAbout (used in interstitialPage.js)
|
2018-10-19 09:04:22 -04:00 |
|
Flame Soulis
|
5db7c7821e
|
Proper formatting (aka no spaces after anonymous funcs)
|
2018-10-19 08:51:13 -04:00 |
|
Flame Soulis
|
ba459eda9e
|
Removed duplicate backgroundAlpha
|
2018-10-19 08:41:04 -04:00 |
|
Flame Soulis
|
fcde53fc65
|
Include black-sphere.fbx and update linked url
|
2018-10-19 08:22:43 -04:00 |
|
Flame Soulis
|
014c1590dd
|
Made MP3 constistant 128kbps and fixed path resolving
|
2018-10-19 08:16:14 -04:00 |
|
Flame Soulis
|
e499309c8e
|
Upload interstitial page sound and update link
|
2018-10-19 06:49:48 -04:00 |
|
Flame Soulis
|
3307ee7ef7
|
Merge pull request #2 from highfidelity/master
10/19/2018 - Update Merge
|
2018-10-19 05:09:23 -04:00 |
|
NissimHadar
|
9c16e4ee32
|
Merge branch 'master' of https://github.com/highfidelity/hifi into addDailyTests
|
2018-10-18 20:08:06 -07:00 |
|
John Conklin II
|
4dec304d66
|
Merge pull request #14162 from luiscuenca/cleanElbowPoleVectorSmooth
Clean up elbow smoothing code
|
2018-10-18 19:16:32 -07:00 |
|
John Conklin II
|
7c4733a31d
|
Merge pull request #14053 from ElderOrb/FB17835
make extracted from resources avatarbookmarks.json writable
|
2018-10-18 18:29:02 -07:00 |
|
John Conklin II
|
37dce01dcb
|
Merge pull request #14099 from humbletim/fb18305-grabbable-menu-fix
More reliable "Create Entities as Grabbable" settings persistence.
|
2018-10-18 18:26:48 -07:00 |
|
John Conklin II
|
3210a4ec39
|
Merge pull request #14109 from zfox23/purchasesNoSnap
Fix MS18154: Don't snap to cards in My Purchases
|
2018-10-18 18:24:23 -07:00 |
|
John Conklin II
|
bbccd0ff73
|
Merge pull request #14120 from zfox23/MS18609_snapShareBugs
Fix MS18609: Various Snapshot sharing bugs
|
2018-10-18 18:21:23 -07:00 |
|
amantley
|
e7d466ded4
|
Merge remote-tracking branch 'origin/squattyPottyFix' into squattyPottyFix
|
2018-10-18 18:00:44 -07:00 |
|
John Conklin II
|
9ccdf74235
|
Merge pull request #14179 from roxanneskelly/sysTraySubmenus
Sys tray submenus
|
2018-10-18 17:56:48 -07:00 |
|
John Conklin II
|
86cc612d73
|
Merge pull request #14185 from howard-stearns/keyboard-vs-submit
make room for keyboard and help in SendAsset
|
2018-10-18 17:53:52 -07:00 |
|
luiscuenca
|
bb5c042f16
|
Blend network animation
|
2018-10-18 17:51:20 -07:00 |
|
John Conklin II
|
b2e84a8f3b
|
Merge pull request #14191 from howard-stearns/new-rez-images
new images for My Purchases rez tutorial
|
2018-10-18 17:50:30 -07:00 |
|
John Conklin II
|
5095a4e0eb
|
Merge pull request #14196 from sethalves/interstitial-domain-full
go to error-room when failing to connect to a full domain
|
2018-10-18 17:49:35 -07:00 |
|
John Conklin II
|
18df79a8a6
|
Merge pull request #14211 from amantley/crazylegs
Bug Fix for Crazy Legs when you sit on the floor (Manuscript 17045).
|
2018-10-18 17:48:26 -07:00 |
|
John Conklin II
|
addae51976
|
Merge pull request #14215 from ctrlaltdavid/M19308
Hide mini tablet immediately upon near grabbing an entity
|
2018-10-18 17:47:17 -07:00 |
|
Anthony Thibault
|
51d767ac2b
|
Reasonable defaults for position and rotation filtering for vive tracked joints.
|
2018-10-18 17:46:32 -07:00 |
|
Ryan Huffman
|
a4adf2c716
|
Fix name of Particles to ParticleEffect for default properties in edit.js
|
2018-10-18 17:39:24 -07:00 |
|
John Conklin II
|
3916b8e9d2
|
Merge pull request #14224 from roxanneskelly/Case19395Master
Fix for Case 19395
|
2018-10-18 17:24:40 -07:00 |
|
Anthony Thibault
|
3e68a1d5a5
|
Merge branch 'master' into feature/acceleration-limit-filter
|
2018-10-18 16:51:57 -07:00 |
|
NissimHadar
|
702e09b4bc
|
Added no login option.
|
2018-10-18 16:43:50 -07:00 |
|
NissimHadar
|
fb0a7274bf
|
Initially disable Installer URL
|
2018-10-18 16:41:48 -07:00 |
|
amantley
|
b9a2f19d30
|
made all the suggested corrections except the dropdown qml.
|
2018-10-18 16:39:50 -07:00 |
|
Kerry Ivan Kurian
|
d7d49ed84e
|
Remove cruft
|
2018-10-18 16:25:26 -07:00 |
|
Kerry Ivan Kurian
|
4d7bc3094a
|
Fix regression
|
2018-10-18 16:14:53 -07:00 |
|
John Conklin II
|
1f06c87580
|
Merge pull request #14096 from Zvork/mipgen
Added generateTextureMipsWithPipeline function in gpu::Batch
|
2018-10-18 16:06:28 -07:00 |
|
John Conklin II
|
40a48777dc
|
Merge pull request #14231 from ctrlaltdavid/M16205a
Fix lasers going through tablet to drawInFrontOverlays
|
2018-10-18 15:36:29 -07:00 |
|
John Conklin II
|
0e6f4f3a60
|
Merge pull request #14142 from ctrlaltdavid/M16440
Fix audio overlay not working while in edit apps
|
2018-10-18 15:32:41 -07:00 |
|
Zach Fox
|
9f91238945
|
UX/UI improvements
|
2018-10-18 15:27:16 -07:00 |
|
David Back
|
45a92fd537
|
style tweaks
|
2018-10-18 15:12:38 -07:00 |
|
David Back
|
11add70ef2
|
style tweaks
|
2018-10-18 14:58:51 -07:00 |
|
Simon Walton
|
0b2ee35907
|
Merge branch 'master' into avatar-mixer-improvements
|
2018-10-18 14:13:39 -07:00 |
|
Gabriel Calero
|
a9b9f48335
|
Setup a higher memory limit for android build
|
2018-10-18 17:20:30 -03:00 |
|