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

8816 commits

Author SHA1 Message Date
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
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
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