Commit graph

40093 commits

Author SHA1 Message Date
Stephen Birarda
7bb97ec3da add an extra space before debug in AssetServer 2016-03-07 13:57:12 -08:00
Stephen Birarda
e7124d4b10 add server handling for no extension requests 2016-03-07 13:57:11 -08:00
Stephen Birarda
267ed3af82 remove client side handling of extension for ATP hash URLs 2016-03-07 13:57:02 -08:00
Ryan Huffman
19cd352a77 Add read/writeString to PacketList and Packet 2016-03-07 13:53:36 -08:00
Ryan Huffman
7317d3b2ea Revert AssetRequest back to using hash 2016-03-07 13:53:29 -08:00
Ryan Huffman
7dd436a7a8 Add AssetScriptingInterface methods for mapping 2016-03-07 13:52:04 -08:00
Ryan Huffman
462f00077c Add get/set mapping request 2016-03-07 13:50:57 -08:00
Ryan Huffman
9eb0fdf589 Clean up AssetServer mapping handling 2016-03-07 13:50:08 -08:00
Ryan Huffman
6b485cf81d Update atp mapping operations to use a single packet 2016-03-07 13:49:55 -08:00
James B. Pollack
247ebb380b Merge pull request #7253 from hyperlogic/tony/distance-holding-fixes
HandControllerGrab: fixes for distance holding
2016-03-07 12:12:58 -08:00
Chris Collins
7850ca3576 Merge pull request #7227 from hyperlogic/tony/eye-look-at-fixes
Avatar eye look at fixes for HMD and desktop
2016-03-07 11:50:16 -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
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
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
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
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
Atlante45
3a5165ab66 Add json import for game entity 2016-03-04 11:54:03 -08:00
Atlante45
ab5a29b076 Bit of cleanup 2016-03-04 11:50:12 -08:00
Anthony Thibault
37ba0ecd9f MyAvatar: prevent face from being visible when crouching
Overall, this should fix many of the issues with the head being visible when it shouldn't.
2016-03-04 11:48:55 -08:00
Brad Davis
2f89253dc1 Make Overlays usable from QML 2016-03-04 11:35:54 -08:00
PhilipRosedale
e01524abbe fix for clicking 2016-03-04 11:24:35 -08:00