David Back
|
cb9c255acd
|
Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleCollision
|
2018-06-15 14:51:53 -07:00 |
|
John Conklin II
|
2483c45f40
|
Merge pull request #13350 from sabrina-shanman/bulletcollisionrenderonly
Remove functionality for rendering collision models directly in the Model class
|
2018-06-15 14:46:40 -07:00 |
|
Seth Alves
|
0936313699
|
Merge pull request #13376 from zfox23/MS13202_reloadScriptsCrashSave
Fix MS13202: Don't save incomplete list of scripts to Settings while reloading scripts
|
2018-06-15 12:47:36 -07:00 |
|
John Conklin II
|
a7952c7ff3
|
Merge pull request #13380 from thoys/21883_remove_limitless
Remove Limitless API
|
2018-06-15 11:08:47 -07:00 |
|
Thijs Wenker
|
05bc32b3ad
|
Merge branch 'master' of github.com:highfidelity/hifi into merge/triplelexx-21883
# Conflicts:
# interface/src/Application.cpp
# interface/src/scripting/LimitlessVoiceRecognitionScriptingInterface.cpp
|
2018-06-15 02:34:29 +02:00 |
|
Zach Fox
|
227bd1487e
|
Merge pull request #13375 from zfox23/spectatorCamera2.2
MS15916: Fix multiple issues with Spectator Camera
|
2018-06-14 16:01:35 -07:00 |
|
sabrina-shanman
|
79fd3cb181
|
Rename createVisibleRenderItemSet() to createRenderItemSet() in Model class
|
2018-06-14 15:49:40 -07:00 |
|
sabrina-shanman
|
b2ec7f78c1
|
Remove signaling and render code for collision models in RenderableModelEntityItem and EntityTreeRenderer
|
2018-06-14 15:49:40 -07:00 |
|
Zach Fox
|
ad456ee282
|
Whitespace
|
2018-06-14 15:16:03 -07:00 |
|
sabrina-shanman
|
3c4050884e
|
Remove straggler ifdef in Model class
|
2018-06-14 14:40:22 -07:00 |
|
Zach Fox
|
3c681554de
|
Fix MS13202: Don't save incomplete list of scripts to Settings while reloading scripts
|
2018-06-14 13:50:30 -07:00 |
|
John Conklin II
|
74e5c4bf60
|
Merge pull request #13230 from SimonWalton-HiFi/snoretoast
Windows install - use an app ID with toaster popups
|
2018-06-14 13:37:45 -07:00 |
|
John Conklin II
|
1b91ee555a
|
Merge pull request #13323 from kencooke/audio-mp3-decode
Support MP3 files as sound assets
|
2018-06-14 13:37:05 -07:00 |
|
John Conklin II
|
fa1dc78469
|
Merge pull request #13374 from thoys/fix/dynamic-cloneDynamic
[RC69] fix cloneDynamic
|
2018-06-14 12:58:17 -07:00 |
|
John Conklin II
|
d023d6adef
|
Merge pull request #13321 from danteruiz/tablet-imporvments
Tablet improvements
|
2018-06-14 12:38:20 -07:00 |
|
Zach Fox
|
e806348eeb
|
MS15916: Fix multiple issues with Spectator Camera
|
2018-06-14 12:20:57 -07:00 |
|
John Conklin II
|
4f561b00da
|
Merge pull request #13003 from alexiamandeville/sittingUpdates
Adding sitting and love to emote app
|
2018-06-14 11:52:47 -07:00 |
|
Anthony Thibault
|
f2d6d0ee56
|
Merge pull request #13351 from ctrlaltdavid/21891
Fix Avatar > Attachments joint and spinboxes
|
2018-06-14 11:31:04 -07:00 |
|
Anthony Thibault
|
5d06ea1c45
|
Merge pull request #13250 from MiladNazeri/gravprep-docs
Jsdoc to Grav Automation Tool
|
2018-06-14 11:26:56 -07:00 |
|
John Conklin II
|
7057e00583
|
Merge pull request #13298 from danteruiz/fix-vive-configuration-page
Controller Confguration Page fixes
|
2018-06-14 11:07:26 -07:00 |
|
John Conklin II
|
b43d5287e2
|
Merge pull request #13286 from ElderOrb/spinbox-bugs
Introduce test 'controls gallery' application for controls testing & few spinbox fixes
|
2018-06-14 10:21:17 -07:00 |
|
Thijs Wenker
|
4d3087b98c
|
fix cloneDynamic
|
2018-06-14 19:07:20 +02:00 |
|
Ken Cooke
|
15163d7125
|
CR: warnings use qCWarning() instead of qCDebug()
|
2018-06-14 09:44:58 -07:00 |
|
John Conklin II
|
d66ed07061
|
Merge pull request #12901 from kitely/fix-banning-users
Fixed banning users
|
2018-06-14 09:33:28 -07:00 |
|
SimonWalton-HiFi
|
4807f9d8eb
|
Merge branch 'master' into snoretoast
|
2018-06-14 09:31:10 -07:00 |
|
John Conklin II
|
752ee0ee9f
|
Merge pull request #13370 from Atlante45/fix/sandbox-logs
Fix Sandboxes stuck extracting
|
2018-06-14 08:26:32 -07:00 |
|
Dante Ruiz
|
dc28e8f03f
|
fixing error
|
2018-06-13 18:24:06 -07:00 |
|
Dante Ruiz
|
eb01b50e6f
|
making code review changes
|
2018-06-13 17:58:10 -07:00 |
|
Atlante45
|
3ea265f233
|
Ensure hifi roaming directory is created
|
2018-06-13 17:00:41 -07:00 |
|
Atlante45
|
3ed72569a1
|
Update fs-extra version
|
2018-06-13 16:49:34 -07:00 |
|
Clement
|
75a75ecd1a
|
Migrate old logs
|
2018-06-13 16:49:34 -07:00 |
|
Simon Walton
|
ce7a10c143
|
Add AppUserModelID to desktop shortcut for Sandbox also
|
2018-06-13 15:30:35 -07:00 |
|
Stephen Birarda
|
883c758722
|
Merge pull request #13144 from huffman/fix/remove-entity-server-backups
Remove old entity backups and OctreePersistThread refactoring
|
2018-06-13 15:25:46 -07:00 |
|
Stephen Birarda
|
4142280e2b
|
Merge pull request #12999 from birarda/bug/avatar-data-max-allowed
allow avatar data to use full segment size
|
2018-06-13 14:00:26 -07:00 |
|
sabrina-shanman
|
82fddfc31f
|
Remove unused constant in Model.cpp
|
2018-06-13 13:03:07 -07:00 |
|
Ryan Huffman
|
2b49d84a22
|
Add better error logging in Octree::writeToJSONFile
|
2018-06-13 12:57:06 -07:00 |
|
Zach Fox
|
ce0e66a7af
|
Merge pull request #13367 from zfox23/MS15858_360SnapCrash
Fix MS15858: Prevent Interface deadlock during 360 Snap capture
|
2018-06-13 12:36:24 -07:00 |
|
Ryan Huffman
|
c2f08dfdba
|
Update Octree to atomically persist data
|
2018-06-13 12:24:09 -07:00 |
|
Ryan Huffman
|
b8f987f02e
|
Merge pull request #13359 from huffman/fix/script-resources-load
Fix resources path URLs not working with Script.resolvePath
|
2018-06-13 12:19:46 -07:00 |
|
SimonWalton-HiFi
|
66cad7831e
|
Merge branch 'master' into snoretoast
|
2018-06-13 12:10:51 -07:00 |
|
Ryan Huffman
|
6b159d6124
|
Remove redundant read of octree data on startup
|
2018-06-13 11:54:20 -07:00 |
|
Clément Brisset
|
11d84e780d
|
Merge pull request #13283 from huffman/feat/uncompressed-ktx-in-texmeta
Add uncompressed KTX files to baked texture output
|
2018-06-13 11:49:41 -07:00 |
|
Zach Fox
|
e49df4a0ab
|
Fix MS15858: Prevent Interface deadlock during 360 Snap capture
|
2018-06-13 11:42:18 -07:00 |
|
Simon Walton
|
cda0c5a121
|
Fix main.js - incorrect merge by git
|
2018-06-13 11:33:19 -07:00 |
|
John Conklin II
|
27f81c891b
|
Merge pull request #13360 from gcalero/android_version_code
Set android versionCode and versionName through gradle parameter RELE…
|
2018-06-13 11:26:00 -07:00 |
|
Ryan Huffman
|
4e230c9e5d
|
Remove redundant setvbuf and update signal/slot syntax in OctreeServer
|
2018-06-13 11:23:37 -07:00 |
|
Simon Walton
|
01ef636411
|
Merge branch 'master' into snoretoast
Two simple conflicts fixed.
|
2018-06-13 11:19:56 -07:00 |
|
John Conklin II
|
99b5835098
|
Merge pull request #13344 from birarda/feat/new-version-numbers
handle semantic version numbers in interface/sandbox update
|
2018-06-13 11:16:56 -07:00 |
|
Stephen Birarda
|
765850eee1
|
Merge pull request #13365 from huffman/fix/bake-texture-crash
Fix crash in image baking due to undefined mip format
|
2018-06-13 10:44:07 -07:00 |
|
Dante Ruiz
|
60e46481b2
|
emissive maps
|
2018-06-13 10:41:02 -07:00 |
|