Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 22:19:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
16552 commits 75 branches 59 tags 1.2 GiB
Commit graph

16552 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Brad Hefta-Gaub
c76749448a Merge pull request #3398 from AndrewMeadows/inertia 
fix velocity drift of MyAvatar
 2014-09-12 12:53:51 -07:00
Brad Hefta-Gaub
16d4563af0 Merge pull request #3383 from Adrianl3d/19977 
Code Review for Job #19977
 2014-09-12 12:53:28 -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
Craig Hansen-Sturm
ee0f8acaf4 Merge pull request #3396 from ZappoMan/someCleanup 
Some cleanup
 2014-09-11 17:38:40 -07:00
Thijs Wenker
e62380a171 globalServicesExample.js 2014-09-12 02:23:25 +02:00
Craig Hansen-Sturm
ecae9d5e85 compiler warnings 2014-09-11 17:20:15 -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
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
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
afef42509d Merge pull request #3397 from birarda/fix-stuck-drive-key 
fix for MyAvatar save crash
 2014-09-11 14:13:45 -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
ceb1740f38 handy conversions between AABox, AACube, and Extents 2014-09-11 12:33:24 -07:00
ZappoMan
a022d47792 improve constness for operators on PropertyFlags<> 2014-09-11 12:33:04 -07:00
ZappoMan
f88970f8fe moved Extents to shared 2014-09-11 12:32:47 -07:00
Philip Rosedale
5c77040235 remove debug print 2014-09-11 12:15:02 -07:00
Philip Rosedale
d16b42ff47 Merge branch 'master' of https://github.com/worklist/hifi 2014-09-11 12:11:28 -07:00
Philip Rosedale
385c88619a Merge pull request #3394 from birarda/fix-stuck-drive-key 
fix for avatar drive keys
 2014-09-11 12:09:37 -07:00
Craig Hansen-Sturm
0cc586d49f Merge branch 'master' of https://github.com/highfidelity/hifi into audio-noise 2014-09-11 11:59:59 -07:00
Stephen Birarda
de24842cf0 fix stuck drive keys for Avatar when modifier released 2014-09-11 11:48:26 -07:00
AndrewMeadows
0e4de53c99 Merge pull request #3391 from chansensturm/audio-windows 
log audio device framing errors, don't assert
 2014-09-11 11:23:06 -07:00
Craig Hansen-Sturm
893d4686db comments 2014-09-11 11:18:05 -07:00
Craig Hansen-Sturm
0d5f28c7df audio buffer framing issue / comments 2014-09-11 11:05:27 -07:00
Craig Hansen-Sturm
63b8dd2d77 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-windows 2014-09-11 10:43:01 -07:00
Craig Hansen-Sturm
f3e618bfb9 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-noise 2014-09-11 10:39:17 -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
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
634bfe5e1d remove renamed script 2014-09-10 19:02:22 -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
Philip Rosedale
2216f89b8d Merge pull request #3392 from ey6es/master 
Fixes for 3DTV/Oculus (deferred lighting/ambient occlusion/glow/culling/pointers).
 2014-09-10 17:43:53 -07:00
Craig Hansen-Sturm
bc29c73d61 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-noise 2014-09-10 17:35:42 -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
Craig Hansen-Sturm
18975aef57 log audio device framing errors, copy as much data as we can, but don't assert 2014-09-10 16:48:35 -07:00
Philip Rosedale
07eba40e33 Merge pull request #3390 from chansensturm/audio-windows 
Fix for stereo/mono and echo local server regression
 2014-09-10 16:40:51 -07:00