Commit graph

1051 commits

Author SHA1 Message Date
David Back
e5792aa85f remove scene 2018-12-07 11:01:54 -08:00
David Back
46017a70d1 remove unneeded files and add unity project files to gitignore 2018-12-06 17:18:55 -08:00
David Back
1171821fc9 unity avatar exporter plugin 2018-12-06 10:22:18 -08:00
NissimHadar
8973b7caea
Merge branch 'master' into 19991-MacAppData 2018-11-29 17:45:58 -08:00
NissimHadar
87c863584d Just to remove conflict. 2018-11-29 17:43:19 -08:00
Sam Gateau
1dcddb9541
Merge pull request #14440 from NissimHadar/19942-MacInstall
19942 Mac installation procedure
2018-11-29 14:38:07 -08:00
Shannon Romano
ff934a8f87
Merge pull request #14394 from sabrina-shanman/hfm_serializer
(case 20005) Create HFMSerializer interface for model loaders
2018-11-28 11:10:27 -08:00
NissimHadar
59a030a16f Correct message to user. 2018-11-27 17:41:00 -08:00
NissimHadar
4effd365ed Change "Autotester" to "nitpick". 2018-11-27 17:34:17 -08:00
NissimHadar
4700b94f28 Merge branch 'master' of https://github.com/highfidelity/hifi into 19991-MacAppData 2018-11-26 18:11:20 -08:00
NissimHadar
aed947cb0a Minor cleanup. 2018-11-26 18:10:41 -08:00
NissimHadar
5da6ecad12 Compilation error. 2018-11-26 18:10:14 -08:00
NissimHadar
f9954990dd Merge branch '19991-MacAppData' of github.com:NissimHadar/hifi into 19991-MacAppData 2018-11-26 16:43:36 -08:00
NissimHadar
e7ab7094cd Kill Hifi processes after evaluation. 2018-11-26 16:42:48 -08:00
NissimHadar
e587820de3 Should be v1.0 2018-11-26 16:18:43 -08:00
NissimHadar
c211dc363b Updated README.md 2018-11-26 16:05:49 -08:00
NissimHadar
ebc7875f5e Updated README.md 2018-11-26 16:03:40 -08:00
NissimHadar
2ade0078f4 Updated README.md 2018-11-26 16:02:22 -08:00
NissimHadar
e943504f60 Updated README.md 2018-11-26 15:59:08 -08:00
NissimHadar
48fabf51f2 Corrected Linux compilation error. 2018-11-26 08:54:09 -08:00
NissimHadar
f4f1ac8f02 Merge branch '19991-MacAppData' of https://github.com/NissimHadar/hifi into 19991-MacAppData 2018-11-26 08:25:54 -08:00
NissimHadar
2913d4f984 Removed baaaaaad file. 2018-11-26 08:25:07 -08:00
NissimHadar
6313ab8ed7 Working on possible crash on Mac. 2018-11-25 20:10:01 -08:00
NissimHadar
e173b29687 Added warning 2018-11-24 20:43:13 -08:00
NissimHadar
26319e6d6f Remove all disk images 2018-11-24 20:37:21 -08:00
NissimHadar
bbbc358ccb Restore AppData folder on Mac 2018-11-24 20:31:19 -08:00
NissimHadar
f62fd97f09 Updated to v1.1 2018-11-24 09:49:13 -08:00
NissimHadar
b3f646e9dc Updated to v1.1 2018-11-24 09:44:46 -08:00
NissimHadar
2b71a82e4e Updated to v1.1 2018-11-20 20:52:13 -08:00
NissimHadar
eb2533d224 Updated CMake file to include the AppData folder 2018-11-20 20:51:20 -08:00
NissimHadar
4c0f8b176b No need for this after implementation of AppData on Mac. 2018-11-20 19:59:43 -08:00
NissimHadar
4ef54cd4f2 Tests run without Interface crashing. 2018-11-20 17:45:37 -08:00
NissimHadar
c3c41700f6 Can delete temporarY AppData folder and rename High Fidelity folder as a temporary folder 2018-11-20 17:01:58 -08:00
NissimHadar
f6ffb16103 Version 1.1 2018-11-20 15:21:39 -08:00
NissimHadar
a2bcc9e899 teeny weeny typo... 2018-11-20 15:19:54 -08:00
sabrina-shanman
be511378cd Merge branch 'master' into hfm_serializer 2018-11-20 13:42:24 -08:00
NissimHadar
da60aaa5af WIP - Readme to install on Mac. 2018-11-19 17:52:21 -08:00
birarda
e52c7d9c85 update the control packet types after removals 2018-11-19 17:32:18 -08:00
NissimHadar
a448efb452 WIP - Readme to install on Mac. 2018-11-19 16:01:53 -08:00
NissimHadar
d4281212d6 First running version. 2018-11-19 14:32:47 -08:00
NissimHadar
d30334fc3a Updating on Mac 2018-11-19 11:47:00 -08:00
NissimHadar
eea89655f6 WIP - Readme to install on Mac. 2018-11-19 10:33:04 -08:00
NissimHadar
4c763fd0d6 WIP - Readme to install on Mac. 2018-11-19 10:31:06 -08:00
NissimHadar
6440c13bfe Updated manual. 2018-11-15 18:50:56 -08:00
NissimHadar
7fba4c4673 Deleted unneeded file. 2018-11-15 17:41:01 -08:00
NissimHadar
fb0a84e800 CR updates. 2018-11-15 07:54:56 -08:00
NissimHadar
1e17b878e7 CR updates. 2018-11-15 07:32:26 -08:00
NissimHadar
a74e123229 Merge branch 'master' of https://github.com/highfidelity/hifi into MAC 2018-11-14 20:20:41 -08:00
Brad Hefta-Gaub
f1dd778310
Merge pull request #14389 from SimonWalton-HiFi/oven-resourcerequestobserver
Add newly-introduced dependency class to Oven
2018-11-13 17:35:29 -08:00
NissimHadar
620c9e2f93 All results now logged, so don't mark as failed. 2018-11-13 13:38:44 -08:00