Commit graph

59840 commits

Author SHA1 Message Date
Zach Fox
c70ee6055f Don't clear cert ID if static properties change; updates to DDV 2017-10-06 17:12:40 -07:00
Zach Fox
59a6726af6 Checkpoint; lotsa changes... 2017-10-06 16:55:05 -07:00
Zach Fox
1fa9bd8fc6 Better implementation of location change and bugfixes 2017-10-06 12:22:29 -07:00
Zach Fox
e5e6d84e07 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests 2017-10-06 09:47:21 -07:00
Zach Fox
051b63503c Merge pull request #11534 from zfox23/commerce_daveIntegration1
Commerce backend changes sync, October 5 2017
2017-10-06 09:45:45 -07:00
Ryan Huffman
9c06afc4c8 Merge pull request #11326 from cain-kilgore/21537
WL 21537 - Improve log naming
2017-10-06 08:51:42 -07:00
Zach Fox
525e0d8f61 Make SettingsScriptingInterface accessible to tablet 2017-10-05 16:51:13 -07:00
Seth Alves
76d5d13914 Merge pull request #11535 from druiz17/mouse-disapears
Fix mouse disappearing when switching to desktop mode from HMD
2017-10-05 16:03:20 -07:00
Chris Collins
c8301890e6 Merge pull request #11530 from kencooke/audio-mac-bugfix
Fix microphone audio on the Mac
2017-10-05 15:57:56 -07:00
druiz17
3139f5ef2a improve mouseHMD exit logic 2017-10-05 15:12:58 -07:00
druiz17
ba50fcc509 fix mouse dissapearing in desktop mode 2017-10-05 15:07:49 -07:00
Zach Fox
0b600a74c3 Fix passphrase input focus problem; fix getting inventory and balance after logging in on Checkout 2017-10-05 14:34:53 -07:00
Andrew Meadows
a3bafa3c44 Merge pull request #11506 from SamGondelman/sharks
Fix and improve laser pointer locking
2017-10-05 14:10:06 -07:00
Zach Fox
9290a51685 Fix confirmed text 2017-10-05 14:03:56 -07:00
Andrew Meadows
05f2dfbbc3 Merge pull request #11529 from vladest/fix_audiotab_name_alignment
Fix alignment of audio devices input header
2017-10-05 13:50:29 -07:00
SamGondelman
6b02cbb911 move locking inside laserpointer and raypick 2017-10-05 13:17:57 -07:00
Zach Fox
8e82095135 Number sold and limited run 2017-10-05 12:46:20 -07:00
Cain Kilgore
b3c3b2d34f Switched Time & Session ID Over 2017-10-05 19:42:31 +01:00
Zach Fox
d605bd9ef4 Preprocess inventory endpoint result 2017-10-05 11:01:15 -07:00
Brad Hefta-Gaub
faa06e78eb Merge pull request #11472 from huffman/fix/baking-tmp-files
Add removal of temporary files in FBXBaker
2017-10-05 10:06:39 -07:00
Ken Cooke
8822b1bfa4 Minor cleanup 2017-10-05 09:49:38 -07:00
Ken Cooke
82d13090f9 Better comments 2017-10-05 09:28:30 -07:00
Ken Cooke
d8341a0929 Work around compiler optimization bug 2017-10-05 09:27:07 -07:00
Ryan Huffman
f0c9badbd6 Fix misspelling in lost-connection-to-atp error 2017-10-05 09:10:46 -07:00
Ryan Huffman
a6d148475b Add removal of temporary baked files in AssetServer 2017-10-05 09:08:42 -07:00
Ryan Huffman
de2c1aabac Add removal of temporary files in FBXBaker 2017-10-05 09:08:42 -07:00
Brad Hefta-Gaub
218d58df81 Merge pull request #11528 from Atlante45/fix/macos-build-guide
Update macOS build guide
2017-10-05 08:32:16 -07:00
Ken Cooke
218de29356 disable compiler optimization as temporary fix 2017-10-05 07:39:21 -07:00
vladest
193dc83b99 Fix alignment of audio devices input header 2017-10-05 13:59:42 +02:00
Sam Gateau
25dae2f24e Merge pull request #11499 from samcake/blue
Moving Camera update and render frame to Game Loop (Main thread)
2017-10-04 18:42:02 -07:00
Sam Gateau
02bcbe6d5f Merge pull request #11512 from AndrewMeadows/more-profile-details
expose performance hot spot in stats details
2017-10-04 18:34:19 -07:00
Clément Brisset
c43deabe88 Merge pull request #11502 from misslivirose/fix/demo-ac
Updating placeholder.js to use a url that points to example scripts
2017-10-04 17:33:53 -07:00
Zach Fox
27d6cc2657 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests 2017-10-04 15:49:33 -07:00
Zach Fox
9d51d40af4 Merge pull request #11489 from vladest/login_dialog_rework
Login dialog rework
2017-10-04 15:47:44 -07:00
Zach Fox
4cfb860e23 Wow, this actually seems to be working 2017-10-04 15:45:12 -07:00
Atlante45
f8aa3d72de Update macOS build guide 2017-10-04 15:21:52 -07:00
Zach Fox
f974672e7b Working way better than I expected 2017-10-04 15:19:06 -07:00
Clément Brisset
74fd69ac2d Merge pull request #11523 from Atlante45/new-master
RC56 into Master
2017-10-04 15:17:52 -07:00
Zach Fox
b35eaf2cc8 Throw a bunch of code at the wall and hope some sticks 2017-10-04 15:06:55 -07:00
Clément Brisset
8dd00e80ac Merge pull request #11334 from NickShaffner/patch-1
brew tap homebrew/versions no longer works. (or is needed)
2017-10-04 14:41:45 -07:00
Zach Fox
f7ea50ef3b Free memory 2017-10-04 14:02:28 -07:00
samcake
d773b40a63 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-10-04 13:25:14 -07:00
Zach Fox
cf7c1934f8 Progress? 2017-10-04 13:16:33 -07:00
Zach Fox
ab08dc6bd6 Progress? 2017-10-04 12:33:58 -07:00
Andrew Meadows
e3ea013d5f Merge pull request #11518 from SamGondelman/avatarRay
Fix calling AvatarManager.findRayIntersection() from script
2017-10-04 12:04:30 -07:00
Zach Fox
0f9df93097 Merge pull request #11524 from zfox23/commerce_fixBuyingFreeItems
Fix buying free items using Commerce system
2017-10-04 11:59:40 -07:00
vladest
86e8076362 Fix puntuation mode 2017-10-04 20:30:25 +02:00
Zach Fox
1ed10ecf59 Fix passphrase crash 2017-10-04 11:05:17 -07:00
samcake
d7333d3fa3 Merging with master 2017-10-04 10:55:38 -07:00
Zach Fox
23245e2fb9 Modify context overlay filter 2017-10-04 10:39:23 -07:00