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

40205 commits

This branch
This branch
All branches
Author SHA1 Message Date
James B. Pollack
6d82dcb533 not the targets 2016-03-07 11:38:05 -08:00
Seth Alves
8b8604f9b0 move offset handling for models back to how it was before this PR 2016-03-07 11:32:25 -08:00
Anthony Thibault
2cbb41fd38 MyAvatar: bug fix for forward/backward lean detection 2016-03-07 10:11:22 -08:00
Anthony J. Thibault
aefeff2493 MyAvatar: Use a box instead of a sphere for horizontal re-centering 2016-03-07 09:50:38 -08:00
Anthony Thibault
b096e062e6 Merge pull request #7250 from ZappoMan/smallFix 
fix a couple bugs in this script
 2016-03-07 09:13:58 -08:00
Brad Hefta-Gaub
3fe89c0cdf Merge pull request #7256 from samcake/orange 
Fix the text rendering Bug
 2016-03-07 09:11:55 -08:00
Chris Collins
86f60671a7 Merge pull request #7254 from ZappoMan/hackathonMusicPlayer 
Music Player
 2016-03-07 09:01:58 -08:00
Chris Collins
d03fb797e7 Merge pull request #7252 from sethalves/fix-polyvox-rendering-again 
fix polyvox fragment shader
 2016-03-07 08:59:22 -08:00
James B. Pollack
830a61b874 update 2016-03-06 15:04:47 -08:00
James B. Pollack
9a860bd31a update ping pong gun model url 2016-03-06 15:01:35 -08:00
Seth Alves
c95d1f68f6 remove debug print 2016-03-06 14:38:03 -08:00
Seth Alves
b6a478d970 Merge branch 'master' of github.com:highfidelity/hifi into fix-hulls-for-non-default-registration 2016-03-06 14:35:38 -08:00
Seth Alves
5c585acd9a offset is included in shape key for models 2016-03-06 14:29:30 -08:00
Seth Alves
dcb720a832 fix polyvox hull when registration changes. 2016-03-06 14:09:45 -08:00
Brad Hefta-Gaub
78b608b970 Merge pull request #7225 from PhilipRosedale/hydraReticle 
Hand controller drives mouse, does not take over if set down
 2016-03-06 13:33:02 -08:00
Seth Alves
59804a0f54 cleanups 2016-03-06 12:59:41 -08:00
Seth Alves
5241dc5394 this seems to be working now. more cleanups to come 2016-03-06 12:59:33 -08:00
samcake
193b98f24f Gamma correct the text color 2016-03-05 10:59:03 -08:00
samcake
d3b84311c5 FIxing the color 2016-03-05 10:36:45 -08:00
samcake
2d3f0b12f5 Simple fix to the text bug 2016-03-05 10:18:50 -08:00
Seth Alves
f03ddb856b Merge branch 'master' of github.com:highfidelity/hifi into fix-hulls-for-non-default-registration 2016-03-05 09:54:38 -08:00
Seth Alves
8bc2c76a8b change shape-key when registration point changes so shape cache doesn't incorrectly reuse the old shape 2016-03-05 08:01:30 -08:00
Brad Hefta-Gaub
168fd2d72f read playlist URL from userData 2016-03-05 01:07:20 -08:00
Brad Hefta-Gaub
2f92a4cccd first cut at music player 2016-03-05 00:45:25 -08:00
Anthony J. Thibault
076b0b42d7 HandControllerGrab: fixes for distance holding 
Because controller poses are in avatar space, there is no need
to apply delta avatar position changes and rotation changes.
 2016-03-04 20:36:32 -08:00
samcake
e3d11560eb With a shader compiling 2016-03-04 19:08:48 -08:00
samcake
3278b76eef Starting investigating the text rendering bug 2016-03-04 18:24:36 -08:00
Brad Hefta-Gaub
b0decbee18 Merge pull request #7229 from kencooke/master 
New audio peak limiter library.
 2016-03-04 17:25:46 -08:00
Ken Cooke
d390c60ef7 CR feedback 2016-03-04 17:11:44 -08:00
Seth Alves
5bb50c7ea0 track api change in packDeferredFragment 2016-03-04 17:01:54 -08:00
Seth Alves
9346171695 if entity registration isn't default, adjust physics shapes to match 2016-03-04 16:47:30 -08:00
PhilipRosedale
87e7dd9ce3 add vive button mapping 2016-03-04 16:16:05 -08:00
Brad Davis
7728ef0258 Merge pull request #7242 from ZappoMan/hackathonLightening 
example of a rainy day/night zone
 2016-03-04 15:56:02 -08:00
Brad Hefta-Gaub
6d56a0d051 more CR feedback 2016-03-04 15:55:08 -08:00
Brad Hefta-Gaub
2b4d206eca more CR feedback 2016-03-04 15:54:28 -08:00
Philip Rosedale
ee3e0fcc38 Merge pull request #7238 from hyperlogic/tony/hmd-follow-work 
MyAvatar: Improved body recentering for room scale
 2016-03-04 15:51:07 -08:00
Brad Hefta-Gaub
e776bf5819 CR feedback 2016-03-04 15:47:50 -08:00
Brad Hefta-Gaub
d8e7c60ce0 CR feedback 2016-03-04 15:47:25 -08:00
Brad Hefta-Gaub
3f85daf276 Merge branch 'master' of https://github.com/highfidelity/hifi into hackathonLightening 2016-03-04 15:31:32 -08:00
Brad Hefta-Gaub
add7f54af3 remove debug line 2016-03-04 15:29:32 -08:00
Brad Hefta-Gaub
21b66354ef remove debug line 2016-03-04 15:28:49 -08:00
Anthony Thibault
0de19d13c4 MyAvatar: open up horizontal leaning threshold 2016-03-04 15:28:38 -08:00
Brad Hefta-Gaub
c9cd8eeba6 fix a couple bugs 2016-03-04 15:27:43 -08:00
Brad Hefta-Gaub
30bcb04a2f Merge pull request #7149 from jherico/overlays_qml 
Make Overlay API usable from QML
 2016-03-04 15:00:45 -08:00
Philip Rosedale
cb8e2b7018 Merge pull request #7246 from AndrewMeadows/stable-ik 
recover stability of arm IK
 2016-03-04 14:38:59 -08:00
Brad Davis
a1b286302f Merge pull request #7237 from birarda/domain-over-connect 
re-use the node with same sockets during failed domain connection
 2016-03-04 14:37:39 -08:00
Brad Davis
3aec9f8e8e Merge pull request #7244 from Atlante45/feat/hackaton 
Flappy avatars
 2016-03-04 14:34:07 -08:00
Brad Davis
468cb05571 Merge pull request #7231 from ctrlaltdavid/20812 
Restyle settings dialogs
 2016-03-04 14:33:21 -08:00
David Rowe
b4c489d4c6 Fix not reliably being able to select "None" in Graphics settings 2016-03-05 10:17:39 +13:00
Brad Davis
4e1f78b585 Allow message passing from a script to a QML window 2016-03-04 13:11:08 -08:00