Commit graph

83 commits

Author SHA1 Message Date
f1d7421698 Workaround for Nvidia driver bug 2022-12-23 20:25:10 +01:00
4aad531049 Add license information to a bunch of files 2022-11-25 22:02:06 +01:00
Julian Groß
ab6bf0648c Add .secret file as used by "act" to .gitignore 2022-03-21 19:07:00 +01:00
HifiExperiments
30c4779eeb name all the threads 2021-02-13 20:17:28 -08:00
Kasen IO
3c8f76b3f9 ignores "VideoDecodeStats" in .gitignore 2019-12-07 22:26:31 -05:00
danteruiz
bb5e62dafd update gitignore 2019-08-27 16:17:11 -07:00
Ryan Huffman
d8139af429 Remove .vs folder from version control 2019-03-13 08:51:19 -07:00
Thijs Wenker
174e9d3915
Merge pull request #14940 from dback2/fixAvatarExporterGitIgnore
Case 21273: Avatar Exporter - fix .gitignore to include all unneeded files
2019-03-08 00:48:44 +01:00
David Back
59a1e92dd8 fix git ignore for avatar exporter 2019-02-15 16:25:04 -08:00
Brad Davis
b1e4e17f47 Santa Cruz 2019-01-28 15:52:36 -08:00
NissimHadar
9e3220737c Merge error. 2019-01-22 14:14:27 -08:00
NissimHadar
44265b61d6 Merge branch '20550-installOnMac' of github.com:NissimHadar/hifi into 20550-installOnMac 2019-01-22 12:53:50 -08:00
NissimHadar
b2cf8c8e18 New CMake for nitpick. 2019-01-15 15:21:48 -08:00
Brad Davis
61ea0de742 Update build files based on move 2019-01-15 15:16:14 -08:00
NissimHadar
39ee69d959 Added .gitignore to repo. 2019-01-11 16:26:06 -08:00
David Back
0e89e37c8e fix thumb rotations, fix text height, adjust readme 2019-01-02 17:40:00 -08:00
David Back
71cd0976d6 newline 2018-12-21 18:00:57 -08:00
David Back
d63609bedd more file workflow changes including export project popup window, add readme 2018-12-21 18:00:55 -08:00
Brad Davis
8504619067 Dockerized build, updated build script, ndk18 2018-12-10 11:33:41 -08:00
David Back
46017a70d1 remove unneeded files and add unity project files to gitignore 2018-12-06 17:18:55 -08:00
Stephen Birarda
765688d4da add JSDoc package lock json to gitignore 2018-04-03 17:40:07 -07:00
Olivier Prat
9cfe53be3e Merged from orgin taa 2018-02-19 17:50:10 +01:00
Olivier Prat
f5a2557a2e Merged with master 2018-02-19 17:28:39 +01:00
Zach Fox
e01e88d4ae This works, but is it correct? 2018-02-07 15:13:22 -08:00
Olivier Prat
5af4337b0e Merged with master 2018-01-25 10:11:53 +01:00
Brad Davis
97593bc4d8 Fixing compiled resource access 2018-01-10 17:18:12 -08:00
Brad Davis
bd5af2b493 Working on android avatar rendering 2018-01-09 11:40:32 -08:00
Brad Davis
a2c2e7d9ff Fixes to load cubemap 2018-01-08 14:43:54 -08:00
Sam Gateau
a9f1e4102b Merge branch 'master' of https://github.com/highfidelity/hifi into black 2018-01-07 22:19:38 -08:00
Brad Hefta-Gaub
7a3835eb33
Merge pull request #11945 from jherico/android_nov
Updating android toolchain for QML
2018-01-05 13:34:03 -08:00
samcake
50c97ede2b Merge branch 'master' of https://github.com/highfidelity/hifi into black 2018-01-05 11:55:43 -08:00
milad
63801ce802 add .jsc, remove duplicate qmlc, and remote Utils.jsc 2018-01-02 17:15:23 -08:00
Brad Davis
0379ebad63 Updating android toolchain for QML 2017-12-07 11:19:31 -08:00
samcake
e0110ff7e6 Merging with upstream 2017-12-07 09:23:38 -08:00
Olivier Prat
1ce1aca79f Merged with samcake's 'black' branch 2017-12-07 08:59:38 +01:00
Brad Davis
d769acd345 Updating Android toolchain 2017-11-28 11:32:32 -08:00
Olivier Prat
dd6b7b04c2 Merged with master 2017-11-13 14:33:59 +01:00
Olivier Prat
3cc445ff02 Renamed outline to highlight 2017-11-07 11:07:25 +01:00
Olivier Prat
ae8a9e68c8 Added debug tool to view shadow & view frustums 2017-10-25 11:58:16 +02:00
Sam Gateau
ec934335dc CLeaning up the pr regarding the scripts with my branch blue 2017-10-15 22:34:58 -07:00
samcake
6639287418 Merging with master 2017-10-02 17:03:09 -07:00
LaShonda Hopper
f427b5ba3f Adding vscode ignores (details below).
vscode ignore settings taken from from Github Global Ignores master@435c4d92

https://github.com/github/gitignore/commits/master/Global/VisualStudioCode.gitignore
2017-09-28 15:06:06 -04:00
Bradley Austin Davis
b93e91b9f3 New android toolchain 2017-09-19 13:45:12 -07:00
samcake
3695cd6164 Editing .gitignore to remove qmlc files 2017-09-01 09:27:49 -07:00
Zach Pomerantz
6f7162132e add release/debug/gprof/valgrind to gitignore 2016-11-27 18:03:02 -05:00
Ryan Huffman
17c63eb722 Add the ability to ignore invisible entities in findRayIntersection 2016-10-04 20:19:32 -07:00
Stephen Birarda
d9db64dc91 add npm-debug to global gitignore 2016-01-15 15:41:34 -08:00
Stephen Birarda
608d5cbfbe add a basic package.json for the HF console 2015-12-02 13:18:32 -08:00
Seth Alves
34e64e5007 Merge pull request #4650 from birarda/vhacd-external
add v-hacd as an external project
2015-04-21 09:44:52 -07:00
Stephen Birarda
604bc2abe1 remove visage related files 2015-04-17 13:40:31 -07:00