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 |
|
SamGondelman
|
0e079e78e6
|
correct transparent parabola shader
|
2018-09-10 16:20:50 -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 |
|
luiscuenca
|
9c6ee18db5
|
Merge branch 'stt_collision-group' of https://github.com/sabrina-shanman/hifi into stt_teleport_wip
|
2018-09-10 15:18:15 -07:00 |
|
sabrina-shanman
|
3b7dac9058
|
Account for collisionGroup in CollisionRegion implementation
|
2018-09-10 15:14:48 -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 |
|
luiscuenca
|
6f4e9ded09
|
Merge branch 'stt_collision-group' of https://github.com/sabrina-shanman/hifi into stt_teleport_wip
|
2018-09-10 14:42:02 -07:00 |
|
sabrina-shanman
|
9a86b7451b
|
Add collision group parameter to collision pick and set my avatar as the default
|
2018-09-10 14:35:04 -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 |
|
John Conklin II
|
558f3dc7e5
|
Merge pull request #13964 from dback2/reloadScriptQThreadCrash
Destroy script thread on finish instead of on ScriptEngine destroyed
|
2018-09-10 14:11:37 -07:00 |
|
Ryan Huffman
|
5aa5552727
|
Fix PROFILE not forwarding calls when disabled
|
2018-09-10 14:07:25 -07:00 |
|
Anthony Thibault
|
4754ff7f54
|
Merge pull request #13963 from hyperlogic/feature/improve-jump-anims
Improve animations for jump, inAir and less feminine walk cycle
|
2018-09-10 13:57:33 -07:00 |
|
John Conklin II
|
9c546fc780
|
Merge pull request #13957 from ElderOrb/FB18024
fix keyboard collapsing in VR/goto
|
2018-09-10 13:09:28 -07:00 |
|
Anthony Thibault
|
1570ae6424
|
Merge branch 'master' into bug-fix/recorded-blendshapes-2x
|
2018-09-10 12:58:53 -07:00 |
|
Ryan Huffman
|
0fadfd2f4c
|
Remove list.js in entityList.html
|
2018-09-10 12:14:07 -07:00 |
|
sam gateau
|
fed377dc4c
|
Merge branch 'master' of github.com:highfidelity/hifi into black-bis
|
2018-09-10 12:00:09 -07:00 |
|
SamGondelman
|
9a2bdda365
|
make animation properties threadsafe
|
2018-09-10 11:58:45 -07:00 |
|
Stephen Birarda
|
19a9fb00c6
|
Merge pull request #13967 from huffman/fix/jsdoc-note-for-send-fake-handshake
Add comment to Assets.sendFakeHandshake about excluding jsdoc
|
2018-09-10 11:47:30 -07:00 |
|
SamGondelman
|
3daaa0ce81
|
empty urls are invalid
|
2018-09-10 11:45:40 -07:00 |
|
Wayne Chen
|
a8adaff6c1
|
Merge branch 'loginOnLaunch' of https://github.com/wayne-chen/hifi into loginOnLaunch
|
2018-09-10 11:36:53 -07:00 |
|
Wayne Chen
|
ff86e480ba
|
adding debug statement to check for window close
|
2018-09-10 11:36:45 -07:00 |
|
Seth Alves
|
cb33222fea
|
Merge pull request #13886 from ctrlaltdavid/M17901
Improve HMD Menu page navigation
|
2018-09-10 11:34:21 -07:00 |
|
Thijs Wenker
|
2000954ad2
|
Temporary fix for reload crash MS18269
|
2018-09-10 20:13:06 +02:00 |
|
John Conklin II
|
3b0f37c6f7
|
Merge pull request #13885 from birarda/bug/recording-scripting-stuck
fix Agent teardown of recording and ScriptEngine(s)
|
2018-09-10 10:51:52 -07:00 |
|
Anthony Thibault
|
d9beadb7e4
|
remove tabs from avatar-animation.json
|
2018-09-10 10:49:43 -07:00 |
|
Simon Walton
|
d12376187c
|
Merge branch 'master' into avatar-mixer-scaling
|
2018-09-10 10:15:49 -07:00 |
|
Wayne Chen
|
e721844b10
|
Merge branch 'master' of https://github.com/highfidelity/hifi into loginOnLaunch
|
2018-09-10 10:10:16 -07:00 |
|
Sam Gondelman
|
ae8eea32d6
|
Merge pull request #13960 from SamGondelman/profileUnpacking
Add detailed profile range for avatar unpacking
|
2018-09-10 10:04:08 -07:00 |
|
SamGondelman
|
a4605289a2
|
animation on switch url
|
2018-09-10 10:03:05 -07:00 |
|
luiscuenca
|
a9f676354b
|
Only invisible pointers and scale fix
|
2018-09-10 08:54:53 -07:00 |
|