Commit graph

16337 commits

Author SHA1 Message Date
Craig Hansen-Sturm
4cd1f4afef add support for head-shadow/penumbra filter for positional audio streams 2014-08-24 22:17:07 -07:00
Andrew Meadows
1bd7734ec1 sometimes swap order of shapes for simpler code 2014-08-22 18:07:11 -07:00
Andrew Meadows
de0ebf2f57 make sure all test errors have newline at end 2014-08-22 17:33:31 -07:00
Andrew Meadows
5d39efea82 make sure each test error has a newline at end 2014-08-22 17:26:19 -07:00
ZappoMan
73d5e8c519 more quieting of debug messages 2014-08-22 17:21:27 -07:00
Philip Rosedale
3fbbeecb8c Merge pull request #3314 from ey6es/metavoxels
Support for scaling splat textures in S and T, use mipmaps for them.
2014-08-22 17:18:10 -07:00
Andrzej Kapolka
2dfabdfe64 Support for scaling splat textures in S and T, use mipmaps for them. 2014-08-22 16:43:09 -07:00
Ryan Huffman
4c485a26ed Merge branch 'fix-wm-close' of github.com:huffman/hifi into fix-wm-close 2014-08-22 15:10:23 -07:00
Ryan Huffman
fa7b2a87bf Add WM_CLOSE support to domain server 2014-08-22 15:09:55 -07:00
Ryan Huffman
b75c3a4976 Disable stdout/err buffering on Windows for assignment client and domain server 2014-08-22 15:08:57 -07:00
Ryan Huffman
439f2d5c02 Merge branch 'fix-wm-close' of github.com:huffman/hifi into fix-wm-close
Conflicts:
	assignment-client/src/AssignmentClient.cpp
2014-08-22 15:02:39 -07:00
Andrew Meadows
1be922f986 add shapeVsList etc to dispatch table
renamed some functions for more readability
2014-08-22 11:20:53 -07:00
ZappoMan
0207649d0c debug cleanup 2014-08-22 10:54:05 -07:00
ZappoMan
75bb42fb73 debug cleanup 2014-08-22 10:54:00 -07:00
David Rowe
761387854d Extrude per mouse movement in voxel space instead of screen space 2014-08-22 10:09:10 -07:00
Ryan Huffman
cd46a55369 Fix QAbstractNativeEventFilter include 2014-08-22 09:33:13 -07:00
David Rowe
c8ac5f584a Convert to vector maths 2014-08-22 09:29:08 -07:00
AndrewMeadows
4f3f0989f5 Merge pull request #3313 from ctrlaltdavid/libovr_readme
Bring libovr build instructions up to date
2014-08-22 09:27:04 -07:00
Philip Rosedale
6a340a1494 Merge pull request #3310 from ey6es/metavoxels
First cut at splatted terrain textures.
2014-08-22 08:27:16 -07:00
David Rowe
cd81d6fc07 Bring libovr build instructions up to date 2014-08-21 19:24:09 -07:00
Andrzej Kapolka
e9e3671710 Increment the version number. 2014-08-21 18:14:10 -07:00
Andrzej Kapolka
5c77317cfd Fix for flashing when painting textures. 2014-08-21 18:07:30 -07:00
Ryan Huffman
bc28bfa464 Add guards around custom windows message handling 2014-08-21 17:41:17 -07:00
Ryan Huffman
e71366f304 Add guards around custom windows message handling 2014-08-21 17:37:40 -07:00
Ryan Huffman
ad4956b2e2 Update assignment client to close on WM_CLOSE message on Windows 2014-08-21 17:19:39 -07:00
Andrew Meadows
3ebd8c1969 use dispatchTable for shape-vs-shape collisions 2014-08-21 16:40:25 -07:00
Andrzej Kapolka
6e06b63709 For splat textures, use transparent white as a default. 2014-08-21 16:33:09 -07:00
Andrzej Kapolka
530f5b0df8 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-08-21 16:00:30 -07:00
Atlante45
a9d3355f2e Merge branch 'master' of https://github.com/highfidelity/hifi 2014-08-21 15:34:08 -07:00
Atlante45
f207abdd98 Move Player over to AvatarData for ACs to use 2014-08-21 15:24:19 -07:00
Andrzej Kapolka
e152e0c2be Detachment fix. 2014-08-21 15:22:34 -07:00
Ryan Huffman
b3bdfc45ce Remove close button from running scripts widget 2014-08-21 15:13:08 -07:00
Ryan Huffman
dd8f776525 Fix size of running scripts window 2014-08-21 15:06:27 -07:00
Ryan Huffman
dcae9eb6da Remove fullscreen button from running scripts window 2014-08-21 14:57:55 -07:00
Andrzej Kapolka
74b39773d6 Don't merge after expansion; it breaks stuff. 2014-08-21 14:50:58 -07:00
Ryan Huffman
b0361025b0 Remove custom behavior from running scripts widget 2014-08-21 14:32:38 -07:00
Atlante45
8760329323 Remove deprecated Audio class Player member 2014-08-21 11:08:37 -07:00
Clément Brisset
6a6670a962 Merge pull request #3307 from AndrewMeadows/inertia
JS scripts can set spine rotation
2014-08-21 11:07:39 -07:00
Andrew Meadows
1bc88a0224 merge upstream/master into andrew/ragdoll 2014-08-21 09:58:58 -07:00
AndrewMeadows
ff9f079704 Merge pull request #3308 from Atlante45/record_feature
Record feature Scripted UI
2014-08-21 09:56:02 -07:00
Andrew Meadows
9ada8435be Merge branch 'huffman-19908' into upstream/master 2014-08-21 09:22:38 -07:00
Andrew Meadows
328167464f Merge branch '19908' of github.com:huffman/hifi into huffman-19908
Conflicts:
	interface/src/Menu.cpp
2014-08-21 09:21:24 -07:00
Andrew Meadows
bc1276944c merge upstream/master into andrew/ragdoll 2014-08-21 08:21:36 -07:00
Andrew Meadows
080c191727 namechange updateConstraint() -> buildConstraint() 2014-08-21 08:20:31 -07:00
Atlante45
022109a249 Added timestamps to the scripted UI 2014-08-20 19:36:56 -07:00
Andrzej Kapolka
72500630b0 Basic splatting. 2014-08-20 19:26:06 -07:00
Atlante45
56f7f88d75 Changed icon URLs to the right ones 2014-08-20 18:17:38 -07:00
Atlante45
8f9a322318 Recording UI 2014-08-20 18:04:17 -07:00
ZappoMan
17426a1c71 removed tons of debugging 2014-08-20 17:47:16 -07:00
Andrew Meadows
7e4c72445e JS scripts set joint animation priorities 2014-08-20 17:14:59 -07:00