Jeff Clinton
|
16c7619aa7
|
Merge pull request #14608 from SamGondelman/zone
Case 19080: Fix zone with invalid script not loading
|
2018-12-19 08:49:33 -08:00 |
|
Jeff Clinton
|
16e3914cd7
|
Merge pull request #14598 from amantley/ripOutCruft
Fix for Camera-perspective-is-off-in-first-person-view, master branch
|
2018-12-18 17:15:58 -08:00 |
|
Jeff Clinton
|
f51bdead20
|
Merge pull request #14606 from wayne-chen/fixFileLoginMenuButton
MS#20355: HMD persisting extra login windows
|
2018-12-18 17:04:46 -08:00 |
|
Antonina Savinova
|
1977180ecf
|
Merge pull request #14604 from zfox23/MS20089_interruptRecording
Implement MS20089: ACs playing avatar recordings now correctly handle playAvatarSound
|
2018-12-18 15:14:53 -08:00 |
|
Zach Fox
|
f31d685323
|
Fix spacing
|
2018-12-18 14:33:41 -08:00 |
|
Antonina Savinova
|
cceacd3d1d
|
Merge pull request #14593 from SimonWalton-HiFi/remove-backups-on-startup
Remove out-of-date backups on startup
|
2018-12-18 14:16:01 -08:00 |
|
SamGondelman
|
7231116e43
|
fix zone with invalid script not loading
|
2018-12-18 13:04:56 -08:00 |
|
Wayne Chen
|
b82ba8c085
|
do nothing with file>login in login state
|
2018-12-18 12:51:01 -08:00 |
|
Jeff Clinton
|
889f110357
|
Merge pull request #13925 from sethalves/fix-polyvox-texture-and-single-setter
fix a bug that broke Entities.setVoxel(). Fix polyvox textures
|
2018-12-18 12:15:07 -08:00 |
|
Jeff Clinton
|
2ff4905ed3
|
Merge pull request #14599 from wayne-chen/keepMeLoggedInDefault-78
MS20352: Keep me logged in checkbox as on by default
|
2018-12-18 11:57:17 -08:00 |
|
Wayne Chen
|
b5c3d7c3ed
|
Merge pull request #14596 from wayne-chen/loginForSmallAvatars-master
MS20332: HMD Login Prompt-- small avatars cannot reach easily
|
2018-12-18 10:49:26 -08:00 |
|
Zach Fox
|
fce4c252e7
|
Merge branch 'master' of github.com:highfidelity/hifi into MS20089_interruptRecording
|
2018-12-18 10:31:32 -08:00 |
|
Zach Fox
|
2964a05bd3
|
Keep playing the recording visually
|
2018-12-18 10:30:20 -08:00 |
|
Wayne Chen
|
50902080ce
|
fixing typos
|
2018-12-17 16:48:02 -08:00 |
|
Wayne Chen
|
816733b55f
|
reverting to master
|
2018-12-17 16:47:11 -08:00 |
|
amantley
|
42a17980cb
|
fixed mac build conflict, unused variable
|
2018-12-17 16:21:22 -08:00 |
|
Zach Fox
|
240917e8ae
|
Fix MS20089: Enable interrupting of avatar recordings with sounds
|
2018-12-17 15:46:08 -08:00 |
|
Wayne Chen
|
302e314787
|
keep me logged in by default
|
2018-12-17 15:21:41 -08:00 |
|
Adam Smith
|
14ab53571f
|
Merge pull request #14564 from sabrina-shanman/hfm_prep
(case 20274) Create the HFM Preparation Step
|
2018-12-17 15:17:19 -08:00 |
|
amantley
|
3e1beb2dca
|
removed white space and stray semi colon
|
2018-12-17 15:05:51 -08:00 |
|
amantley
|
a81576f311
|
Merge remote-tracking branch 'upstream/master' into ripOutCruft
sync
|
2018-12-17 14:20:00 -08:00 |
|
Wayne Chen
|
09ff67eab3
|
Merge branch 'master' of https://github.com/highfidelity/hifi into loginForSmallAvatars-master
|
2018-12-17 14:03:16 -08:00 |
|
Wayne Chen
|
5d89ed2a81
|
matching master
|
2018-12-17 13:46:55 -08:00 |
|
Wayne Chen
|
28fd1380df
|
adding target scale and default avatar to login state
|
2018-12-17 13:37:28 -08:00 |
|
Howard Stearns
|
719919d3fd
|
Merge pull request #14587 from SimonWalton-HiFi/dissectors-unobfuscate
Deobfuscate packets in dissector
|
2018-12-17 12:08:56 -08:00 |
|
Simon Walton
|
9e2b3fe820
|
Remove out-of-date backups on startup as well as on rule-evaluation
|
2018-12-17 11:39:58 -08:00 |
|
amantley
|
defdc9fbcb
|
removed humanIK joint name code from fbx serializer
|
2018-12-17 10:56:53 -08:00 |
|
amantley
|
6e5c52972a
|
removed member declarations in hfm.h and debug print statements
|
2018-12-17 10:42:08 -08:00 |
|
Antonina Savinova
|
40a3f76784
|
Merge pull request #14577 from davidkelly/dk/20032
Agent needs to be sure audio is ready before trying to use it
|
2018-12-17 10:32:42 -08:00 |
|
Jeff Clinton
|
a5ae4081a5
|
Merge pull request #14588 from wayne-chen/loginInitiative2
MS20328: New login breaks nitpick
|
2018-12-17 10:14:09 -08:00 |
|
Wayne Chen
|
711457b2d7
|
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
|
2018-12-17 09:12:29 -08:00 |
|
Angus Antley
|
77fa4e7d13
|
took out the unnecessary hfm.jointindex code
|
2018-12-16 17:29:16 -08:00 |
|
Simon Walton
|
d7acb7cfc5
|
Deobfuscate packets in wireshark lua plugin
|
2018-12-14 17:14:34 -08:00 |
|
Wayne Chen
|
899918006f
|
fixing for autotester
|
2018-12-14 17:12:27 -08:00 |
|
Shannon Romano
|
78c9fb2b91
|
Merge pull request #14580 from wayne-chen/loginInitiative2
MS20319: fixing keyboard position offset
|
2018-12-15 00:51:03 +00:00 |
|
Shannon Romano
|
a89c53cc52
|
Merge pull request #14581 from zfox23/MS20308_unknownItems
Fix MS20308: Allow users to checkout uncertifiable items
|
2018-12-15 00:44:50 +00:00 |
|
Zach Fox
|
47a46c1d1b
|
Fix MS20308: Allow users to checkout uncertifiable items
|
2018-12-14 11:17:56 -08:00 |
|
Wayne Chen
|
befca68917
|
fixing keyboard position offset
|
2018-12-14 10:57:42 -08:00 |
|
sabrina-shanman
|
a36e75672e
|
Remove dependency on VaryingSet1
|
2018-12-14 10:40:28 -08:00 |
|
sabrina-shanman
|
c7022988ea
|
Revert "Add VaryingSet1 to Task aliases"
This reverts commit 25e3d49941.
|
2018-12-14 09:14:07 -08:00 |
|
Shannon Romano
|
131b53e4df
|
Merge pull request #14315 from wayne-chen/loginInitiative2
2nd initiative for encouraging login
|
2018-12-14 01:59:35 +00:00 |
|
David Kelly
|
2b21ceb17a
|
Agent needs to be sure audio is ready before trying to use it
|
2018-12-13 17:41:12 -08:00 |
|
Wayne Chen
|
e744f40d54
|
fixing url to login overlay
|
2018-12-13 16:43:12 -08:00 |
|
Wayne Chen
|
1d86f3816d
|
fixing build error
|
2018-12-13 15:43:42 -08:00 |
|
Wayne Chen
|
502de63d3f
|
fixing bug
|
2018-12-13 14:59:40 -08:00 |
|
Shannon Romano
|
3e10bea1ce
|
Merge pull request #14567 from davidkelly/dk/18639
Return more connections in pal
|
2018-12-13 22:48:00 +00:00 |
|
Wayne Chen
|
3806914e76
|
fixing variable names to match coding standard
|
2018-12-13 14:34:25 -08:00 |
|
Wayne Chen
|
0daa909192
|
more dev feedback
|
2018-12-13 14:25:52 -08:00 |
|
Wayne Chen
|
1ce7d8a31c
|
dev feedback
|
2018-12-13 13:47:07 -08:00 |
|
Zach Fox
|
3a1f834576
|
Merge pull request #14574 from zfox23/MS17811_fixFrozeNAgain
Fix a bug introduced in PR14566, actually fixing MS17811
|
2018-12-13 13:34:04 -08:00 |
|