Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-25 19:25:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
18149 commits 25 branches 0 tags 1.1 GiB
Commit graph

8864 commits

Author SHA1 Message Date
AndrewMeadows
7f7861671e Merge pull request #3471 from ctrlaltdavid/20055 
Code Review for Job #20055
 2014-09-26 14:00:33 -07:00
Andrzej Kapolka
aa0b3a18ef Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-09-26 13:53:23 -07:00
Andrzej Kapolka
efa22d931f If we're rendering the billboard, don't render the body. 2014-09-26 13:48:11 -07:00
Andrzej Kapolka
3fe6e30632 Working on QR decomposition. 2014-09-26 13:43:28 -07:00
David Rowe
c0419c61f4 Fix missing constructor initialization 2014-09-26 09:15:17 -07:00
David Rowe
aa9511c263 Position Rift camera at avatar model's mid-eye location 2014-09-25 22:49:12 -07:00
Philip Rosedale
597871442e fix linux build fail 2014-09-25 17:39:53 -07:00
Philip Rosedale
3fd1ab40e4 remove magic number 2014-09-25 16:17:05 -07:00
Philip Rosedale
1d4b86d85b Blink first with one eye and at slightly different speeds, look back and forth exactly at eyes when receiving gaze in Oculus 2014-09-25 16:00:56 -07:00
stojce
5610cfeb34 CR fixes 2014-09-26 00:57:56 +02:00
stojce
6a3bc8f255 Merge branch 'master' of https://github.com/highfidelity/hifi into 20061 2014-09-25 23:57:19 +02:00
Philip Rosedale
693bc11868 Merge branch 'master' of https://github.com/worklist/hifi 2014-09-25 11:59:14 -07:00
Philip Rosedale
7836fd8a85 Add world space eye locations (for making eye contact) to the oculus manager 2014-09-25 11:58:41 -07:00
AndrewMeadows
697c7f6a61 Merge pull request #3481 from ZappoMan/collidingEntities 
First cut at colliding entities
 2014-09-25 09:38:50 -07:00
Brad Hefta-Gaub
84630a8f74 Merge pull request #3484 from huffman/20024 
Code Review for Job #20024
 2014-09-25 09:33:58 -07:00
Brad Hefta-Gaub
0775e9dde4 Merge pull request #3479 from PhilipRosedale/master 
Improved eye contact, audio driven mouth and brows, linear audio scope
 2014-09-25 09:32:37 -07:00
Brad Hefta-Gaub
712f88baa3 Merge pull request #3476 from birarda/xbox-controller 
add script support for general SDL controllers
 2014-09-25 09:25:08 -07:00
Philip Rosedale
fcc5eb9d0a Tuning of audio-driven mouths and brows to look better and not stay open 2014-09-24 16:37:55 -07:00
ZappoMan
6b8c9bba42 improved debug in entity renderer 2014-09-24 16:05:04 -07:00
ZappoMan
f43ba4a68b first cut at getting entities to collide 2014-09-24 15:28:04 -07:00
Philip Rosedale
75e536235c Avatars look at your camera, not your avatar. Improvements to lookAt code 2014-09-24 14:38:44 -07:00
stojce
039deb8b42 added go button active state icon 2014-09-24 23:26:34 +02:00
Stephen Birarda
3ab24d6ea5 add a missing HAVE_SDL block 2014-09-24 11:59:44 -07:00
Stephen Birarda
875c1dba72 change name in header comment to match new class name 2014-09-24 08:40:39 -07:00
stojce
92cb17cbbe Merge branch 'master' of https://github.com/highfidelity/hifi into 20061 
Conflicts:
	interface/src/Menu.h
 2014-09-24 09:25:04 +02:00
Stephen Birarda
9348888ae5 map PrioVR to new JoystickScriptingInterface 2014-09-23 17:42:48 -07:00
Stephen Birarda
13d3eb02e3 report the 360 axis values in xbox.js 2014-09-23 17:19:57 -07:00
Stephen Birarda
d50c81e4a1 add a property for number of buttons in Joystick 2014-09-23 17:10:25 -07:00
Stephen Birarda
00b0806c4d move JoystickManager to JoystickScriptingInterface, add Joystick class for SDL Joystick 2014-09-23 17:09:46 -07:00
stojce
8031454f61 use backslash to activate chat 2014-09-24 00:22:51 +02:00
stojce
c14bf84af8 layout fix 2014-09-24 00:14:00 +02:00
Stephen Birarda
900daf48eb initial working connection of an xbox gamepad 2014-09-23 14:48:44 -07:00
Ryan Huffman
1ee01fdab3 Merge branch 'master' of github.com:highfidelity/hifi into 20024 2014-09-23 14:10:00 -07:00
Philip Rosedale
729d3cf9bc Merge branch 'master' of https://github.com/worklist/hifi 2014-09-23 12:50:52 -07:00
Philip Rosedale
21a15cff2a Avatar can look at corrected position when looking at me 2014-09-23 12:50:47 -07:00
Brad Hefta-Gaub
b7245f8259 Merge pull request #3469 from ctrlaltdavid/20054 
Code Review for Job #20054
 2014-09-23 09:57:31 -07:00
Stephen Birarda
7bae88e996 fix for calls to glm sqrt with ints 2014-09-23 08:52:22 -07:00
stojce
5a7b7cca44 Add finish lookup event 2014-09-23 11:32:16 +02:00
Stephen Birarda
1007f528f0 Merge branch 'master' of https://github.com/highfidelity/hifi into move-locations 2014-09-22 17:42:59 -07:00
Stephen Birarda
5be045d612 remove LocationManager and NamedLocation, replace with DataWebDialog 2014-09-22 16:55:44 -07:00
Stephen Birarda
eb0f7da517 cleanup to snapshot class to reduce passing of variables 2014-09-22 16:14:06 -07:00
Andrzej Kapolka
18cb15ee7d Warning fixes. 2014-09-22 15:31:46 -07:00
David Rowe
f95e20153c Fix upright head model position calculation for avatar scale changes 2014-09-22 15:13:08 -07:00
Andrzej Kapolka
e6b0dc592b Don't save the billboard. 2014-09-22 15:03:25 -07:00
Andrzej Kapolka
aeb424cd71 Fix for billboards. 2014-09-22 15:01:39 -07:00
Stephen Birarda
e5a54116dc correctly return empty string for domain ID if it is null 2014-09-22 15:00:07 -07:00
Stephen Birarda
523a4e6ba2 allow moving of location from DataWebDialog for locations 2014-09-22 11:58:23 -07:00
stojce
cc83c2b2e0 Merge branch 'master' of https://github.com/highfidelity/hifi into 20061 2014-09-22 20:52:17 +02:00
stojce
466dbdcee5 added address bar dialog 2014-09-22 20:51:19 +02:00
AndrewMeadows
a0b458fd1d Merge pull request #3465 from chansensturm/audio-noise 
New Audio Edit Buffer Object / Click Removal /  ....
 2014-09-22 11:38:42 -07:00
David Rowe
a11bf7f15b Decouple Rift head tracking from avatar's head position 
This makes the Rift's view reflect the user's physical movements exactly
while the avatar follows the movements as best it can.
 2014-09-22 11:02:12 -07:00
AndrewMeadows
3d89aa9c9c Merge pull request #3463 from ey6es/deference 
Break deferred lighting business out into its own class, use deferred lighting for voxels/avatars/entities/particles in addition to metavoxels.  Don't merge until after conference, obviously.
 2014-09-22 10:42:25 -07:00
Stephen Birarda
84df6058cb add domainID to location scripting interface 2014-09-22 10:42:14 -07:00
Stephen Birarda
25c86af40f Merge branch 'master' into move-locations 2014-09-22 10:22:30 -07:00
Craig Hansen-Sturm
90379ee7eb frame and channel counts are now consistently uint32_t / float32_t replaces float 2014-09-20 04:50:11 -07:00
Andrzej Kapolka
6c907a9d83 Read the emissive color property and use it to effect glow. 2014-09-19 16:49:51 -07:00
Andrzej Kapolka
9515145b9b Removed commented lines. 2014-09-19 15:48:56 -07:00
Atlante45
36a3372f58 Same fix for MyAvatar class 2014-09-19 15:47:13 -07:00
Atlante45
c570931f35 Fix attachemnt getting into wrong state 
If you play a recording containing attachement with different
attachemnts already on, those attachement will sometime get into a wrong
state.
 2014-09-19 15:43:22 -07:00
Andrzej Kapolka
646c0dc48f Working on translucent model bits. 2014-09-19 15:31:46 -07:00
Ryan Huffman
145425276d Fix script list not being hidden 2014-09-19 14:17:08 -07:00
Andrzej Kapolka
8d3eef708a Move various avatar render bits to post-lighting section. 2014-09-19 13:13:05 -07:00
Andrzej Kapolka
446c2193ff Limit what we render for deferred point/spot lights based on the light's 
radius.
 2014-09-19 12:18:00 -07:00
Andrzej Kapolka
08fda3bbef Merge branch 'master' of https://github.com/highfidelity/hifi into deference 2014-09-19 10:30:40 -07:00
Andrzej Kapolka
e356b06c75 Fix for lights in rear view mirror/head mode. 2014-09-18 17:39:40 -07:00
Stephen Birarda
e09eef98f2 add option to add javascript objects to a DataWebDialog 2014-09-18 17:17:33 -07:00
Andrzej Kapolka
c6aad42f21 Move LocalLight to AvatarManager, apply it at the avatar level. 2014-09-18 17:09:53 -07:00
Andrzej Kapolka
b9ae005e53 Working on the actual deferred lights. 2014-09-18 16:12:46 -07:00
Philip Rosedale
d3cc22b39d Merge branch 'master' of https://github.com/worklist/hifi 2014-09-18 14:51:19 -07:00
Brad Hefta-Gaub
a5ea0479c1 Merge pull request #3450 from birarda/master 
handle hifi urls emitted from DataWebDialog in Application
 2014-09-18 13:36:37 -07:00
Stephen Birarda
9f3d908d9f fix typo in comment 2014-09-18 13:32:01 -07:00
Brad Hefta-Gaub
c48b3ae51e Merge pull request #3451 from birarda/fix-ssl-handshake-race 
make sure the OAuthWebViewHandler is ready before the NodeList might need it
 2014-09-18 13:29:54 -07:00
Andrzej Kapolka
5c22fe7bd1 Translucency tweak. 2014-09-18 13:27:15 -07:00
Andrzej Kapolka
fb7e633cac Post-merge fixes. 2014-09-18 13:17:23 -07:00
Andrzej Kapolka
c54e1c937c Merge branch 'master' of https://github.com/highfidelity/hifi into deference 
Conflicts:
	interface/src/avatar/Head.cpp
 2014-09-18 13:08:55 -07:00
David Rowe
ff8ea46e26 Hide menu bar when fullscreen in Rift VR display mode 2014-09-18 11:34:48 -07:00
Stephen Birarda
75ecdd2f68 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-09-18 11:27:33 -07:00
Philip Rosedale
3f9eff2a90 Merge branch 'master' of https://github.com/worklist/hifi 2014-09-18 10:48:44 -07:00
Philip Rosedale
8c71ed3f10 Improving headMove, added JS call for neckPosition 2014-09-18 10:48:36 -07:00
Stephen Birarda
533a60c35e make sure OAuthWebViewHandler is ready before the NodeList is 2014-09-18 10:34:17 -07:00
Stephen Birarda
7e7c4bd580 handle hifi urls emitted from DataWebDialog 2014-09-18 10:09:57 -07:00
Andrew Meadows
2f3eba2896 merge upstream/master into andrew/ragdoll 2014-09-18 09:55:50 -07:00
Andrew Meadows
1ad08e34c4 support for mulitiple frames for scripted motor 2014-09-18 09:54:27 -07:00
Philip Rosedale
929e463e40 Merge pull request #3447 from birarda/webkit-dialogs 
add a DataWebDialog class to display auth'ed pages from data-web
 2014-09-18 09:48:22 -07:00
Stephen Birarda
a0675162b6 hook My Locations to data-web dialog 2014-09-18 09:35:33 -07:00
Stephen Birarda
93561d3b21 remove the existing user locations dialog 2014-09-18 09:27:07 -07:00
Stephen Birarda
bf83e8fe09 remove the user locations model 2014-09-18 09:23:22 -07:00
Stephen Birarda
d860b8e8db remove test DataWebDialog from Application 2014-09-18 09:22:14 -07:00
Brad Hefta-Gaub
945b251f9b Merge pull request #3446 from stojce/20037 
Code Review for Job #20037
 2014-09-18 09:05:29 -07:00
Stephen Birarda
e2c3b626b3 add a DataWebDialog for authenticated access to data-web html 2014-09-18 09:05:25 -07:00
Philip Rosedale
432622d168 merge fix 2014-09-18 08:37:14 -07:00
Philip Rosedale
dbcb778ea9 Drive mouth with loudness relative to long term average 2014-09-18 08:33:41 -07:00
Brad Hefta-Gaub
cfc8cf0d7b Merge pull request #3443 from ey6es/master 
Allow blenders to stack up to a point in order to reduce latency with fewer avatars (but still cap work with lots of avatars).
 2014-09-17 23:30:36 -07:00
stojce
a6a48aafdc Hide name for all avatars, including MyAvatar 2014-09-18 07:34:14 +02:00
stojce
9a523a60cf Add option to toggle on/off names above heads 2014-09-18 06:59:29 +02:00
Andrew Meadows
b8f49dc6ef fix vertical jitter (for real this time) 2014-09-17 21:56:38 -07:00
Andrzej Kapolka
e0a56b4a95 Rejiggered the blender handling: allow up to N blenders active at once so 
that with small numbers of avatars, the blenders can stack for lower latency.
 2014-09-17 17:57:08 -07:00
Andrew Meadows
8359e672bb merge upstream/master into andrew/ragdoll 2014-09-17 17:56:35 -07:00
Andrew Meadows
cefe8e0268 scripted motor params are now Q_PROPERTIES 2014-09-17 17:55:10 -07:00
Andrew Meadows
21a17823d4 Fix for vertical jitter when walking on floor 2014-09-17 16:26:07 -07:00
Andrzej Kapolka
4a2e68fea4 Fix for eyes on skeleton (e.g., Mixamo) models. 2014-09-17 15:36:22 -07:00
Brad Hefta-Gaub
fd321a5ed1 Merge pull request #3439 from birarda/master 
upload a snapshot for location on location creation, cleanup interface start errors
 2014-09-17 14:52:04 -07:00
Brad Hefta-Gaub
cf135c300c Merge pull request #3436 from ey6es/master 
Fix for shirts on avatars created with new version of Fuse.
 2014-09-17 14:51:54 -07:00
Stephen Birarda
48e45265a3 only add a directory to the filesystem watcher if not empty 2014-09-17 14:43:48 -07:00
Stephen Birarda
abafaffe44 fix a missed Model->Entity rename that caused slot error 2014-09-17 14:43:48 -07:00
Stephen Birarda
8dddbb9d4b make snapshots uploaded for locations temp files that will be cleared 2014-09-17 14:43:48 -07:00
Stephen Birarda
e7b9e2b060 have LocationManager upload snapshot after location creation 2014-09-17 14:43:48 -07:00
Stephen Birarda
7848c63fae handle name location shortcut explicitly to work around bug 2014-09-17 14:43:48 -07:00
Andrzej Kapolka
a3c107545e Allow rendering eye vectors even if there's no head model. 2014-09-17 14:35:34 -07:00
Ryan Huffman
0efce7c8ee Add hotkey to reload all scripts 2014-09-17 13:50:57 -07:00
Andrzej Kapolka
ce9ecba5d8 Merge branch 'master' of https://github.com/highfidelity/hifi into deference 
Conflicts:
	interface/resources/shaders/model.frag
	interface/resources/shaders/model_cascaded_shadow_map.frag
	interface/resources/shaders/model_cascaded_shadow_normal_map.frag
	interface/resources/shaders/model_cascaded_shadow_normal_specular_map.frag
	interface/resources/shaders/model_cascaded_shadow_specular_map.frag
	interface/resources/shaders/model_normal_map.frag
	interface/resources/shaders/model_normal_specular_map.frag
	interface/resources/shaders/model_shadow_map.frag
	interface/resources/shaders/model_shadow_normal_map.frag
	interface/resources/shaders/model_shadow_normal_specular_map.frag
	interface/resources/shaders/model_shadow_specular_map.frag
	interface/resources/shaders/model_specular_map.frag
	interface/src/renderer/Model.cpp
	interface/src/renderer/Model.h
 2014-09-17 13:50:13 -07:00
Atlante45
3751e05ce3 Fixes crash in Model::scaleToFit() 2014-09-17 13:37:16 -07:00
AndrewMeadows
42a84b7ff1 Merge pull request #3429 from ctrlaltdavid/20021 
Code Review for Job #20021
 2014-09-17 09:19:29 -07:00
Andrzej Kapolka
fbd1efad81 Allow specifying material opacity. 2014-09-16 17:52:39 -07:00
Andrew Meadows
489871d0d6 added MyAvatar.setMotorVelocity() & friends for JS 2014-09-16 17:09:32 -07:00
Andrzej Kapolka
07efda89ef Merge branch 'master' of https://github.com/highfidelity/hifi into deference 2014-09-16 13:20:43 -07:00
ZappoMan
9cbc53abc3 pack position and orientation in silent frames 2014-09-16 13:06:46 -07:00
Andrew Meadows
612dc9d226 minor cleanup 2014-09-16 10:09:57 -07:00
Stephen Birarda
866f2005bd handle case where a location should be faced 2014-09-16 10:08:21 -07:00
Stephen Birarda
0033dfe5af use quat orientation to store locations and user locations 2014-09-16 09:57:21 -07:00
David Rowe
a594136a9a Fix up hand roll, pitch, and yaw as best able for now 2014-09-15 20:12:13 -07:00
Andrzej Kapolka
bfaac9eae1 Deferred lighting tweaks. 2014-09-15 18:38:10 -07:00
Brad Hefta-Gaub
a9206e0e85 Merge pull request #3422 from chansensturm/audio-temp 
Implement Gordon-Smith 2-pole quadrature oscillator
 2014-09-15 18:24:11 -07:00
Andrzej Kapolka
7580a1da89 Glow fix for simple shader. 2014-09-15 17:33:07 -07:00
Andrzej Kapolka
da05d37015 Leave the glow level alone when writing the deferred-lit bits. 2014-09-15 17:19:15 -07:00
Andrzej Kapolka
580d591dc4 Working on getting glow to work with deferred lighting. 2014-09-15 17:11:36 -07:00
Philip Rosedale
bd5cb346d2 Merge pull request #3420 from AndrewMeadows/ragdoll 
Walking avatar tweaks
 2014-09-15 16:12:23 -07:00
Andrzej Kapolka
0f3a020b5d Working on getting particles/entities to work with deferred lighting; 
normalize normals from buffer.
 2014-09-15 16:07:48 -07:00
Philip Rosedale
8eeebd15da Merge pull request #3418 from ey6es/master 
Ryan's new blendshape mappings for Mixamo.
 2014-09-15 14:17:00 -07:00
Andrew Meadows
0539246089 merge upstream/master into andrew/ragdoll 2014-09-15 13:56:51 -07:00
Andrew Meadows
b2432876ce More reliable floor detection for avatar movement. 
Also tweaked max walking speed.
 2014-09-15 13:53:37 -07:00
Craig Hansen-Sturm
7a9cf193b4 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-noise 2014-09-15 13:47:24 -07:00
Stephen Birarda
193c125d66 fix scope for switch case 2014-09-15 13:29:13 -07:00
Andrzej Kapolka
467a9582c7 Somehow my reverting the ambient occlusion effect didn't take. 2014-09-15 13:29:03 -07:00
Stephen Birarda
6e9da9747e add a missing update of having heard from the audio-mixer 2014-09-15 13:25:50 -07:00
Andrzej Kapolka
6a0b3fa202 Ryan's new blendshape mappings for Mixamo. 2014-09-15 13:16:17 -07:00
Andrzej Kapolka
70c8c146bc Fix for specular issue on Nvidia, try passing along material colors. 2014-09-15 12:44:25 -07:00
Andrzej Kapolka
9caa4d3a08 Merge branch 'master' of https://github.com/highfidelity/hifi into deference 2014-09-15 12:19:30 -07:00
Andrzej Kapolka
919112fe7c Starting to work on handling translucent meshes with deferred lighting. 2014-09-15 12:18:59 -07:00
Andrzej Kapolka
4475759461 Revert the normal-based ambient occlusion; I wasn't crazy about the look of 
it.  Will perhaps revisit later.
 2014-09-15 11:52:44 -07:00
Philip Rosedale
a70e27f442 Merge pull request #3411 from ZappoMan/fixWarnings 
fix warnings and removed some asserts
 2014-09-14 20:28:39 -07:00
David Rowe
3ddd5854cd Position avatar hands with Leap Motion with no roll, pitch or yaw 2014-09-14 15:03:22 -07:00
David Rowe
be20ec9f4a Construct controllers in inactive state 2014-09-14 13:47:14 -07:00
David Rowe
c7b34b4f54 Lower left and right hands independently when no longer being tracked 2014-09-14 13:47:13 -07:00
Craig Hansen-Sturm
089267a937 completely remove new audio objects from playback rendering path when they are unused 2014-09-14 12:26:25 -07:00
Andrew Meadows
908f4f3a5e merge upstream/master into andrew/ragdoll 
Conflicts:
	interface/src/scripting/GlobalServicesScriptingInterface.cpp
 2014-09-13 17:25:35 -07:00
ZappoMan
c32d5db75c fix bug with attachments being stretched 2014-09-13 15:32:21 -07:00
ZappoMan
d92d2d57a0 one more shot at these warnings 2014-09-13 09:28:28 -07:00
ZappoMan
95a63cf131 fix windows warning and change QByteArray initializer to match documented prototype 2014-09-13 09:14:52 -07:00
ZappoMan
9c34aed36d fix type signed/unsigned warning 2014-09-13 09:02:48 -07:00
ZappoMan
d6ebbd8633 fixed use of uninitialized variable warning 2014-09-13 09:01:27 -07:00
ZappoMan
a95e5487fc fix type signed/unsigned warning 2014-09-13 09:00:47 -07:00
ZappoMan
a6178a137f fix windows warnings 2014-09-13 09:00:18 -07:00
Brad Hefta-Gaub
ec23a7a868 Merge pull request #3410 from chansensturm/audio-noise 
Head Penumbra filter gain smoothing
 2014-09-13 07:47:30 -07:00
Craig Hansen-Sturm
8119dcd9f9 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-noise 2014-09-13 00:43:47 -07:00
Andrzej Kapolka
af546e6b05 Fix for shadows in rear view mirror. 2014-09-12 19:18:31 -07:00
Andrzej Kapolka
e36ff0d238 Fix deferred lighting for rear view mirror. 2014-09-12 18:56:07 -07:00
Andrzej Kapolka
f8772135b1 Color fix. 2014-09-12 18:35:56 -07:00
Craig Hansen-Sturm
2c7d15c01b disable input gain/mute 2014-09-12 18:32:28 -07:00
Andrew Meadows
b94b737f26 fix build for no XMPP 2014-09-12 17:56:25 -07:00
Andrew Meadows
f2882618be merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/avatar/MyAvatar.cpp
 2014-09-12 17:50:26 -07:00
Andrew Meadows
62867391a3 collide against PhysSimulation instead of VoxelTree 2014-09-12 17:38:45 -07:00
Andrew Meadows
c21491a034 add update expiry to VoxelShapeManager 2014-09-12 17:38:20 -07:00
Andrzej Kapolka
72f38900bb Fix for blending on models. 2014-09-12 17:31:03 -07:00
Andrzej Kapolka
982ab75b61 Merge branch 'master' of https://github.com/highfidelity/hifi into deference 2014-09-12 17:09:25 -07:00
Andrzej Kapolka
53933fc9c6 Working on deferred lighting for models. 2014-09-12 17:09:07 -07:00
Andrzej Kapolka
3d48a5b872 Merge branch 'master' of https://github.com/highfidelity/hifi into deference 2014-09-12 15:39:52 -07:00
Andrzej Kapolka
7f31b4563c Merge branch 'master' of https://github.com/highfidelity/hifi 2014-09-12 15:35:46 -07:00
Brad Hefta-Gaub
e69e90b5b4 Merge pull request #3405 from thoys/20017 
Code Review for Job #20017
 2014-09-12 15:34:50 -07:00
Andrzej Kapolka
97813a2f72 Make sure we note that the blender finished even if the geometry changed. 2014-09-12 15:34:49 -07:00
Brad Hefta-Gaub
66ce6b7c3c Merge pull request #3407 from ey6es/master 
Only allow one "blender" to run at a time for each model.
 2014-09-12 15:34:39 -07:00
Andrzej Kapolka
72a6254fa1 Only allow one "blender" to run at a time for each model. 2014-09-12 15:24:38 -07:00
Stephen Birarda
3b21348a63 make sure AddressManager signal is connected to before file event 2014-09-12 15:22:51 -07:00
Stephen Birarda
29dae39ad7 handle location lookup for offline user or not found 2014-09-12 15:01:08 -07:00
Andrzej Kapolka
d0f30dfd45 Merge branch 'master' of https://github.com/highfidelity/hifi into deference 2014-09-12 14:44:45 -07:00
Andrzej Kapolka
7074d96c04 Working on support for specular components in deferred lights. 2014-09-12 14:11:56 -07:00
Thijs Wenker
df0cbd54fc Merge branch 'master' of https://github.com/highfidelity/hifi into 20017 
Conflicts:
	interface/src/Application.cpp
 2014-09-12 23:04:05 +02:00
Philip Rosedale
3fbe183196 Merge pull request #3402 from ZappoMan/stretchableEntities 
New Entities Features
 2014-09-12 13:57:45 -07:00
Brad Hefta-Gaub
b209b70094 Merge pull request #3404 from birarda/data-web-domain-lookup 
initial transition to new metaverse API
 2014-09-12 13:45:40 -07:00
Brad Hefta-Gaub
fc33de28a0 Merge pull request #3399 from huffman/19831 
Code Review for Job #19831
 2014-09-12 13:45:20 -07:00
Stephen Birarda
b0593bcdc0 fix a double space 2014-09-12 13:31:27 -07:00
Stephen Birarda
f0ead98a2a put back LocationScriptingInterface so it works prior to replacement 2014-09-12 13:28:18 -07:00
Thijs Wenker
63e6839142 combo boxes ported to new form code 2014-09-12 22:24:35 +02:00
Thijs Wenker
dd47b7afc6 Merge branch 'master' of https://github.com/highfidelity/hifi into 20017 
Conflicts:
	interface/src/scripting/WindowScriptingInterface.cpp
 2014-09-12 22:04:21 +02:00
Brad Hefta-Gaub
8602dbef78 Merge pull request #3400 from ey6es/master 
Allow skeletons to use blendshapes; provide default mappings for Mixamo models.  Also, generate mipmaps for all textures loaded from network.
 2014-09-12 12:55:47 -07:00
Stephen Birarda
88a75a3585 fix for goToUser from ChatWindow 2014-09-12 11:27:54 -07:00
Stephen Birarda
348bcdb37a resolve conflicts on merge with upstream master 2014-09-12 11:23:16 -07:00
Stephen Birarda
93ff34baaa force address bar lookup through handleLookupString 2014-09-12 11:21:38 -07:00
Stephen Birarda
ab7df8679d fix broken hifi linking 2014-09-12 11:19:22 -07:00
Stephen Birarda
b77a3f4904 cleanup application file event handler 2014-09-12 10:15:51 -07:00
Stephen Birarda
1f2020d169 some url handling repairs, move existing error reply handlers to new format 2014-09-12 10:13:33 -07:00
Stephen Birarda
7896119228 remap two goToUrl calls to AddressManager 2014-09-12 09:56:40 -07:00
Stephen Birarda
74295a3869 repairs for new location lookup 2014-09-12 09:52:34 -07:00
ZappoMan
e8c1cb7db8 read old format files correctly 2014-09-12 09:38:35 -07:00
Stephen Birarda
745edb8b0a fix error handling for location naming 2014-09-12 09:10:47 -07:00
ZappoMan
bc29848476 removed extra lines 2014-09-12 08:21:03 -07:00
ZappoMan
67f6f4c852 removed dead code 2014-09-12 08:19:46 -07:00
ZappoMan
024f1b47c2 Merge branch 'master' of https://github.com/highfidelity/hifi into stretchableEntities 
Conflicts:
	interface/src/entities/RenderableBoxEntityItem.cpp
	interface/src/entities/RenderableModelEntityItem.cpp
	libraries/entities/src/EntityTreeElement.cpp
	libraries/shared/src/Extents.h
 2014-09-12 08:18:09 -07:00
Andrew Meadows
645d573772 merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/Application.cpp
 2014-09-12 07:37:30 -07:00
Andrzej Kapolka
618f6415da Working on specular bits for deferred lighting. 2014-09-11 19:36:37 -07:00
Andrzej Kapolka
f954e4d7ea Fix for deferred lighting on voxels. 2014-09-11 19:06:29 -07:00
Andrzej Kapolka
76728e4fb1 Merge branch 'master' of https://github.com/highfidelity/hifi into deference 2014-09-11 18:07:33 -07:00
Andrzej Kapolka
e6f37544fd Use deferred lighting for voxels as well as metavoxels. 2014-09-11 18:06:56 -07:00
Philip Rosedale
8428b1a4ba Merge pull request #3401 from chansensturm/audio-noise 
New stereo audio panning object
 2014-09-11 17:53:55 -07:00
Stephen Birarda
5f6563f4c9 don't allow named location creation with no domain UUID 2014-09-11 17:42:04 -07:00
Craig Hansen-Sturm
ee0f8acaf4 Merge pull request #3396 from ZappoMan/someCleanup 
Some cleanup
 2014-09-11 17:38:40 -07:00
Stephen Birarda
7964180905 handle place creation at new API endpoint 2014-09-11 17:33:01 -07:00
Craig Hansen-Sturm
ecae9d5e85 compiler warnings 2014-09-11 17:20:15 -07:00
Stephen Birarda
b56ea5c936 centralize path creation from position and orientation to AddressManager 2014-09-11 17:17:47 -07:00
Thijs Wenker
807173ae0a the GlobalServices Events are functional now 2014-09-12 02:17:36 +02:00
Thijs Wenker
753dedce22 combobox support in the Window.form javascript function 
example: Window.form('combobox', {label: "yourcombobox", ["opt #1.", "opt #2.", "opt #3."]});
 2014-09-12 02:16:23 +02:00
Craig Hansen-Sturm
1d0ba52445 implemented new audio panning object which implements constant power sin^2+cos^2=1 law 2014-09-11 17:15:49 -07:00
ZappoMan
695569b64b reconcile use of getAACube() and handle rotations properly 2014-09-11 16:43:53 -07:00
Andrzej Kapolka
c2b58c9781 Move deferred lighting into its own class. 2014-09-11 16:39:17 -07:00
ZappoMan
9f4d199440 move bound proxy rendering to EntityTreeRedering, added helper functions for various bounding boxes 2014-09-11 15:36:13 -07:00
Andrzej Kapolka
1c50b32400 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-09-11 15:32:35 -07:00
Andrzej Kapolka
870b0c80cf Default blendshape mappings for Mixamo models. 2014-09-11 15:24:23 -07:00
Ryan Huffman
3724472758 Remove extra local variable in getCursorPosition 2014-09-11 15:20:41 -07:00
Andrew Meadows
2ffbdbec8c remove warning about extra tokens at end of #endif directive 2014-09-11 15:04:31 -07:00
Andrew Meadows
93864ee869 fix velocity drift of MyAvatar 2014-09-11 15:03:11 -07:00
Brad Hefta-Gaub
f33bd82ed8 Merge pull request #3395 from PhilipRosedale/master 
Updated move and butterfly scripts, entity renderer uses glutCube to temporarily fix crash
 2014-09-11 14:32:14 -07:00
Andrzej Kapolka
b731a234c2 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-09-11 14:15:51 -07:00
Stephen Birarda
52176786d0 use prefix and not postfix operator 2014-09-11 14:13:39 -07:00
Stephen Birarda
81758c9df6 fix for drive key clear enumeration 2014-09-11 14:12:23 -07:00
Andrzej Kapolka
df192e297c Apply blendshapes to skeleton as well as head. 2014-09-11 14:01:11 -07:00
Andrzej Kapolka
1adf3d2878 Go ahead and generate mipmaps for all network-loaded textures. It is the 
21st century, after all.
 2014-09-11 12:41:12 -07:00
ZappoMan
7db2930d91 remove calls to calculateRotatedExtents() use Extents.rotate() instead 2014-09-11 12:33:38 -07:00
ZappoMan
2757f16045 remove calls to calculateRotatedExtents() use Extents.rotate() instead 2014-09-11 12:29:47 -07:00
Philip Rosedale
d16b42ff47 Merge branch 'master' of https://github.com/worklist/hifi 2014-09-11 12:11:28 -07:00
Stephen Birarda
de24842cf0 fix stuck drive keys for Avatar when modifier released 2014-09-11 11:48:26 -07:00
Ryan Huffman
4315d63fb5 Merge branch 'master' of github.com:highfidelity/hifi into 19831 2014-09-11 11:13:13 -07:00
Stephen Birarda
aaabe6b1e1 handle domain changes via address bar 2014-09-11 10:45:45 -07:00
Stephen Birarda
dd1b23044f hook meta+enter up to address bar display 2014-09-11 10:24:04 -07:00
Stephen Birarda
71f2c0b542 initial addition of the AddressManager with location switch hooked up 2014-09-11 10:14:00 -07:00
AndrewMeadows
49af620665 Merge pull request #3393 from ey6es/master 
shared TextRenderer instances; hostname for Faceshift connection
 2014-09-11 09:20:47 -07:00
AndrewMeadows
d3d4717a92 Merge pull request #3385 from ctrlaltdavid/19933 
Code Review for Job #19933
 2014-09-11 08:39:51 -07:00
ZappoMan
f00947ada7 handle registration point in rendering of box, sphere, and model entities 2014-09-11 08:33:41 -07:00
Andrzej Kapolka
b1cfafdbe7 Missed a spot in the TextRenderer conversion. 2014-09-10 23:09:03 -07:00
Andrzej Kapolka
7b3d06a783 Add option to change Faceshift hostname. 2014-09-10 19:34:21 -07:00
Philip Rosedale
0078b45a8f update headMove to have optional concept of a room that we cannot escape, update and rename butterflies script 2014-09-10 19:00:24 -07:00
Andrzej Kapolka
de8dd4cecc Share instances of TextRenderer. 2014-09-10 18:55:36 -07:00
Andrzej Kapolka
8762073853 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-09-10 17:04:57 -07:00
Andrzej Kapolka
146a6526be Fix for Oculus mouse pointer. 2014-09-10 17:02:04 -07:00
Andrzej Kapolka
590c8042f8 Attempting to fix a bug in the Oculus overlay. 2014-09-10 16:36:32 -07:00
Craig Hansen-Sturm
ca4d1375f5 fix for recent stereo/mono and echo local server regression 2014-09-10 16:21:06 -07:00
Andrzej Kapolka
fe249ef348 Make sure the frustum that we use for culling contains the current camera 
information.
 2014-09-10 15:51:10 -07:00
Andrzej Kapolka
34ccc2ab7b Use the FBO dimensions, which may differ from the widget dimensions (as with 
the Oculus).
 2014-09-10 15:13:07 -07:00
Andrzej Kapolka
b328304da4 Up/down, not top/bottom. 2014-09-10 14:15:00 -07:00
Andrzej Kapolka
600f36aa64 Fix for Oculus API. 2014-09-10 14:14:02 -07:00
Andrzej Kapolka
423e6d0594 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-09-10 13:51:46 -07:00
Andrzej Kapolka
2cba7b37bf Attempting to fix 3DTV/Oculus deferred lighting/ambient occlusion. 2014-09-10 13:51:14 -07:00
Craig Hansen-Sturm
cb8e832257 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-windows 2014-09-10 13:14:21 -07:00
Craig Hansen-Sturm
015fdec6bd Merge branch 'audio-windows' of https://github.com/chansensturm/hifi into audio-windows 2014-09-10 13:05:52 -07:00
Andrzej Kapolka
c5ad603321 Fix for glow disabled in 3D TV mode. 2014-09-10 12:47:46 -07:00
Andrzej Kapolka
2fde67be72 Fix for deferred lighting with 3DTV (/Oculus, although I haven't tested that 
yet).
 2014-09-10 12:40:03 -07:00
wangyix
7a2897fb6b fixes/patches for win32/vs2013 startup and shutdown 2014-09-10 12:24:59 -07:00
ZappoMan
d4dad8f4d8 Merge branch 'master' of https://github.com/highfidelity/hifi into stretchableEntities 2014-09-10 10:45:57 -07:00
ZappoMan
53da483381 more work on visible, registration point, and rotational velocity 2014-09-10 09:05:46 -07:00
AndrewMeadows
f3b8d68c65 Merge pull request #3381 from chansensturm/audio-noise 
Hot FIX:  pulse audio input device frame size
 2014-09-10 08:25:42 -07:00
Thijs Wenker
cb907c1891 GlobalServicesScriptingInterface added, functions and properties functional 2014-09-10 13:57:38 +02:00
ZappoMan
a100630e47 add support for non blocking forms 2014-09-09 17:52:06 -07:00
ZappoMan
3d066de169 add support for non blocking forms 2014-09-09 17:42:30 -07:00
Andrew Meadows
4da1ca22ba Add RayIntersectionInfo and use for shape-vs-ray 2014-09-09 17:35:06 -07:00
ZappoMan
b78b8ccbb0 first cut at replacing radius with dimensions 2014-09-09 13:33:05 -07:00
AndrewMeadows
c815ee53c9 Merge pull request #3379 from ctrlaltdavid/20018 
Code Review for Job #20018
 2014-09-09 12:01:52 -07:00
Andrzej Kapolka
a777566b01 Support for loading (16-bit, unsigned, little-endian, square) raw depth maps 
with configurable offset/scale (defaults to normalized).
 2014-09-08 18:50:30 -07:00
Craig Hansen-Sturm
87a6d5921f Merge branch 'master' of https://github.com/highfidelity/hifi into audio-noise 2014-09-08 17:55:01 -07:00
David Rowe
6d5f645299 Limit avatar head and body models in preferences to FST files (or blank) 2014-09-08 15:57:20 -07:00
Philip Rosedale
171d9ec49e Merge pull request #3380 from AndrewMeadows/inertia 
fix residual velocity on teleport
 2014-09-08 15:51:51 -07:00
Andrzej Kapolka
a9eb35448a Comment fix. 2014-09-08 15:39:20 -07:00
Craig Hansen-Sturm
424cffcd99 remove stray debugging info 2014-09-08 15:33:24 -07:00
Andrzej Kapolka
f69324f270 Fix for display name. 2014-09-08 15:29:36 -07:00
Craig Hansen-Sturm
cb4aab3902 allocate 8x buffer size (for pulse audio) / more audioGain loop unrolling w/frame alignment check 2014-09-08 15:28:55 -07:00
Andrew Meadows
6fc1c2540c fix residual velocity on teleport 2014-09-08 15:24:02 -07:00
Andrzej Kapolka
f2535d4df8 Adjust avatar names for device pixel ratio. 2014-09-08 15:23:08 -07:00
Andrzej Kapolka
5dfa22f3fd Adjusting font sizes. 2014-09-08 15:11:25 -07:00
Andrzej Kapolka
57bdc410a5 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-09-08 15:04:07 -07:00
AndrewMeadows
303bf3b29d Merge pull request #3378 from chansensturm/audio-noise 
Hot FIX:  update audio input device max buffer size
 2014-09-08 14:40:21 -07:00
Craig Hansen-Sturm
04eca22a50 allocate 4x initial input buffer size 2014-09-08 14:28:53 -07:00
Andrzej Kapolka
e9964c71c9 Fix for rear view mirror. 2014-09-08 14:13:28 -07:00
Andrzej Kapolka
1ef9126482 Migrating to device-independent coordinates. 2014-09-08 13:59:19 -07:00
Andrzej Kapolka
be6973b028 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-09-08 13:58:50 -07:00
Clément Brisset
51e01bc6bc Merge pull request #3377 from AndrewMeadows/inertia 
fix for flickering avatars
 2014-09-08 13:37:55 -07:00
Andrzej Kapolka
dc396e5687 Starting on bringing the overlay back to device-independent coordinates. 2014-09-08 13:36:02 -07:00
Andrew Meadows
15025bf8d8 fix for flickering avatars 2014-09-08 13:08:08 -07:00
Andrzej Kapolka
b9c91b4cfc Fix for metrics. 2014-09-08 12:26:28 -07:00
Andrzej Kapolka
2d41540dbc Fix for default point size. 2014-09-08 12:23:13 -07:00
Andrzej Kapolka
f60cea7935 Double the point size on "Retina" displays. 2014-09-08 12:10:53 -07:00
David Rowe
999fac785a Add and use Leap Motion controller releasing at script ending 2014-09-08 11:34:41 -07:00
Brad Hefta-Gaub
8068117f0c Merge pull request #3368 from chansensturm/audio-noise 
New Audio Buffer, Format, Tone Generator, Pink Noise Generator, and Gain objects
 2014-09-08 11:28:02 -07:00
Craig Hansen-Sturm
431fcbcf6c coding standard / SLOT selectAudioSourceSine440 linkage / tone gen amplitude parameter 2014-09-08 11:18:14 -07:00
Andrew Meadows
c9d5508f16 merge upstream/master into andrew/ragdoll 2014-09-08 10:21:32 -07:00
Brad Hefta-Gaub
fe3f0cd358 Merge pull request #3355 from stojce/19964 
Code Review for Job #19964
 2014-09-06 15:43:27 -07:00
Brad Hefta-Gaub
d342f9281f Merge pull request #3357 from huffman/19968 
Code Review for Job #19968
 2014-09-06 15:42:02 -07:00
Brad Hefta-Gaub
a77739f31c Merge pull request #3369 from ctrlaltdavid/20007 
Code Review for Job #20007
 2014-09-06 15:36:29 -07:00
David Rowe
5ebe6962a4 Make scripts loaded with Script.load() not persist 2014-09-06 09:59:47 -07:00
Craig Hansen-Sturm
f309875069 formatting/renaming 2014-09-06 02:50:37 -07:00
Craig Hansen-Sturm
7a5ec429d1 audio rendering loop now uses input-gain, tone-generator, noise-generator, and post-generator-gain objects / audiobuffer object now shared between all new audio objects / zero buffer copy between new objects / inline tone-generator code removed / new audio options for generators 2014-09-06 02:29:48 -07:00
Craig Hansen-Sturm
1cdb01e072 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-noise 2014-09-05 18:31:02 -07:00
Craig Hansen-Sturm
68fa44f845 audio menu changes to support tone and noise generators 2014-09-05 18:30:39 -07:00
Andrzej Kapolka
c9d22ea07e Merge branch 'master' of https://github.com/highfidelity/hifi 2014-09-05 18:04:15 -07:00
Andrew Meadows
bd8fc75305 fix bug: zero velocity when teleporting to new locations 2014-09-05 17:51:18 -07:00
Andrzej Kapolka
0b2d0a0b07 Fix for mouse events. 2014-09-05 17:30:19 -07:00
Andrew Meadows
1d7ac23aa1 removed signed/unsigned comparison 2014-09-05 17:10:13 -07:00
Andrzej Kapolka
c2cd23a54c Mouse coordinate fix. 2014-09-05 17:07:37 -07:00
Andrew Meadows
5c75b53c0d removed singed/unsigned comparisons 2014-09-05 17:06:42 -07:00
Andrzej Kapolka
5bdad18ade Merge branch 'master' of https://github.com/highfidelity/hifi 2014-09-05 16:45:15 -07:00
Andrzej Kapolka
7f6b3d3649 Dimension fixes for Retina displays. 2014-09-05 16:44:45 -07:00
Andrew Meadows
6f22ff01d9 merge upstream/master into andrew/ragdoll 2014-09-05 16:04:01 -07:00
Philip Rosedale
b311017c9a Merge pull request #3361 from AndrewMeadows/inertia 
expose the _measured_ MyAvatar.getVelocity() to JS
 2014-09-05 15:34:34 -07:00
Andrew Meadows
b953d880a3 minor optimization on CubeList and VoxelPool 2014-09-05 14:41:18 -07:00
Andrzej Kapolka
37b4fe5166 Fix for deferred lighting/ambient occlusion when glow effect is disabled. 2014-09-05 14:16:12 -07:00
Andrew Meadows
9c2bfa35f7 restore position integration in Avatar::simulate() 2014-09-05 14:10:10 -07:00
Andrzej Kapolka
98c51f87d2 Make sure edit colors are either 100% opaque or 100% transparent. 2014-09-05 14:00:27 -07:00
Andrzej Kapolka
b278857091 Wireframe option, fix for shadow menu group. 2014-09-05 13:51:22 -07:00
Ryan Huffman
1088550ed7 Add Window.x/y 2014-09-05 11:49:36 -07:00
Andrew Meadows
ff09a0d41b merge upstream/master into andrew/inerita 2014-09-05 11:47:49 -07:00
Andrew Meadows
7be411b4ca expose _measured_ MyAvatar velocity to JS 2014-09-05 11:44:13 -07:00
Ryan Huffman
e590f992f6 Merge branch 'master' of git://github.com/highfidelity/hifi into 19831 2014-09-05 10:18:02 -07:00
Brad Hefta-Gaub
9648c0d64e Merge pull request #3343 from AndrewMeadows/ragdoll 
Ragdoll Part 12: first pass avatar skeleton collides with voxels
 2014-09-04 23:09:08 -07:00
stojce
3339b92a49 Merge branch 'master' of https://github.com/highfidelity/hifi into 19964 2014-09-05 07:45:55 +02:00
Andrzej Kapolka
c340445f33 Hopefully, a fix for the Windows build; looks like "near" is a keyword. 2014-09-04 17:42:33 -07:00
Andrzej Kapolka
b275af48ed Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-09-04 17:26:34 -07:00
Andrzej Kapolka
137d3738fc Fix for preview render. 2014-09-04 17:23:09 -07:00
Andrzej Kapolka
21f3f2b90e Switch to deferred lighting for metavoxels. 2014-09-04 17:17:44 -07:00
Andrew Meadows
27621b316d clarify how the size of the cube is computed 2014-09-04 15:41:24 -07:00
Andrew Meadows
faf31f268e use QHash, not QVector, for Octree content query 2014-09-04 15:20:07 -07:00
Ryan Huffman
d54dc5f2aa Merge branch 'master' of github.com:highfidelity/hifi into 19935 
Conflicts:
	interface/src/Menu.h
 2014-09-04 12:05:17 -07:00
Clément Brisset
cc6d70c5ab Merge pull request #3336 from huffman/19995 
Code Review for Job #19995
 2014-09-04 11:37:35 -07:00
stojce
6d38904adb Merge branch 'master' of https://github.com/highfidelity/hifi into 19964 2014-09-04 20:06:55 +02:00
Ryan Huffman
2b5759bb39 Update chat to close on ESC 2014-09-04 10:53:51 -07:00
Brad Hefta-Gaub
0d69122ec1 Merge pull request #3344 from huffman/19944 
Code Review for Job #19944
 2014-09-04 10:25:53 -07:00
Andrew Meadows
1e19566e93 fix for bad avatar bounding shape on resize 2014-09-04 09:53:07 -07:00
Ryan Huffman
51e616d122 Add margin to chat window for titlebar + menu 2014-09-04 07:20:27 -07:00
Ryan Huffman
bbc1bbdf47 Merge branch 'master' of github.com:highfidelity/hifi into 19968 2014-09-04 06:56:37 -07:00
AndrewMeadows
8223481ecb Merge pull request #3341 from huffman/19967 
Code Review for Job #19967
 2014-09-03 16:51:19 -07:00
stojce
f12f45adec Layout fixes 2014-09-04 00:55:36 +02:00
Andrew Meadows
e120697a9b merge upstream/master into andrew/ragdoll 2014-09-03 15:49:32 -07:00
AndrewMeadows
bd55da4a83 Merge pull request #3335 from ZappoMan/virtualEntities 
Model Server to Entity Server Refactoring
 2014-09-03 15:48:58 -07:00
Andrzej Kapolka
a02656070f Added some comments. 2014-09-03 14:43:11 -07:00
Andrzej Kapolka
686ad4f0ec Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-09-03 14:43:01 -07:00
Andrew Meadows
4270c4d989 merge upstream/master into andrew/ragdoll 2014-09-03 14:42:17 -07:00
Andrzej Kapolka
0bd800faf2 Starting on materials attributes, fixed bug with Hermite deltas. 2014-09-03 14:09:04 -07:00
stojce
e5e2960826 Merge branch 'master' of https://github.com/highfidelity/hifi into 19964 2014-09-03 22:29:12 +02:00
Andrew Meadows
2c1aa31d1e give MyAvatar a VoxelShapeManager member 2014-09-03 13:19:41 -07:00
Andrew Meadows
83e04a0e8f add VoxelShapeManager class 2014-09-03 13:19:14 -07:00
ZappoMan
25e8c7d3f1 useless semicolon removal 2014-09-03 12:22:02 -07:00
Ryan Huffman
d4ebe577df Remove commented out icons 2014-09-03 08:28:25 -07:00
MarcelEdward
9662dced09 This patch updates the MyAvatar.cpp file. 
It adds a check MyAvatar::goToLocationFromResponse to see if the user is online, if the teleport to the avatar is done and if not a message is shown which said that the user is not online
 2014-09-03 16:59:00 +02:00
MarcelEdward
e62834c197 This patch updates Application::updateLocationInServer() in Application.cpp 
The online status is updated when the position is send to the data web, a avatar gets an offline status if the data web did not get an update in the last 30 seconds.
This function had an LastLocationObject in which only send in the location info to the data web in case the location changed.

Removed the last location so the position of the avatar is send to the data web every 5 seconds, so that the online status remains online if the avatar is still online and does not switch to offline when the avatar does not move.
 2014-09-03 16:43:39 +02:00
ZappoMan
835071ab06 tweak rendering of model entities without valid models to be cubes 2014-09-02 19:21:15 -07:00
ZappoMan
a555eeda23 CR feedback and warning fixes 2014-09-02 18:43:16 -07:00
Andrzej Kapolka
33faffd9d4 Sphere tools for voxel editing. 2014-09-02 17:45:37 -07:00
Ryan Huffman
55acff02a1 Update RunningScripts height to take menu bar into account 2014-09-02 14:13:42 -07:00
Andrzej Kapolka
926f0d099c Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-09-02 14:03:48 -07:00
Andrzej Kapolka
34ba5cc31f More shader fixes. 2014-09-02 13:54:47 -07:00
Ryan Huffman
67cefc8d54 Reduce height of RunningScripts so titlebar is inside main window 2014-09-02 13:12:52 -07:00
Andrzej Kapolka
4e561c69b9 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-09-02 12:32:57 -07:00
Andrzej Kapolka
bf5e5fd72c Quick fix for base colors underneath terrain. 2014-09-02 12:31:25 -07:00
Andrzej Kapolka
50a250ce01 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-09-02 12:03:47 -07:00
ZappoMan
033017346c removed debug code 2014-09-02 08:53:19 -07:00
Ryan Huffman
ece3390b4e Fix bug with dropping hifi images not working on Windows 
URLs on Windows included three forward-slashes, ex `file:///C:...`.
Using `toLocalFile()` correctly stringifies the location.
 2014-09-01 22:14:28 -07:00
Ryan Huffman
936a9fad47 Disable icons on RunningScripts buttons 2014-08-31 12:28:45 -07:00
Ryan Huffman
2283b68dba Remove 'recently loaded' widgets from RunningScripts 2014-08-31 11:31:45 -07:00
Ryan Huffman
ce0e0a9c59 Remove custom background, font, and button styles on RunningScripts 2014-08-31 11:30:26 -07:00
ZappoMan
d1a046e6ed properly handle LOD in rendering by not rendering small entities 2014-08-29 21:18:31 -07:00
Andrzej Kapolka
fa06bef556 More dual contour bits. 2014-08-29 18:00:11 -07:00
ZappoMan
2fab662e8c fixed some problems in UpdateEntityOperator in case where original containing element isn't best fit 2014-08-29 17:48:14 -07:00
Andrew Meadows
aeb355e3da re-enabling legacy avatar-vs-voxel collisions 
so that I don't break anything when this merges with upstream
 2014-08-29 15:53:20 -07:00
Andrew Meadows
ebcc960ec7 merge upstream/master into andrew/ragdoll 2014-08-29 15:48:40 -07:00
Andrzej Kapolka
120563951d Fixed bug in edge vertex generation. 2014-08-29 12:10:25 -07:00
stojce
ce6a312813 Fix preferences dialog layout 2014-08-29 19:50:39 +02:00
stojce
b527966db8 Merge branch 'master' of https://github.com/highfidelity/hifi into 19964 
Conflicts:
	interface/ui/preferencesDialog.ui
 2014-08-29 08:46:02 +02:00
ZappoMan
2bcad6ab2b Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	assignment-client/src/Agent.cpp
	examples/editModels.js
 2014-08-28 21:19:56 -07:00
Andrzej Kapolka
78a03fb31a More progress toward dual contour rendering. 2014-08-28 20:01:55 -07:00
ZappoMan
de968ba4f6 fix the issue with moving entities not being simulated makes motion smoother 2014-08-28 16:44:52 -07:00
ZappoMan
c66ef90ca0 fix Model mew/delete and thread issues 2014-08-28 16:27:46 -07:00
Andrzej Kapolka
f02f95c460 Hermite data computation. 2014-08-28 14:53:48 -07:00
Stephen Birarda
29ed1b3fcd Merge pull request #3331 from ctrlaltdavid/19961 
Code Review for Job #19961
 2014-08-28 14:30:01 -07:00
David Rowe
1d3a176f5f Rename method 2014-08-28 13:53:47 -07:00
ZappoMan
76c77d6994 first cut at properly working lifetime 2014-08-28 13:46:54 -07:00
David Rowe
85e9f8064a Simplify to use bool instead of storing domain name 2014-08-28 12:21:55 -07:00
David Rowe
46c1a9d59a Make login dialog automatically show only once per domain visit 2014-08-28 11:25:13 -07:00
Stephen Birarda
cc2a35c2a8 handle not found errors returned for addresses from data-web 2014-08-28 10:54:05 -07:00
Andrzej Kapolka
96b4a1080c More voxel editing bits. 2014-08-27 18:15:29 -07:00
Atlante45
2448229b46 fix for crash in Audio 2014-08-27 16:03:53 -07:00
ZappoMan
2f90df04ee correct cleanup of Models/geometry and all EntityItems for various cases 2014-08-27 15:45:45 -07:00
Andrzej Kapolka
9a4d56b4e9 Working on voxel bits. 2014-08-27 14:41:23 -07:00
ZappoMan
ed6363ca02 fixed bug in processing of entity erase messages 2014-08-27 14:21:06 -07:00
Andrew Meadows
c6253bb51a AACube vs Sphere and Capsule collision tests 
Sphere is unit tested.
Also removed the shape collision query against Octree
 2014-08-27 12:09:41 -07:00
ZappoMan
5c2b674a0d verify delete behavior actually frees memory associated with EntityItems 2014-08-27 12:07:11 -07:00
Ryan Huffman
f1aaea0ffa Fix bug with chat scrolling randomly 2014-08-27 12:05:57 -07:00
ZappoMan
30e00bbd69 final pass on entities import/export/overlays working as well as production 2014-08-27 11:34:50 -07:00
Brad Hefta-Gaub
e8c3125985 Merge pull request #3323 from chansensturm/wangyix-qt_stats_for_audiomixer 
Merge of Yixin's PR #3281 to head
 2014-08-27 11:14:52 -07:00
Craig Hansen-Sturm
e941e58626 merge HEAD with PR-3281 2014-08-26 18:25:40 -07:00
Andrzej Kapolka
e87556450e More voxel edit bits. 2014-08-26 18:02:55 -07:00
Andrzej Kapolka
9c0888afff Working on voxel edits. 2014-08-26 17:15:02 -07:00
ZappoMan
b14158385c first cut at getting pastEntities() working 2014-08-26 16:47:32 -07:00
ZappoMan
4895ee32f7 test and fix issues with exportEntities() 2014-08-26 15:59:49 -07:00
Atlante45
3826ed0d69 Added setFinalPitch/Yaw/Roll to HeadData 2014-08-26 15:36:08 -07:00
Atlante45
9e686b4096 Moved lean and head rotation inside Player class 2014-08-26 14:36:46 -07:00
Andrzej Kapolka
4f730e4185 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-08-26 11:35:23 -07:00
ZappoMan
ef8feec91a fix referentials corruption and removed some debugging 2014-08-26 10:42:46 -07:00
Ryan Huffman
e38d8f7afd Update all locations that update settings to call bumpSettings() 2014-08-26 07:47:22 -07:00
Andrzej Kapolka
e454a08e57 HeightfieldTexture -> MaterialObject (we want to use it for voxels, too, and 
eventually include components other than diffuse color).
 2014-08-25 18:57:45 -07:00
Atlante45
cf14af0766 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-08-25 18:54:41 -07:00
Brad Hefta-Gaub
a51cace167 Merge pull request #3319 from Atlante45/sitting_points_not_disappearing_when_switching_to_fake_domain 
fix sitting points on domain switch
 2014-08-25 18:42:19 -07:00
Atlante45
1acce5c725 fix sitting points on domain switch 2014-08-25 18:02:30 -07:00
Andrzej Kapolka
14ed281528 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-08-25 15:44:31 -07:00
Andrzej Kapolka
7aa2a1d53f Working on voxel representations. 2014-08-25 15:44:12 -07:00
Andrzej Kapolka
e29a4e7683 Merge pull request #3312 from AndrewMeadows/ragdoll 
use dispatchTable for shape-vs-shape collision queries
 2014-08-25 15:43:48 -07:00
Andrew Meadows
8057071c12 put averageColor init closer to where it is used 2014-08-25 15:18:57 -07:00
Andrew Meadows
3ad9797607 fix crash: divide by zero when computing avg color 2014-08-25 15:15:27 -07:00
ZappoMan
4e38cb7c68 more debugging of referentials 2014-08-25 15:12:29 -07:00
ZappoMan
d6873f7b6c added some debugging for referentials 2014-08-25 14:48:08 -07:00
ZappoMan
1764839223 get basics of referentials working 2014-08-25 14:07:01 -07:00
Brad Hefta-Gaub
fe1a333ede Merge pull request #3316 from chansensturm/master 
add support for head-shadow/penumbra filter for positional audio streams
 2014-08-25 13:19:53 -07:00
Atlante45
88c8e5124e Merge branch 'master' of github.com:Atlante45/hifi 2014-08-25 12:47:01 -07:00
Andrzej Kapolka
6fbde0f42b Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-08-25 11:39:21 -07:00
Andrzej Kapolka
28f9af695e Load splat texture as such when painting. 2014-08-25 11:34:41 -07:00
ZappoMan
58759d344f cleanup in prep for PR 2014-08-25 10:56:43 -07:00
Andrew Meadows
6cdee21a50 fix for clearJointData() in JS scripts 
let the JointState class verify animation priority
 2014-08-25 10:40:28 -07:00
Craig Hansen-Sturm
848144d98c Merge remote-tracking branch 'upstream/master' 2014-08-24 22:17:30 -07:00
Craig Hansen-Sturm
4cd1f4afef add support for head-shadow/penumbra filter for positional audio streams 2014-08-24 22:17:07 -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
stojce
7e250bc899 Remove custom styling 2014-08-23 00:16:25 +02:00
ZappoMan
0207649d0c debug cleanup 2014-08-22 10:54:05 -07:00
Andrzej Kapolka
5c77317cfd Fix for flashing when painting textures. 2014-08-21 18:07:30 -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
Ryan Huffman
31d198a7a9 Remove custom behavior from chat window 2014-08-21 15:37:12 -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
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
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
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