Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-05 17:25:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
11739 commits 25 branches 28 tags 1.2 GiB
Commit graph

11739 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
f969e050cd add apache license to shader headers 2014-04-09 09:59:05 -07:00
stojce
7b26317eaf Merge branch 'master' of https://github.com/worklist/hifi into 19548 2014-04-09 18:55:17 +02:00
stojce
ce85e67a42 Modify icons in Interface "mirror" 2014-04-09 18:54:59 +02:00
Stephen Birarda
619e9d7cd3 more header repairs caught via find 2014-04-09 09:52:00 -07:00
Stephen Birarda
c9b58c0ee9 fix headers in h files in tests, fix Andrew's dates 2014-04-09 09:49:47 -07:00
Stephen Birarda
cb402e3eb3 run apache header script on tests 2014-04-09 09:46:43 -07:00
Stephen Birarda
6ce5a24460 missed copyright cleanups in apache header 2014-04-09 09:44:38 -07:00
Stephen Birarda
a65f8faea9 fix Plane header that was not caught 2014-04-09 09:36:13 -07:00
Stephen Birarda
684c6b5372 run regex header replacement on all cpp files 2014-04-09 09:35:42 -07:00
Stephen Birarda
974d8c0427 prepare header files for regex run against cpp 2014-04-09 09:35:05 -07:00
Stephen Birarda
fbd2066b0c more apache licensing for cmake files 2014-04-09 09:25:34 -07:00
Stephen Birarda
067ea5b5b6 add a missing space in company name in paintGun 2014-04-09 09:22:19 -07:00
Stephen Birarda
4a398494b1 ensure spacing in company name for JS licenses 2014-04-09 09:21:54 -07:00
Stephen Birarda
9950845566 more apache licensing tweaks to JS files 2014-04-09 09:19:29 -07:00
Andrew Meadows
2f97dd2574 sessionID --> sessionUUID for consistency 2014-04-09 08:22:35 -07:00
Andrew Meadows
229d6cefa2 merge upstream/master into andrew/scripting 2014-04-09 08:17:33 -07:00
Andrew Meadows
b8232b5dfd AvatarData now stores sessionUUID 2014-04-09 08:11:15 -07:00
stojce
cc2f03fb49 Merge branch 'master' of https://github.com/worklist/hifi into 19508 2014-04-09 08:19:41 +02:00
Andrew Meadows
2eef95f67e remove getAbsoluteHeadYaw() from the header 2014-04-08 18:44:34 -07:00
Andrew Meadows
f95542e4d6 merge upstream/master into oculus-with-thrust proj 2014-04-08 18:34:15 -07:00
Andrew Meadows
34aefe1b49 fix glitchy oculus when looking directly behind 2014-04-08 18:33:08 -07:00
Brad Hefta-Gaub
dc89026215 Merge pull request #2607 from thoys/hifi-win-default-device-fix 
windows default device fix
 2014-04-08 15:30:02 -10:00
Andrzej Kapolka
5b0e7f818d More work on Faceplus integration/cleaning up support for multiple face 
trackers.
 2014-04-08 18:03:49 -07:00
Stephen Birarda
0f204f932c add apache license information to more js files 2014-04-08 18:00:24 -07:00
Stephen Birarda
8ff244cc1a add missing space for example replace in javascripts 2014-04-08 17:58:02 -07:00
Stephen Birarda
71c3443614 mass replacement of js of hifi with examples 2014-04-08 17:56:56 -07:00
Stephen Birarda
5b822dc57c inital licensing fixes for JS headers 2014-04-08 17:54:54 -07:00
Stephen Birarda
d9fdd87aa3 add apache header to mtc main 2014-04-08 17:50:11 -07:00
Stephen Birarda
ff9fd2d8e9 tweak headers in cmake find modules 2014-04-08 17:49:30 -07:00
Stephen Birarda
7ce91b3f96 fix headers who had their comments removed 2014-04-08 17:43:35 -07:00
Stephen Birarda
387179b38f add Norman's tagline back to PrimitiveRenderer 2014-04-08 17:31:53 -07:00
Stephen Birarda
ab3a9af6bf repair the starfield renderer 2014-04-08 17:31:30 -07:00
Stephen Birarda
638b49e47d switch to apache license in root license file 2014-04-08 17:31:02 -07:00
Stephen Birarda
6a51df9e38 initial regex replacement of headers 2014-04-08 17:30:36 -07:00
Stephen Birarda
f3cbd120ce header comment tweaks prior to regex match 2014-04-08 17:19:23 -07:00
Andrzej Kapolka
98011da1ef Starting on Faceplus integration. 2014-04-08 17:07:45 -07:00
Atlante45
7e33ed0c91 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-08 16:35:46 -07:00
Atlante45
039450aeec Checking model name is present in the .fst file 2014-04-08 16:35:07 -07:00
Philip Rosedale
220ccdf163 Merge pull request #2622 from ey6es/master 
Pull camera back to avoid head's intersecting near clip plane in full screen mirror mode.
 2014-04-08 15:48:06 -07:00
Andrzej Kapolka
94a7ded212 Slip in a fix for Windows build warnings on mtc-generated code. 2014-04-08 15:36:21 -07:00
Andrzej Kapolka
597d750af9 Better radius. 2014-04-08 15:25:10 -07:00
Andrzej Kapolka
083e9076a9 Missed a spot. 2014-04-08 15:17:05 -07:00
Andrzej Kapolka
faf8c35358 Head height's kind of screwy; let's use the eye position. 2014-04-08 15:01:56 -07:00
Andrzej Kapolka
add7bb26ed Use the head height to determine the pushback amount. 2014-04-08 14:55:46 -07:00
Andrzej Kapolka
5776514e6a Working on pushing the mirror camera back to prevent intersecting the near 
clip plane.  Closes #2617.
 2014-04-08 14:48:01 -07:00
Thijs Wenker
6754a6ca69 Fixed some style 2014-04-08 23:45:27 +02:00
Atlante45
8ad7c3b239 Moved ModelUploader to interface + New error messages 2014-04-08 14:03:27 -07:00
Brad Hefta-Gaub
8e097be28d Merge pull request #2614 from Atlante45/undo_redo_system 
Undo redo system
 2014-04-08 08:30:29 -10:00
Brad Hefta-Gaub
c865df8b82 Merge pull request #2613 from Atlante45/more_upload_work 
More upload work
 2014-04-08 08:16:07 -10:00
Brad Hefta-Gaub
d2e7f9e17b Merge pull request #2606 from ey6es/metavoxels 
Basic (meta)voxelization from a set of six rendered images.  Still needs tweaking, etc.
 2014-04-08 08:15:44 -10:00