Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
64660 commits 2 branches 0 tags 1.1 GiB
Commit graph

57 commits

Author SHA1 Message Date
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
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
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
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
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
Stephen Birarda
faf7850d7c remove plugin specific ignored files 2015-04-15 12:38:24 -07:00
Stephen Birarda
8b41a952b3 update instructions for new build folder placement 2015-04-15 12:19:38 -07:00
Stephen Birarda
9213561977 add vim plugin files to gitignore 2015-04-15 11:34:59 -07:00
Stephen Birarda
e07ce23825 resolve conflicts on merge with upstream master 2015-02-03 10:25:17 -08:00
Seth Alves
bee895ba0a capture network bandwidth stats from NodeList rather than various places 2015-01-31 20:02:04 -08:00
Atlante45
4562c29be8 Merge branch 'master' of https://github.com/highfidelity/hifi into android 
Conflicts:
	interface/src/avatar/Hand.cpp
 2015-01-30 12:02:11 -08:00
Thijs Wenker
f26ad6c95c ignore multiple build directories 
ignore /build-test/, /build-vs2013/, /build-osx/, /build-ubuntu/ , /build-cygwin/
 2015-01-30 02:52:24 +01:00
Stephen Birarda
763994da5a handle gverb move to audio-client 2015-01-29 12:44:03 -08:00
Stephen Birarda
e4321a8f18 add audio-client externals to gitignore 2015-01-29 11:04:27 -08:00
Stephen Birarda
4c338a9950 handle possibility of HockeyApp inclusion 2015-01-27 17:08:57 -08:00
Stephen Birarda
d30490c760 resolve conflicts on merge with upstream master 2015-01-12 09:25:37 -08:00
Atlante45
b4f18f15d7 Ignore Visage resources in .gitignore except for tracker.cfg 2014-12-08 11:49:42 -08:00
Stephen Birarda
46ffbb13aa copy the assets folder to the apk build 2014-11-19 10:03:42 -08:00
Stephen Birarda
f67fd3e48b modify gitignore to wildcard handle interface externals 2014-07-18 17:51:10 -07:00
Stephen Birarda
e060693856 remove faceshift from repository, make external dependency 2014-07-18 13:54:44 -07:00
Stephen Birarda
5ba4a4dbb5 initial pass of MIDI implementation that bubbles events to JS 2014-07-01 09:53:18 -07:00
Andrzej Kapolka
4cbe8a41db Add PrioVR to .gitignore. 2014-05-14 13:40:03 -07:00
Andrzej Kapolka
4deb052d5d More work on Faceplus integration. 2014-04-09 11:54:55 -07:00
Andrzej Kapolka
853bba27ca Applied Ryan's tweaks to Visage mapping and config file. 2014-03-10 15:13:24 -07:00
Stephen Birarda
3b06bbd88d move sixense directory to lowercase, have find module look in env dir 2014-03-07 09:59:24 -08:00
Stephen Birarda
bf746bb565 remove extra spaces in the gitignore 2014-03-06 14:41:25 -08:00
Stephen Birarda
e26f625f14 simplify the gitignore for interface externals with readme 2014-03-06 14:34:48 -08:00
Stephen Birarda
816a631b05 tweak the oculus find module to take copied-in folders 2014-03-06 14:16:38 -08:00
Andrzej Kapolka
861ae12151 Added Visage stuff to .gitignore. 2014-02-13 16:53:17 -08:00
Andrzej Kapolka
6d9bd6d2b0 Gitignore additions. 2013-11-18 12:16:25 -08:00
stojce
19c8084b64 dynamic height 2013-09-10 00:38:43 +02:00