David Rowe
|
a1c49bd2b6
|
Hide mini tablet if lasering or grabbing something else
|
2018-09-12 11:18:26 +12:00 |
|
David Rowe
|
de95ee0a18
|
Merge branch 'master' into M17428-f
|
2018-09-12 09:49:29 +12: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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Ryan Huffman
|
4b8f5ea6b9
|
Fix syntax and duplicate event handlers in entityList.js
|
2018-09-10 16:44:13 -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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
David Rowe
|
1faef9db8c
|
Fix tablet ending upside down if it expands into other grabbing hand
|
2018-09-09 12:07:33 +12:00 |
|
David Rowe
|
baf1e80445
|
Code tidying
|
2018-09-09 11:37:05 +12:00 |
|
David Rowe
|
5fd3f563d6
|
Move mini tablet down in the palm a little.
|
2018-09-09 10:55:05 +12:00 |
|
Sam Gateau
|
983badf80a
|
Merge pull request #13663 from SamGondelman/lod
Enable LOD manager on android
|
2018-09-08 13:43:36 -07:00 |
|
David Rowe
|
66f75e856e
|
Fix goto and expand displaying as hovered when redisplay mini tablet
|
2018-09-08 16:41:36 +12:00 |
|
David Rowe
|
5fcb69c724
|
Remove extraneous CSS
|
2018-09-08 16:13:36 +12:00 |
|
David Back
|
3601ade8ba
|
destroy thread from thread finished not scriptEngine destroyed
|
2018-09-07 18:36:36 -07:00 |
|
David Rowe
|
7dba2e6a2e
|
Merge branch 'master' into M17428-f
|
2018-09-08 12:45:11 +12:00 |
|
David Rowe
|
8eeed772eb
|
Update button layout
|
2018-09-08 12:40:36 +12:00 |
|
Anthony Thibault
|
ff645be78b
|
Update animations for jump, inAir and less feminine walk cycle
|
2018-09-07 17:09:55 -07:00 |
|
David Rowe
|
c0a153482a
|
Update mini tablet model
|
2018-09-08 11:55:47 +12:00 |
|
Sam Gateau
|
5140999445
|
Forcing all the meshes with 3 buffers aka the blendshape layout
|
2018-09-07 15:57:04 -07:00 |
|
John Conklin II
|
bafdd06c91
|
Merge pull request #13934 from SimonWalton-HiFi/assigned-port-check
Check that a requested listening port is able to be used
|
2018-09-07 15:48:12 -07:00 |
|
John Conklin II
|
01cace694f
|
Merge pull request #13916 from birarda/bug/ignore-freeze-master
send ignoring avatar removal to ignored avatar
|
2018-09-07 15:40:32 -07:00 |
|
sam gateau
|
e8cfac2ab1
|
Merge branch 'black-bis' of github.com:samcake/hifi into black-bis
|
2018-09-07 15:35:27 -07:00 |
|
sam gateau
|
9350d6f36e
|
removing performance counters
|
2018-09-07 15:35:10 -07:00 |
|
Stephen Birarda
|
be57789ad8
|
Merge pull request #13931 from SimonWalton-HiFi/safe-landing-cleanup
Remove some debug logging left in the safe landing module
|
2018-09-07 14:58:00 -07:00 |
|
John Conklin II
|
472675f9a8
|
Merge pull request #13956 from hyperlogic/feature/improve-anim-stats
Move animation stats into its own Menu
|
2018-09-07 14:51:46 -07:00 |
|