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
44177 commits 2 branches 0 tags 1.1 GiB
Commit graph

44177 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Rowe
358355cfbf Clear file selection and disabled Open button when change directory 2016-06-09 15:15:29 +12:00
SamGondelman
24e5000aeb exposed orientation and eye position to procedural entity shaders 2016-06-08 18:26:54 -07:00
Brad Hefta-Gaub
262e0262fc Merge pull request #7889 from samcake/color 
add support for ambient occlusion texture and lightmap texture for fbx exported from Blender
 2016-06-08 17:38:45 -07:00
Zach Pomerantz
9926c80917 Only check user metadata before sending 2016-06-08 18:45:01 -05:00
Brad Hefta-Gaub
fc5214c938 Merge pull request #8033 from SamGondelman/xboxFix 
Game pads work after falling asleep and being reactivated
 2016-06-08 16:27:26 -07:00
Brad Hefta-Gaub
8434aa9416 Merge pull request #8027 from SamGondelman/exposeHaptics 
Expose haptics to JS
 2016-06-08 16:17:04 -07:00
Seth Alves
2e940e1055 Merge branch 'master' of github.com:highfidelity/hifi into fix-avatar-entity-locking 2016-06-08 15:54:12 -07:00
Seth Alves
f070708b4a _avatarEntityData is accessed by more than one thread. 2016-06-08 15:53:54 -07:00
Anthony Thibault
05ca715074 Merge pull request #7974 from hyperlogic/tony/daz3d-model-fix 
Fix for models exported from Daz3D.
 2016-06-08 15:44:50 -07:00
Brad Hefta-Gaub
69ae33ad9a Merge pull request #7997 from SamGondelman/touchFixes 
Corrected Oculus Touch coordinate system so that hands track properly
 2016-06-08 15:39:17 -07:00
Seth Alves
a312218722 back out some changes 2016-06-08 14:07:16 -07:00
Brad Hefta-Gaub
4e418f328f Merge pull request #7924 from imgntn/moreshelfstuff 
[Home] Add More Content
 2016-06-08 13:53:26 -07:00
Seth Alves
d7fc789ea7 try harder to not do simple-simulation on things that have an avatar ancestor 2016-06-08 13:47:52 -07:00
James B. Pollack
65e2cdbbf3 clear dead code 2016-06-08 13:44:53 -07:00
Brad Hefta-Gaub
0df72548f8 Merge pull request #8024 from kencooke/audio-src-avx2 
AVX2 optimized audio resampler
 2016-06-08 12:43:52 -07:00
Seth Alves
a1766539f4 don't do simple simulation on children of avatars 2016-06-08 12:17:07 -07:00
Seth Alves
201d7a7d3b when parent is an avatar, set velocity to zero (still incorrect, but avoids server-side problems) rather than the world-frame velocity 2016-06-08 12:11:08 -07:00
Seth Alves
5cbaf05e45 also zero angular velocity for child of avatar 2016-06-08 11:55:17 -07:00
Seth Alves
1b4b38c85b when parent is an avatar, set velocity to zero (still incorrect, but avoids server-side problems) rather than the world-frame velocity 2016-06-08 11:28:49 -07:00
Seth Alves
1977efae4f Merge branch 'master' of github.com:highfidelity/hifi into permissions-grid 2016-06-08 10:36:52 -07:00
Seth Alves
8085266c1d cause names in permissions tables to be alpha-sorted 2016-06-08 10:36:44 -07:00
Brad Hefta-Gaub
d0e946c907 Merge pull request #8034 from ctrlaltdavid/20953 
fix colors of buttons in Asset Browser dialog
 2016-06-08 07:47:34 -07:00
David Rowe
f9d6a7ba8d Fix image2d overlay color property 2016-06-08 14:04:02 +12:00
Brad Hefta-Gaub
338557358d Merge pull request #8035 from Atlante45/master 
Fix OS X warning
 2016-06-07 18:17:58 -07:00
Brad Hefta-Gaub
80100b1d34 Merge pull request #8000 from Atlante45/feat/plugins 
Select/Disable plugins via command line args
 2016-06-07 18:17:29 -07:00
SamGondelman
2c1d20bd1a removed _deviceCounts, cache joystick available inputs, added deadzone to gamepad thumbsticks 2016-06-07 17:12:24 -07:00
Brad Hefta-Gaub
9a0076d4f1 Merge pull request #8028 from ctrlaltdavid/20949 
add "Load Defaults" button to Running Scripts dialog
 2016-06-07 17:09:29 -07:00
Brad Hefta-Gaub
6603289de9 Merge pull request #8029 from SamGondelman/constantTurn 
Fixed constant turn of 22.5 degrees in comfort mode
 2016-06-07 17:09:07 -07:00
Anthony J. Thibault
30d8ae36e8 Added MyAvatar.characterControllerEnabled property 2016-06-07 16:55:32 -07:00
Atlante45
71fb0e665f Fix OSX warning 2016-06-07 16:46:32 -07:00
Seth Alves
7696ead012 look for standard permissions in standard table rather than in user table 2016-06-07 16:38:52 -07:00
Seth Alves
b2f63a2132 hook up can-rez-tmp and can-write-to-asset-server 2016-06-07 16:17:58 -07:00
David Rowe
a87483dfff Fix colors of buttons in Asset Browser dialog 2016-06-08 10:55:14 +12:00
SamGondelman
545dda0a98 whoops 2016-06-07 15:15:42 -07:00
SamGondelman
5daccba235 xbox controller works on restart 2016-06-07 15:14:08 -07:00
Seth Alves
3bfcc865bd Merge branch 'permissions-grid-ui' of github.com:sethalves/hifi into permissions-grid 2016-06-07 14:43:42 -07:00
Seth Alves
a1051da484 Merge branch 'master' of github.com:highfidelity/hifi into permissions-grid 2016-06-07 14:43:35 -07:00
James B. Pollack
c545f53c75 target script attached in reset spawner 2016-06-07 14:43:23 -07:00
David Rowe
f3f04fba97 Fix IE displaying checkboxes too large 2016-06-08 09:41:31 +12:00
James B. Pollack
6573b3c71e remove bricabrac from dressing room shelves for now 2016-06-07 14:37:19 -07:00
David Rowe
801981816b Add permissions tool-tips 2016-06-08 09:11:37 +12:00
James B. Pollack
9f4289ae1b add down velocity to shelfy things 2016-06-07 13:31:42 -07:00
SamGondelman
2e71a63574 cr fixes 2016-06-07 13:28:10 -07:00
SamGondelman
ff2405437b can set strength to 0 2016-06-07 12:19:38 -07:00
SamGondelman
dd97f16728 investigating xbox failure on restart (WIP) 2016-06-07 11:42:58 -07:00
Howard Stearns
38d0d28603 Merge pull request #8021 from AndrewMeadows/walk-follows-camera 
camera steers avatar when walking
 2016-06-07 10:43:01 -07:00
Ken Cooke
27d39eb1b0 Lightweight functions to detect SSE3, SSSE3, SSE4.1, SSS4.2, AVX and AVX2. 
These are cross platform, and return false on unsupported platforms.
 2016-06-07 06:53:50 -07:00
Ken Cooke
14b51d6615 Use common code for AVX detection 2016-06-07 06:50:38 -07:00
David Rowe
f2d81f1338 Add security table heading groups 2016-06-07 17:46:45 +12:00
David Rowe
0119af11d6 Finesse security table text and general layout 2016-06-07 17:46:28 +12:00