sam gateau
|
b8d96d98b8
|
fixing warnings from the build
|
2018-12-18 16:25:24 -08:00 |
|
sam gateau
|
5b50b0332d
|
more fixes
|
2018-12-18 15:30:45 -08:00 |
|
sam gateau
|
265b1591d6
|
Merge branch 'master' of github.com:highfidelity/hifi into punk
|
2018-12-18 14:43:12 -08:00 |
|
sam gateau
|
2f18555ee0
|
removing comments and dead code, rewiring the debug
|
2018-12-18 14:42:45 -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 |
|
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 |
|
sam gateau
|
d8e7305f4a
|
Removing hili for now
|
2018-12-18 09:16:40 -08:00 |
|
Sam Gateau
|
76f204b5aa
|
Exploring the hologram
|
2018-12-18 00:45:12 -08:00 |
|
Sam Gateau
|
d0d771ce1e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2018-12-17 18:48:07 -08:00 |
|
sam gateau
|
237fb4dc4c
|
Shadows are completely working with settings on both pipeline
|
2018-12-17 17:34:47 -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 |
|
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 |
|
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 |
|
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 |
|
sam gateau
|
5a6f30b458
|
Merge branch 'master' of github.com:highfidelity/hifi into punk
|
2018-12-17 08:26:24 -08:00 |
|
Sam Gateau
|
318bf20ede
|
Shadow is working correctly in both pipelines
|
2018-12-17 00:27:07 -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 |
|
sam gateau
|
a4b9ec50e9
|
one step closer
|
2018-12-14 17:00:58 -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 |
|
Sam Gateau
|
0b03012e5e
|
introducing the Shadow Stage
|
2018-12-14 06:55:34 -08:00 |
|
Sam Gateau
|
e07bc208f3
|
introducing the Shadow Stage
|
2018-12-14 00:58:07 -08:00 |
|
Sam Gateau
|
30277213c6
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2018-12-13 20:40:50 -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 |
|
sam gateau
|
8bfca612e3
|
Separating the state view dependant from the shadow to be able to have several versions in flight
|
2018-12-13 17:56:14 -08: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 |
|
sabrina-shanman
|
c41174a823
|
Re-name baker::ImportContext to baker::BakeContext
|
2018-12-13 10:33:03 -08:00 |
|