Commit graph

16671 commits

Author SHA1 Message Date
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
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
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
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
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
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
Ryan Huffman
113e9cf43b Remove use of Quat::rotate 2014-09-12 13:31:07 -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
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
Stephen Birarda
892e0e7cbf fix node auth url, NAN break on windows 2014-09-12 11:43:50 -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
1084483dd5 fix for default param of default constructed quat 2014-09-12 11:22:34 -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
ZappoMan
45fc8423ba move getRadius to public for now 2014-09-12 10:26:47 -07:00
ZappoMan
64e2033b30 move getRadius to public for now 2014-09-12 10:26:24 -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