Wayne Chen
|
2267085dbf
|
removing unused counter variable
|
2018-09-11 17:46:01 -07:00 |
|
Wayne Chen
|
63ad85215b
|
Merge branch 'master' into interstitalMerged
|
2018-09-11 17:17:33 -07:00 |
|
Wayne Chen
|
8bca1bc5fe
|
reverting, oversight
|
2018-09-11 17:09:21 -07:00 |
|
Wayne Chen
|
a85a7a6119
|
adding back goToLastAddress back
|
2018-09-11 17:07:49 -07:00 |
|
Wayne Chen
|
84f95dd4b8
|
updating typo
|
2018-09-11 17:03:06 -07:00 |
|
Wayne Chen
|
d4dfaec8ea
|
updating typo
|
2018-09-11 17:02:38 -07:00 |
|
Wayne Chen
|
d478fcf027
|
remove unused signal from domain handler
|
2018-09-11 17:01:14 -07:00 |
|
Stephen Birarda
|
2c056e5b22
|
Merge pull request #13912 from birarda/bug/agent-clear-avatars
handle agent avatar clear on avatar mixer disconnect
|
2018-09-11 16:34:15 -07:00 |
|
Wayne Chen
|
490cdc901e
|
Merge pull request #3 from danteruiz/interstitalMerged
making requested changes and fixing compile issue for jenkins
|
2018-09-11 16:30:13 -07:00 |
|
Wayne Chen
|
0f25756908
|
expose domain connection error to Window
|
2018-09-11 16:29:39 -07:00 |
|
Dante Ruiz
|
c97d646083
|
making requested changes and fixing compile issue for jenkins
|
2018-09-11 15:57:44 -07:00 |
|
Sam Gateau
|
3fc47bf6fc
|
Merge pull request #13972 from samcake/black-ter
Replacing cpu timing calls from gl to std::chrono
|
2018-09-11 15:02:15 -07:00 |
|
Wayne Chen
|
07bda90519
|
Merge pull request #2 from danteruiz/interstitalMerged
Dev review requests
|
2018-09-11 14:23:54 -07:00 |
|
Dante Ruiz
|
b665dbe13e
|
finished requested changes
|
2018-09-11 14:18:12 -07:00 |
|
Seth Alves
|
3b3006efb0
|
Merge pull request #13911 from ElderOrb/FB17982_master
Avatar App: stop reloading existing selected bookmarks on app relaunch (master)
|
2018-09-11 14:04:19 -07:00 |
|
Ryan Huffman
|
530fa5aee9
|
Merge pull request #13865 from dback2/editHandleScaleImprovements
Edit handle scale improvements
|
2018-09-11 12:57:47 -07:00 |
|
Dante Ruiz
|
cc2c208b12
|
fix small issue
|
2018-09-11 12:12:31 -07:00 |
|
Dante Ruiz
|
735ff04fad
|
fixing merge conflicts
|
2018-09-11 12:10:19 -07:00 |
|
Dante Ruiz
|
5c9a88868d
|
first round of requested changes
|
2018-09-11 12:01:55 -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 |
|
sam gateau
|
9516c42db9
|
Merge branch 'master' of github.com:highfidelity/hifi into black-ter
|
2018-09-11 11:35:27 -07:00 |
|
Wayne Chen
|
84cf40f8aa
|
changing calculation of load percentage
|
2018-09-11 10:07:57 -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 |
|
sam gateau
|
5895ef218d
|
Merge branch 'master' of github.com:highfidelity/hifi into black-ter
|
2018-09-11 08:26:44 -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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Roxanne Skelly
|
c7b07c8f27
|
Merge pull request #13946 from roxanneskelly/featuredStories
For stories, use the action string for notifications instead of a hard-coded value.
|
2018-09-10 14:25:03 -07:00 |
|