Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 19:15:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
71686 commits 71 branches 56 tags 1.2 GiB
Commit graph

71686 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dante Ruiz
5c9a88868d first round of requested changes 2018-09-11 12:01:55 -07:00
Wayne Chen
0a145fbe2e Merge branch 'master' of https://github.com/highfidelity/hifi into fixGrabWebSurface-case-16192 2018-09-11 11:47:23 -07:00
Wayne Chen
d9e0352028 removing debug comments 2018-09-11 11:44:32 -07:00
sam gateau
77586933c8 Merge and fix the default _value of GLquery so it is 0, not broken 2018-09-11 11:43:14 -07:00
Wayne Chen
7aae536624 adding fix to allow web scroll 2018-09-11 11:41:24 -07:00
sam gateau
9516c42db9 Merge branch 'master' of github.com:highfidelity/hifi into black-ter 2018-09-11 11:35:27 -07:00
Wayne Chen
800df1b077 Merge branch 'loginOnLaunch' of https://github.com/wayne-chen/hifi into loginOnLaunch 2018-09-11 11:02:16 -07:00
Wayne Chen
e931b661a5
login dialog pops up in HMD again 2018-09-11 11:00:39 -07:00
Simon Walton
80b7e04bc6 Revert change to chrono<system_clock> for usecTimestampNow() 2018-09-11 10:51:36 -07:00
Wayne Chen
2a7e2af44f syntax reversion + removing poppedUp var 2018-09-11 10:36:10 -07:00
Wayne Chen
84cf40f8aa changing calculation of load percentage 2018-09-11 10:07:57 -07:00
Wayne Chen
aa62a89318 removing more logging for login dialog 2018-09-11 09:49:12 -07:00
Wayne Chen
9d7ba377ca removing logging for login dialog 2018-09-11 09:42:53 -07:00
Wayne Chen
ee516fd79f adding proper checking for saved username/login 2018-09-11 09:36:46 -07:00
Brad Hefta-Gaub
299e9d0d38
Merge pull request #13897 from ElderOrb/filter_out_hands_from_joints 
filter out left/right hands from joints list in avatarapp
 2018-09-11 09:34:48 -07:00
sam gateau
840c8c95fd cleaning the code and comments 2018-09-11 09:34:42 -07:00
Ryan Huffman
c7f6bf181b
Merge pull request #13943 from huffman/perf/create-profile-no-listjs 
Improvements to entity list loading times
 2018-09-11 09:33:28 -07:00
Brad Hefta-Gaub
ab1718747b
Merge pull request #13970 from jherico/fix/fb18149 
Ensure a web overlay doesn't access an invalid tabletScriptingInterface
 2018-09-11 09:31:33 -07:00
Wayne Chen
6bcf6eaae7 Merge branch 'master' of https://github.com/highfidelity/hifi into loginOnLaunch 2018-09-11 09:13:41 -07:00
Wayne Chen
565bf7f6bd adding correct implementation of show password 2018-09-11 09:08:35 -07:00
sam gateau
5895ef218d Merge branch 'master' of github.com:highfidelity/hifi into black-ter 2018-09-11 08:26:44 -07:00
Wayne Chen
030ee13f31 removing logging from tabletlogindialog 2018-09-10 23:05:31 -07:00
Wayne Chen
69ae475787 adding user activity logging 2018-09-10 23:04:50 -07:00
Sam Gateau
5e76a0c6d7 changing the cpu timer of the batch to std::chrono instead of using gl cpu time stamp 2018-09-10 22:55:12 -07:00
Wayne Chen
5ece8d8707 using different paradigm for checking login dialog popup 2018-09-10 18:32:21 -07:00
Anthony Thibault
1e972595b1
Merge pull request #13962 from hyperlogic/bug-fix/recorded-blendshapes-2x 
Fix for blendshapes playing back in recordings at 2x their proper values
 2018-09-10 17:53:17 -07:00
Wayne Chen
28c3afca9d adding back inlines 2018-09-10 17:40:35 -07:00
Wayne Chen
0290ea4bdc Merge branch 'interstitalMerged' of https://github.com/wayne-chen/hifi into interstitalMerged 2018-09-10 17:40:16 -07:00
Wayne Chen
fa3097225b removing inlines - not allowed for unique_ptr 2018-09-10 17:33:32 -07:00
Wayne Chen
60a5b0eeaf
Merge pull request #1 from danteruiz/interstitalMerged 
handle unable to connect to domain case
 2018-09-10 17:23:50 -07:00
Simon Walton
9628615c44 Fix bandwidth quota calculation now we're dropping excess 2018-09-10 17:16:16 -07:00
Wayne Chen
c194c236f1 adding inlines 2018-09-10 17:10:13 -07:00
Wayne Chen
a55849d24b
Merge branch 'interstitalMerged' into interstitalMerged 2018-09-10 17:08:45 -07:00
Wayne Chen
2381d6bc02
using REDIRECT_HIFI_ADDRESS 
recycling existing, defined variable for error redirection
 2018-09-10 17:07:49 -07:00
Stephen Birarda
a50e55b83a use more efficient iterate and clear for removal 2018-09-10 17:06:57 -07:00
John Conklin II
b184ad1334
Merge pull request #13722 from wayne-chen/fixAudioStats-RC71-13955 
MS13955: Audio Stats are blank
 2018-09-10 17:03:31 -07:00
Sam Gateau
47cea49f78
Merge pull request #13922 from samcake/black-bis 
Optimize the vertex formats of meshes for less input buffer bindings
 2018-09-10 16:58:40 -07:00
Wayne Chen
e5a87aa58c removing unused variables 2018-09-10 16:56:13 -07:00
Ryan Huffman
4b8f5ea6b9 Fix syntax and duplicate event handlers in entityList.js 2018-09-10 16:44:13 -07:00
Dante Ruiz
de5a0a714b handle unable to connect to domain case 2018-09-10 16:25:17 -07:00
Wayne Chen
dcacfdba7c adding popup property to qml 2018-09-10 16:22:55 -07:00
unknown
1ad3a09984 CR changes 2018-09-10 16:09:21 -07:00
John Conklin II
ae547f8950
Merge pull request #13881 from jherico/feature/no_uniforms 
Remove all uniforms from our shaders
 2018-09-10 15:42:01 -07:00
unknown
17c3163264 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleScaleImprovements 2018-09-10 15:31:58 -07:00
Brad Davis
ba1ac7c180 Ensure a web overlay doesn't access an invalid tabletScriptingInterface 2018-09-10 15:07:15 -07:00
Wayne Chen
1aa8b7c81b Merge branch 'master' of https://github.com/highfidelity/hifi into fixGrabWebSurface-case-16192 2018-09-10 15:07:12 -07:00
Wayne Chen
e7616c7d34 added logging + activity logging 2018-09-10 15:06:14 -07:00
John Conklin II
5a1485a4f5
Merge pull request #13968 from thoys/fix/create/reloadCrash 
MS18269: Fix Reloading Scripts with Create open crashes system
 2018-09-10 15:01:43 -07:00
John Conklin II
29c80fc075
Merge pull request #13959 from thoys/bug/create/createPosNewEntities 
MS17841: CreateApp - Adjust default position of new entities
 2018-09-10 14:45:56 -07:00
Sam Gateau
082d47d20f Set the correct assert in replacment of the unecessary if branch 2018-09-10 14:31:49 -07:00