Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-14 01:06:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
74802 commits 22 branches 28 tags 1.2 GiB
Commit graph

74802 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
sabrina-shanman
f25810104e Remove remaining references to VaryingSet1 in hfm model parts/building 
tasks
 2018-12-14 11:18:44 -08: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
e7b0b345e9 Merge branch 'hfm_prep' into hfm_prep_graphics (VaryingSet1 removed) 2018-12-14 10:47:54 -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
sabrina-shanman
77a7eb9e04 Remove unused debug variable in BuildGraphicsMeshTask::run 2018-12-13 13:38:04 -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
332a195fa3 Fix cross-platform linker errors in model-baker 2018-12-13 13:06:12 -08:00
sabrina-shanman
7c0f921eed Add shaders to assignment-client makefile to fix linker error 2018-12-13 11:16:03 -08:00
sabrina-shanman
e8a2622ed6 Move graphics prep to baker and add related tasks for splitting 
up the model
 2018-12-13 11:15:56 -08:00
sabrina-shanman
b021c3c46d Add model-baker logging category 2018-12-13 10:37:35 -08:00
sabrina-shanman
ec748c60cf Give more appropriate names for some model-related constants and move them into HFM.h 2018-12-13 10:37:35 -08:00
sabrina-shanman
c41174a823 Re-name baker::ImportContext to baker::BakeContext 2018-12-13 10:33:03 -08:00
Zach Fox
4e7b7346dc Fix a bug introduced in PR14566, actually fixing MS17811 2018-12-13 10:06:46 -08:00
sam gateau
94ae345daf Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-12-13 08:45:29 -08:00
Sam Gateau
7f193d0e7c WEll it sn not going to be that simple.... 2018-12-13 00:32:59 -08:00
Wayne Chen
34130778ec
fixing merge bug 2018-12-12 18:41:28 -08:00
Wayne Chen
4116f6ca9a
Merge branch 'master' into loginInitiative2 2018-12-12 18:00:07 -08:00
Jeff Clinton
5a81d8c093
Merge pull request #14453 from danteruiz/keyboard-menus 
Keyboard interaction menus
 2018-12-12 17:53:59 -08:00
Wayne Chen
a2ebb67cd5 dev feedback/fixing keyboard in profile creation 2018-12-12 17:33:22 -08:00
Wayne Chen
0a0b7bf1ad removing onUsernameChanged signal to alter login settings 2018-12-12 16:26:35 -08:00
Wayne Chen
67fe05da97 fixing spacing 2018-12-12 15:31:33 -08:00
Dante Ruiz
089a223c2d more CR changes 2018-12-12 15:29:01 -08:00
Wayne Chen
b4e2b74f3d adding text wrapping/fixing keep me logged in setting 2018-12-12 15:27:42 -08:00
Dante Ruiz
f3fad52e1d make CR changes 2018-12-12 13:29:32 -08:00
Wayne Chen
941050d42c fixing tablet apps/referenceerror 2018-12-12 12:43:01 -08:00
sam gateau
27da9b4542 Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-12-12 12:13:07 -08:00
Dante Ruiz
51bdf1bf78 adding keyboards settings 2018-12-12 11:55:13 -08:00
Clément Brisset
a9057e09e0
Merge pull request #14566 from zfox23/MS17811_ignoreFreeze 
Fix MS17811: Prevent frozen avatars in certain ignore cases
 2018-12-12 10:37:03 -08:00
Wayne Chen
941df8bc35 attempting fix on losing logged in setting 2018-12-12 10:08:50 -08:00