amantley
|
dfdc6aee7e
|
Merge branch 'master' into squattyPottyFix
|
2018-10-20 13:39:55 -07:00 |
|
Brad Hefta-Gaub
|
508e75edeb
|
Merge pull request #14178 from roxanneskelly/sysTrayIcons
Sys tray icons
|
2018-10-20 12:27:04 -07:00 |
|
Brad Hefta-Gaub
|
23ddb7dea6
|
Merge pull request #14207 from Atlante45/fix/white-spheres
Remove pending avatars data structure
|
2018-10-20 12:09:51 -07:00 |
|
Ryan Huffman
|
9d13902cd3
|
Improve paramater names in model dialog window
|
2018-10-20 11:26:12 -07:00 |
|
amantley
|
a427ddb235
|
removed extraneous print statements
|
2018-10-20 09:16:05 -07:00 |
|
Ken Cooke
|
f68a8d7379
|
Merge pull request #14037 from birarda/bug/agent-flush-encoder
fix agent audio packet send when encoder is flushed
|
2018-10-19 20:53:52 -07:00 |
|
amantley
|
55daeb11cd
|
moved the radio buttons on the avatar settings to even them out better. will be corrected I'm sure
|
2018-10-19 18:43:02 -07:00 |
|
amantley
|
070a517423
|
changed the recenterModel variables to userRecenterModel
|
2018-10-19 18:07:03 -07:00 |
|
Sam Gateau
|
6005b934ad
|
Merge pull request #13979 from AndrewMeadows/game-loop-optimizations-001
minor bug fix and optimization in ModelEntity animation
|
2018-10-19 17:02:48 -07:00 |
|
Brad Hefta-Gaub
|
e6ec32e515
|
Merge pull request #14222 from SamGondelman/material
Fix material entity opacity maps
|
2018-10-19 16:45:31 -07:00 |
|
Ryan Huffman
|
f1258e4445
|
Add a 'grabbable' option to the new-model dialog
|
2018-10-19 16:42:45 -07:00 |
|
Brad Hefta-Gaub
|
219302a9b6
|
Merge pull request #14157 from SimonWalton-HiFi/domain-checkin-limit
Cap the number of domain-server duplicate check-ins sent upon retransmission
|
2018-10-19 16:41:09 -07:00 |
|
Brad Hefta-Gaub
|
cd4e9a3e08
|
Merge pull request #13889 from alexiamandeville/controllerModelUpdates
Updating highlight textures on Rift Controller
|
2018-10-19 16:39:17 -07:00 |
|
Brad Hefta-Gaub
|
3fab542009
|
Merge pull request #14170 from Atlante45/fix/invisible-agents
Fix non-avatar agents appearing as avatars
|
2018-10-19 16:36:51 -07:00 |
|
Brad Hefta-Gaub
|
e276698f21
|
Merge pull request #14234 from r3tk0n/18518-record-unsub
18518 - Make record.js unsubscribe from messaging channel
|
2018-10-19 16:36:09 -07:00 |
|
Brad Hefta-Gaub
|
1ff69844f2
|
Merge pull request #14225 from wayne-chen/interstitialHideProgressJS-RC75
hide progress overlays if interstitial mode
|
2018-10-19 16:35:42 -07:00 |
|
Brad Davis
|
a93aa68901
|
Add additional safety checks to gl::Uniform::load
|
2018-10-19 16:20:09 -07:00 |
|
Brad Hefta-Gaub
|
881f7f0142
|
Merge pull request #14242 from jherico/fix/light_channels
Fix light color serialization
|
2018-10-19 16:17:21 -07:00 |
|
Brad Hefta-Gaub
|
c6fff83805
|
Merge pull request #14145 from ctrlaltdavid/M17223
JSDoc fixes
|
2018-10-19 16:16:19 -07:00 |
|
Wayne Chen
|
3bd10716b2
|
wip
|
2018-10-19 16:06:28 -07:00 |
|
amantley
|
a43985ef64
|
combo box for recenter model is added
|
2018-10-19 16:03:53 -07:00 |
|
David Rowe
|
71ec5f3612
|
Fix tablet highlighting when using the Create and Shapes apps
|
2018-10-20 11:57:46 +13:00 |
|
Brad Hefta-Gaub
|
acc6d3e45c
|
Merge pull request #14144 from ctrlaltdavid/M17222
Fix and fill in JSDoc for MyAvatar flying-related functions
|
2018-10-19 15:57:04 -07:00 |
|
David Rowe
|
eb179363f6
|
Merge branch 'master' into M17853
# Conflicts:
# scripts/system/controllers/controllerDispatcher.js
|
2018-10-20 11:19:26 +13:00 |
|
Anthony Thibault
|
2bc99d3894
|
CMP0074 Warning: Proper check for cmake versions 4.x and higher
|
2018-10-19 15:17:29 -07:00 |
|
Sam Gateau
|
1c8ce3da9d
|
Merge pull request #14015 from NissimHadar/addDailyTests
Add automated daily tests
|
2018-10-19 15:07:00 -07:00 |
|
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 |
|
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 |
|
Wayne Chen
|
8c7a5e98f2
|
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
|
2018-10-19 11:31:43 -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 |
|
Wayne Chen
|
e32460ed96
|
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
|
2018-10-19 09:25:57 -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 |
|