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

16906 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
4d80417e3c don't rename the config file to settings so existing nodes work 2014-09-14 09:45:02 -07:00
Stephen Birarda
cb7a6a7af5 don't blindly return all values if a type is not passed 2014-09-14 09:43:55 -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
Craig Hansen-Sturm
6433616703 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-noise 2014-09-13 12:11:07 -07:00
ZappoMan
ac27c36c3d one more shot at these warnings 2014-09-13 09:40:44 -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
04772f6e5d fix more signed/unsigned warnings 2014-09-13 09:09:18 -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
ZappoMan
4ae3360f83 fix warning 2014-09-13 08:50:52 -07:00
ZappoMan
be8994f3a3 attempt to fix warning 2014-09-13 08:47:18 -07:00
ZappoMan
e76ffb2ecb fixed another warning 2014-09-13 08:44:13 -07:00
ZappoMan
64479b067e fix more warnings, replace assert with debug message 2014-09-13 08:21:23 -07:00
ZappoMan
51b66bdee3 fixed warnings and converted several asserts to debug messages 2014-09-13 08:14:31 -07:00
ZappoMan
d10bd6857d add use of missingSet in release build to silence warning 2014-09-13 08:02:38 -07:00
ZappoMan
c5e02c4ec5 removed unused lastAttemptedSubTree 2014-09-13 07:58:49 -07:00
ZappoMan
973479d1ac fix warning in ByteCountCoded<> 2014-09-13 07:57:45 -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
Craig Hansen-Sturm
09370840d5 coding standard 2014-09-13 00:35:02 -07:00
Brad Hefta-Gaub
6bc4275809 Merge pull request #3409 from AndrewMeadows/inertia 
fix build for no XMPP
 2014-09-12 18:57:20 -07:00
Craig Hansen-Sturm
2c7d15c01b disable input gain/mute 2014-09-12 18:32:28 -07:00
Craig Hansen-Sturm
2f8ef6b4fb new head penumbra gain calculations 2014-09-12 18:31:33 -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
Andrew Meadows
32b07027d3 namechange planeNormal --> faceNormal 2014-09-12 17:27:56 -07:00
Philip Rosedale
275533d7fb Merge branch 'master' of https://github.com/worklist/hifi 2014-09-12 17:03:55 -07:00
AndrewMeadows
27b8d7076b Merge pull request #3408 from ey6es/master 
Slight fix for Blender fix.
 2014-09-12 16:00:53 -07:00
Andrzej Kapolka
7f31b4563c Merge branch 'master' of https://github.com/highfidelity/hifi 2014-09-12 15:35:46 -07:00
Philip Rosedale
7473f91595 Merge branch 'master' of https://github.com/worklist/hifi 2014-09-12 15:35:08 -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
Philip Rosedale
4c9dbad779 Merge pull request #3406 from birarda/master 
handle location lookup for offline user or not found
 2014-09-12 15:31:23 -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
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
089a17b5b1 Merge branch 'master' of https://github.com/worklist/hifi 2014-09-12 13:59:33 -07:00
Philip Rosedale
3fbe183196 Merge pull request #3402 from ZappoMan/stretchableEntities 
New Entities Features
 2014-09-12 13:57:45 -07:00
Thijs Wenker
1838272d73 moved back butterflies.js , did I do it right? 2014-09-12 22:53:53 +02:00
Philip Rosedale
ce9672f40c Merge branch 'master' of https://github.com/worklist/hifi 2014-09-12 13:46:51 -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