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

8902 commits

Author SHA1 Message Date
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
9820e73c8e layout tweaks 2014-09-04 20:15:54 +02: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
f07f270dee restore default buttons events 2014-09-04 01:22:17 +02: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
Ryan Huffman
e6def6e35b Fix spacing on RunningScripts 2014-09-02 14:01:24 -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
Ryan Huffman
a95b670716 Update RunningScripts style: font, spacing, title 2014-09-02 12:37:51 -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
9e510632b9 Remove box styling from RunningScripts 2014-08-31 12:29:54 -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
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
David Rowe
cd81d6fc07 Bring libovr build instructions up to date 2014-08-21 19:24:09 -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
ZappoMan
ef86d86234 split out entity rendering into subclasses, improved rendering of models 2014-08-20 15:49:50 -07:00
Atlante45
4922592cfa Debug tweaks 2014-08-20 15:21:33 -07:00
Andrzej Kapolka
416d9bac2e Working on texture rendering. 2014-08-20 14:48:02 -07:00
Andrew Meadows
a01d3781d9 simplified SkeletonModel::maybeUpdateLeanRotation() 2014-08-20 12:48:52 -07:00
Clément Brisset
c76afe7d4a Merge pull request #3298 from PhilipRosedale/master 
First cut of Spacebar-to-fly with Oculus and Faceshift, stabilize Faceshift head jittering
 2014-08-20 10:16:25 -07:00
Philip Rosedale
5e94070aa0 Merge pull request #3304 from huffman/19864 
Add AppKit as a dependency in interface CMakeLists.txt
 2014-08-19 22:31:54 -07:00
Ryan Huffman
6b1671c598 Add AppKit as a dependency in interface CMakeLists.txt 2014-08-19 22:17:09 -07:00
Philip Rosedale
8e958b49c0 Merge pull request #3303 from Atlante45/record_feature 
Record feature JS API + File Format
 2014-08-19 21:25:18 -07:00
Philip Rosedale
c68ed81691 fixes per code review 2014-08-19 20:54:08 -07:00
Philip Rosedale
8e024982d5 Merge pull request #3301 from huffman/19864 
Code Review for Job #19864
 2014-08-19 20:48:30 -07:00
Ryan Huffman
3d940469de Increase display name drawing distance 2014-08-19 19:41:31 -07:00
Ryan Huffman
42de56381a Update blue audio sphere name and angle to draw at 2014-08-19 19:40:27 -07:00
Ryan Huffman
3b7260c434 Fix blue audio sphere not showing correctly 2014-08-19 19:22:11 -07:00
Ryan Huffman
8bc5f86666 Add Audio Sphere menu option 2014-08-19 19:21:53 -07:00
Atlante45
72c60ee69c Remove used variable 2014-08-19 19:01:50 -07:00
Andrzej Kapolka
7cf7f188f8 Yet more texture bits. 2014-08-19 18:55:18 -07:00
Atlante45
c21d1a41e5 Removed debug messages 2014-08-19 18:30:14 -07:00
Andrew Meadows
8c4f0968d8 remove unused JointState::setRotation() method 2014-08-19 17:33:06 -07:00
Andrew Meadows
1a8a2d9156 Add Avatar submenu to main menu for non-debug stuff 2014-08-19 17:26:01 -07:00
Atlante45
b028b845f4 Fox audio recording not being triggerred from JS 2014-08-19 17:22:05 -07:00
Atlante45
b13604f968 JS API for recording 2014-08-19 16:43:26 -07:00
Atlante45
db8869a34d File format implementation + threading tweaks 2014-08-19 16:42:43 -07:00
Philip Rosedale
d685e5c8b9 Added roll strafe, pitch ascend, more tuning movement 2014-08-19 16:05:01 -07:00
Andrzej Kapolka
3136e4df76 More texture progress. 2014-08-19 15:28:15 -07:00
Andrzej Kapolka
a9c4ce2a6a Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-08-19 14:21:42 -07:00
Andrzej Kapolka
e854656a7f Rather than using a boolean to indicate "colorness," use a different class. 
More texture bits.
 2014-08-19 14:20:47 -07:00
Ryan Huffman
284c4d8ac0 Merge branch 'master' of github.com:highfidelity/hifi into 19864 
Conflicts:
	interface/CMakeLists.txt
 2014-08-19 11:59:53 -07:00
Andrew Meadows
f511fe2657 Ragdoll cannot assume skeleton's rootIndex is 0 
some Models have extra "joints" not part of the normal skeleton
 2014-08-19 11:31:50 -07:00
Philip Rosedale
8fe1457776 removed unneeded audio and light stats from main stats screen 2014-08-19 10:14:13 -07:00
Philip Rosedale
1d13a6c05d Stabilize face shift head camera movement with velocity filtering 2014-08-19 09:37:11 -07:00
Philip Rosedale
9d44f5e4f7 measure face shift frame time rather than use constant 2014-08-19 08:18:19 -07:00
Philip Rosedale
7b86f668a6 Add SPACE to scripting JS, change reset to apostrophe 2014-08-18 23:22:55 -07:00
Philip Rosedale
8d2433382a Merge branch 'master' of https://github.com/worklist/hifi 2014-08-18 21:32:48 -07:00
Philip Rosedale
39b370979c JS calls for head motion/rotation that allow avatar flying with head movement 2014-08-18 21:32:40 -07:00
Atlante45
29830916ba Fix bug introduced in CR 2014-08-18 21:06:32 -07:00
Andrzej Kapolka
23a4c21ce1 Only allow heightfield brushes on heightfield attributes. 2014-08-18 18:29:19 -07:00
Andrzej Kapolka
5b8ff07449 Working on heightfield textures. 2014-08-18 18:21:48 -07:00
Atlante45
c113dd350e Moved members to MyAvatar 2014-08-18 16:25:38 -07:00
Atlante45
698699dea8 CR 2014-08-18 15:56:27 -07:00
Atlante45
6d567e67a9 Merge branch 'master' of https://github.com/highfidelity/hifi into record_feature 2014-08-18 15:41:19 -07:00
Clément Brisset
bec149ebb9 Merge pull request #3295 from AndrewMeadows/ragdoll 
Ragdoll Part 11: ragdoll collisions move avatar
 2014-08-18 15:38:25 -07:00