Wayne Chen
|
ee516fd79f
|
adding proper checking for saved username/login
|
2018-09-11 09:36:46 -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 |
|
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 |
|
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 |
|
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
|
dcacfdba7c
|
adding popup property to qml
|
2018-09-10 16:22:55 -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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Sam Gateau
|
983badf80a
|
Merge pull request #13663 from SamGondelman/lod
Enable LOD manager on android
|
2018-09-08 13:43:36 -07:00 |
|
David Back
|
3601ade8ba
|
destroy thread from thread finished not scriptEngine destroyed
|
2018-09-07 18:36:36 -07:00 |
|
Anthony Thibault
|
ff645be78b
|
Update animations for jump, inAir and less feminine walk cycle
|
2018-09-07 17:09:55 -07: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 |
|
Sam Gondelman
|
19fe40abe7
|
Merge pull request #13958 from SamGondelman/bloom
Fix bloom on edges
|
2018-09-07 14:50:31 -07:00 |
|
Anthony Thibault
|
949efff439
|
Fix blendshapes playing back in recordings at 2x their proper values
|
2018-09-07 13:21:17 -07:00 |
|
Wayne Chen
|
695f6a8f16
|
Merging changes, modifying close button
|
2018-09-07 12:05:28 -07:00 |
|
Sam Gateau
|
81a542982b
|
Merge branch 'master' of github.com:highfidelity/hifi into black-bis
|
2018-09-07 12:02:20 -07:00 |
|
John Conklin II
|
405e2da91e
|
Merge pull request #13949 from sabrina-shanman/stt_parenting_scale
Scale Collision Pick to match parent
|
2018-09-07 11:54:02 -07:00 |
|
John Conklin II
|
e578b047b0
|
Merge pull request #13838 from danteruiz/fix-hmd-debug-window
fixing scripting window visiblity and size issues
|
2018-09-07 11:47:44 -07:00 |
|
SamGondelman
|
32e2a244a1
|
detailed profile range for avatar unpacking
|
2018-09-07 11:44:35 -07:00 |
|
John Conklin II
|
2ac0377a6e
|
Merge pull request #13952 from amantley/steppingReboot
Fix for lurching walk(case 16945), when walking in hmd.
|
2018-09-07 11:43:03 -07:00 |
|
Wayne Chen
|
39041f2942
|
fixing username field
|
2018-09-07 11:36:21 -07:00 |
|
Wayne Chen
|
44d36ec622
|
wallet should save username when checked
|
2018-09-07 11:31:36 -07:00 |
|