Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-10 12:18:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
12225 commits 25 branches 0 tags 1.1 GiB
Commit graph

6501 commits

Author SHA1 Message Date
ZappoMan
22f7facc4e first cut at new version of audio refelctor 2014-04-13 19:41:54 -07:00
ZappoMan
030de00e88 first cut at new version of audio refelctor 2014-04-13 19:11:25 -07:00
ZappoMan
38dbc56d1a first cut at new version of audio refelctor 2014-04-13 19:09:28 -07:00
Ryan Huffman
2c10b55858 Remove extraneous debug messages 2014-04-12 01:09:29 -07:00
Ryan Huffman
8b904b91ea Cleanup ChatMessageArea.cpp 2014-04-12 00:53:43 -07:00
Ryan Huffman
45402336ac Add chat window dragging 
This was originally implemented by Mohammed Nafees, shared on Basecamp.

I've noticed an issue with dragging across screens (monitors) where the
chat window will jump vertically.  I've tried debugging it, and
ultimately it looks like an issue with the `move` method.  The
coordinates are valid (I tried using global coordinates as well), and
the amount to move is correct, but when moving to coordinates on a
different screen it doesn't do the right thing.
 2014-04-12 00:25:58 -07:00
Ryan Huffman
13cf0c80e6 Fix chat message formatting and word wrapping 
By switching from a QLabel to a QTextBrowser widget more formatting
options and word wrapping that breaks words is possible.  It comes with
an issue I have been unable to resolve

 * Selecting text and going down with the cursor will cause it to
   scroll.  It's possible to increase padding to remove this behavior,
   but it doesn't look great.
 2014-04-12 00:20:43 -07:00
Philip Rosedale
e3eddadd10 Merge pull request #2651 from AndrewMeadows/avatar-interaction 
protection against bad avatar-avatar collisions
 2014-04-11 21:23:57 -07:00
Leonardo Murillo
f84249ac6c switching to https 2014-04-11 19:58:49 -06:00
Andrzej Kapolka
0ca68e4cb4 Adjust the size when we toggle the avatar LOD options. 2014-04-11 17:53:02 -07:00
Andrew Meadows
0ad841edfb don't render avatar boundary shapes in first person 2014-04-11 17:44:51 -07:00
Andrzej Kapolka
39135d3d5f Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-11 16:37:49 -07:00
Andrew Meadows
fd3b317c09 merge 2014-04-11 16:36:42 -07:00
Andrzej Kapolka
2fdb8d935b Merge pull request #2654 from Atlante45/remove_qrc_from_sources 
Remove qrc from sources
 2014-04-11 16:35:48 -07:00
Andrzej Kapolka
4265617c3e Add missing include. 2014-04-11 16:02:46 -07:00
Andrew Meadows
b5e7c30178 merge 2014-04-11 16:00:34 -07:00
Andrzej Kapolka
fe7a359545 Added tools to adjust avatar LOD to LOD tools dialog. Closes #2624. 2014-04-11 15:55:48 -07:00
Andrew Meadows
5ac7be8945 merge upstream/master -> andrew/inertia 2014-04-11 12:20:00 -07:00
Atlante45
c39434f4e3 Merge branch 'master' of https://github.com/highfidelity/hifi into remove_qrc_from_sources 
Conflicts:
	interface/resources/resources.qrc
 2014-04-11 12:08:17 -07:00
Atlante45
100c3f8da4 Modify UIs that were using the qrc 2014-04-11 11:59:23 -07:00
Atlante45
18b364d9d9 Removed QResources from Interface 2014-04-11 11:57:25 -07:00
Andrzej Kapolka
d6534d6026 Tweak to zoom on pushback. 2014-04-11 11:10:22 -07:00
Andrzej Kapolka
b7725f094d Trying the narrowing effect with pushback for other avatars. 2014-04-11 10:19:16 -07:00
Andrzej Kapolka
00e2ff93e3 Playing around with zooming in while pulling back. 2014-04-11 10:08:44 -07:00
Andrew Meadows
f7862eb600 check for bad deltaTime during avatar-avatar collisions 2014-04-11 08:58:26 -07:00
AndrewMeadows
e850faee79 Merge pull request #2649 from ey6es/master 
Experimental "pushback" to avoid other avatars' intersecting the near clip plane.
 2014-04-11 07:50:52 -07:00
Philip Rosedale
8ccc0a2081 Merge pull request #2650 from thoys/chatwindow-docking-feature 
Fixed docking of ChatWindow
 2014-04-11 07:21:53 -07:00
Andrzej Kapolka
806bcc8e6f Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-10 18:49:52 -07:00
Andrzej Kapolka
d712588b36 Better rolloff. 2014-04-10 17:35:47 -07:00
Andrew Meadows
af158a3a94 save settings when any checkable menu item changes 2014-04-10 17:34:12 -07:00
Andrew Meadows
a436b59971 save settings for change in: identity, position 2014-04-10 17:14:51 -07:00
Andrzej Kapolka
197adce4de Fall intersection off with angle to other avatar. 2014-04-10 17:14:49 -07:00
Andrew Meadows
66b6328687 protection against bad avatar-avatar collisions 
Also with logging if we encounter incorrectly large penetration depths
 2014-04-10 16:58:52 -07:00
Stojce Slavkovski
3af3b29588 removed dependency on QT resource 2014-04-11 00:54:54 +02:00
Thijs Wenker
f0463a5679 Fixed docking of ChatWindow 
Temporary Pin Icon, replace with a nice looking one please
 2014-04-11 00:45:38 +02:00
Andrzej Kapolka
475528f112 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-10 15:00:32 -07:00
Andrzej Kapolka
6cf971c849 More intersection-avoidance tweaks. 2014-04-10 14:51:43 -07:00
Stojce Slavkovski
112c8946d6 Merge branch 'master' of https://github.com/worklist/hifi into 19508 2014-04-10 23:46:22 +02:00
Stephen Birarda
5f1e63bb4a Merge pull request #2647 from AndrewMeadows/fix-crash 
fix crash: don't access null action
 2014-04-10 14:44:01 -07:00
Stephen Birarda
11f5ee202a Merge pull request #2646 from Atlante45/master 
Fixed dometime using wrong texdir
 2014-04-10 14:43:36 -07:00
Atlante45
9c662acc9d Modified max glow + don't glow you own avatar 2014-04-10 14:40:35 -07:00
Andrew Meadows
ac9ead36e2 fix crash: don't access null action 
In particular, don't crash on pressing Enter when lacking qxmpp support
 2014-04-10 13:10:24 -07:00
Stojce Slavkovski
459fed5c7b Merge branch 'master' of https://github.com/worklist/hifi into 19508 2014-04-10 21:52:37 +02:00
Atlante45
ea93be15f1 Fixed dometime using wrong texdir 2014-04-10 12:44:51 -07:00
Ryan Huffman
16a2367b29 Update chat window to only scroll when at the bottom 
It can be frustrating when scrolling up to read a message to have the
window forcibly scrolled to the bottom when a new message appears.
 2014-04-10 12:34:45 -07:00
Ryan Huffman
de475ee46c Update behavior of chat window close button 
Use a stylesheet to suppress highlighting of the background when
pressing the button down.  Instead, it will change the image.

Unfortunately I wasn't able to find a way to do this without requiring
an extra image, or by doing it through the icon system.  The different
icon states didn't seem to take effect for button presses, and using
opacity in the stylesheet doesn't work yet for `QPushButton`s.
 2014-04-10 12:19:27 -07:00
Ryan Huffman
37f9f47488 Fix odd resizing of chat messages 
When calling updateGeometry on the message labels the layout system
seems to resize the widgets in weird ways.  There may be a different way
to keep it from doing this.
 2014-04-10 12:09:06 -07:00
Ryan Huffman
ff3ebd1eda Fix centering of timestamp in chat window 2014-04-10 12:04:30 -07:00
Andrzej Kapolka
873541dd7b Trying out basic pushback for other avatars. 2014-04-10 11:56:17 -07:00
Atlante45
2cc2149647 Glow when you talk, flash when you clip 
closes #2592
 2014-04-10 11:55:30 -07:00
Ryan Huffman
2d481dda4e Update chat menu to properly position itself when opening 
The previous implementation seemed to assume a full-screen main window -
it will now open on the right side of the window, vertically centered,
regardless of where the main window is.
 2014-04-10 11:46:28 -07:00
Ryan Huffman
5099a0e061 Remove chat window opening animation 2014-04-10 11:41:10 -07:00
Stephen Birarda
3651eff3d6 cleanup Systime to gettimeofday without lean and mean windows 2014-04-10 11:24:54 -07:00
Andrzej Kapolka
a12dd916fa More plane intersection bits. 2014-04-10 11:24:45 -07:00
Stephen Birarda
7c9e0927ab define WIN32_LEAN_AND_MEAN before include windows.h in Systime 2014-04-10 11:17:03 -07:00
Stephen Birarda
ef418f09b3 don't let windows.h include winsock 2014-04-10 11:15:33 -07:00
Stephen Birarda
54647f0f08 make sure gnutls define for ssize_t comes before gnutls include 2014-04-10 10:27:08 -07:00
Stephen Birarda
2518d314ac add ssize_t definition for gnutls.h include on Windows 2014-04-10 10:19:45 -07:00
Stephen Birarda
68c445e718 link GnuTLS to targets linking the networking library 2014-04-10 10:00:10 -07:00
Andrzej Kapolka
f61c746b4a Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-10 09:45:23 -07:00
Stephen Birarda
d5d52f804f add a networking library and link from appropriate targets 2014-04-10 09:32:17 -07:00
Andrew Meadows
3755aee3e0 merge upstream/master into andrew/scripting 
Conflicts:
	interface/src/avatar/MyAvatar.cpp
 2014-04-10 08:32:14 -07:00
Andrew Meadows
f9fb8b46a5 adding names to arguments in collisionWithAvatar() declaration 2014-04-10 07:53:39 -07:00
Andrew Meadows
4942e93daa replace .f with .0f as per coding standard 2014-04-10 07:53:11 -07:00
Philip Rosedale
e08dfeae2a Merge pull request #2642 from Atlante45/persistant_script_location 
Persistant script location
 2014-04-09 22:16:20 -07:00
Philip Rosedale
de6b55644b Merge pull request #2636 from ey6es/faceplus 
Basic Faceplus integration, cleanup for handling the various face trackers.
 2014-04-09 22:13:34 -07:00
Philip Rosedale
3b2b075414 Merge pull request #2640 from birarda/kill-scope 
remove the audio scope
 2014-04-09 22:11:02 -07:00
Philip Rosedale
d4bfffe518 Merge pull request #2628 from AndrewMeadows/oculus-with-thrust 
fix glitchy oculus when looking directly behind
 2014-04-09 21:59:11 -07:00
Andrzej Kapolka
9f58264cb6 Working on plane collisions, pushing back camera from intersecting avatars. 2014-04-09 18:07:56 -07:00
Atlante45
ef89b8c386 Removed extra line 2014-04-09 17:37:37 -07:00
Atlante45
fad71266a1 Merge branch 'master' of https://github.com/highfidelity/hifi into persistant_script_location 2014-04-09 17:35:12 -07:00
Atlante45
2b44b03a27 Added temp fix to ModelUploader dialog too 2014-04-09 17:34:17 -07:00
Andrew Meadows
c88be1ac34 remove unnecessary change 2014-04-09 17:26:05 -07:00
Stephen Birarda
cf47418d58 remove the audio scope 2014-04-09 17:16:29 -07:00
Atlante45
e33da2a741 Some QSettings cleanup + persistant script location 2014-04-09 17:08:50 -07:00
Andrew Meadows
22d2f84cff merge upstream/master into andrew/scripting 2014-04-09 15:38:56 -07:00
Andrzej Kapolka
f0dfb7fc38 Updated headers to match the new standard. 2014-04-09 15:38:54 -07:00
Stephen Birarda
1c861fbecb resolve conflicts on merge with upstream master 2014-04-09 15:36:15 -07:00
Andrzej Kapolka
f707719f4e Merge branch 'master' of https://github.com/highfidelity/hifi into faceplus 2014-04-09 15:34:29 -07:00
Andrew Meadows
3a93096093 fixing floats to be *.0f instead of *.f 2014-04-09 15:31:26 -07:00
Andrzej Kapolka
ef8eb00778 Merge branch 'master' of https://github.com/highfidelity/hifi into faceplus 2014-04-09 15:23:11 -07:00
Andrzej Kapolka
ead05c4d99 Tab fixes. 2014-04-09 15:22:53 -07:00
Andrzej Kapolka
cbfaf9709e Faceplus fixes. 2014-04-09 15:18:22 -07:00
Stephen Birarda
11d8d0596a fix ModelUploader header after move 2014-04-09 15:15:43 -07:00
Stephen Birarda
c208af2246 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-09 15:10:48 -07:00
Andrzej Kapolka
28d3eae12b Move Faceplus reading to its own thread to avoid blocking the main one. 2014-04-09 14:52:27 -07:00
Stephen Birarda
7dec499b79 fix accidental changes to Audio.cpp 2014-04-09 14:52:01 -07:00
Stephen Birarda
d4f2c9e631 Merge branch 'master' of https://github.com/highfidelity/hifi into authentication 2014-04-09 14:40:14 -07:00
Andrew Meadows
5fa1fd6b81 merge 2014-04-09 14:36:22 -07:00
Andrew Meadows
07b343ec03 emit events for hand-avatar collisions 2014-04-09 14:32:57 -07:00
Andrew Meadows
034f518d40 emit signal on avatar body-body collisions 2014-04-09 14:15:45 -07:00
Atlante45
7578b282e2 CR 2014-04-09 14:12:11 -07:00
Atlante45
b05b5a1c7b Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-09 14:11:22 -07:00
stojce
9ab61faacb additional CR fixes 2014-04-09 22:32:15 +02:00
stojce
a1c6843bd4 CR Fixes 2014-04-09 22:14:35 +02:00
Andrew Meadows
e480064e66 rename more shapeShape() to be collideShapes() 2014-04-09 13:07:54 -07:00
Stephen Birarda
973fb95c9d Merge pull request #2630 from AndrewMeadows/scripting 
Expose MyAvatar.sessionUUID to JS
 2014-04-09 13:07:37 -07:00
Andrzej Kapolka
79455d5850 More Faceplus work. Starting to get results. 2014-04-09 13:07:02 -07:00
Andrew Meadows
f8e66b4e0d remove cruft 2014-04-09 13:05:26 -07:00
stojce
c9605be193 Merge branch 'master' of https://github.com/worklist/hifi into 19508 2014-04-09 21:57:56 +02:00
Andrzej Kapolka
4d9f3a4aee Added basic mappings to start off with. 2014-04-09 12:36:02 -07:00
Stephen Birarda
ae4b8348a2 fix header include guards via regex 2014-04-09 12:03:17 -07:00
Andrzej Kapolka
4deb052d5d More work on Faceplus integration. 2014-04-09 11:54:55 -07:00
Stephen Birarda
0a9c7e3d74 add an include guard to Stats 2014-04-09 11:35:20 -07:00
Andrew Meadows
4b306401af use slot to change AvatarData::_sessionUUID 2014-04-09 11:32:52 -07:00
Andrzej Kapolka
55e0035fc8 More progress on Faceplus integration. 2014-04-09 11:14:47 -07:00
Stephen Birarda
2d755adfc0 repairs to good code blown away by regex 2014-04-09 10:46:20 -07:00
Stephen Birarda
86d236faef repairs to date and author name in RearMirrorTools 2014-04-09 10:13:06 -07:00
Stephen Birarda
d2c6ea238e repairs to starfield headers 2014-04-09 10:10:00 -07:00
Stephen Birarda
b5a641d60f add back Util code blown away in merge 2014-04-09 10:04:19 -07:00
Stephen Birarda
b8bfe325a0 add back code blow away in regex replacements 2014-04-09 10:03:26 -07:00
Stephen Birarda
f969e050cd add apache license to shader headers 2014-04-09 09:59:05 -07:00
stojce
7b26317eaf Merge branch 'master' of https://github.com/worklist/hifi into 19548 2014-04-09 18:55:17 +02:00
stojce
ce85e67a42 Modify icons in Interface "mirror" 2014-04-09 18:54:59 +02:00
Stephen Birarda
6ce5a24460 missed copyright cleanups in apache header 2014-04-09 09:44:38 -07:00
Stephen Birarda
684c6b5372 run regex header replacement on all cpp files 2014-04-09 09:35:42 -07:00
Stephen Birarda
974d8c0427 prepare header files for regex run against cpp 2014-04-09 09:35:05 -07:00
Andrew Meadows
2f97dd2574 sessionID --> sessionUUID for consistency 2014-04-09 08:22:35 -07:00
Andrew Meadows
229d6cefa2 merge upstream/master into andrew/scripting 2014-04-09 08:17:33 -07:00
Andrew Meadows
b8232b5dfd AvatarData now stores sessionUUID 2014-04-09 08:11:15 -07:00
stojce
cc2f03fb49 Merge branch 'master' of https://github.com/worklist/hifi into 19508 2014-04-09 08:19:41 +02:00
Andrew Meadows
2eef95f67e remove getAbsoluteHeadYaw() from the header 2014-04-08 18:44:34 -07:00
Andrew Meadows
f95542e4d6 merge upstream/master into oculus-with-thrust proj 2014-04-08 18:34:15 -07:00
Andrew Meadows
34aefe1b49 fix glitchy oculus when looking directly behind 2014-04-08 18:33:08 -07:00
Brad Hefta-Gaub
dc89026215 Merge pull request #2607 from thoys/hifi-win-default-device-fix 
windows default device fix
 2014-04-08 15:30:02 -10:00
Andrzej Kapolka
5b0e7f818d More work on Faceplus integration/cleaning up support for multiple face 
trackers.
 2014-04-08 18:03:49 -07:00
Stephen Birarda
7ce91b3f96 fix headers who had their comments removed 2014-04-08 17:43:35 -07:00
Stephen Birarda
387179b38f add Norman's tagline back to PrimitiveRenderer 2014-04-08 17:31:53 -07:00
Stephen Birarda
ab3a9af6bf repair the starfield renderer 2014-04-08 17:31:30 -07:00
Stephen Birarda
6a51df9e38 initial regex replacement of headers 2014-04-08 17:30:36 -07:00
Stephen Birarda
f3cbd120ce header comment tweaks prior to regex match 2014-04-08 17:19:23 -07:00
Andrzej Kapolka
98011da1ef Starting on Faceplus integration. 2014-04-08 17:07:45 -07:00
Atlante45
7e33ed0c91 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-08 16:35:46 -07:00
Atlante45
039450aeec Checking model name is present in the .fst file 2014-04-08 16:35:07 -07:00
Andrzej Kapolka
597d750af9 Better radius. 2014-04-08 15:25:10 -07:00
Andrzej Kapolka
083e9076a9 Missed a spot. 2014-04-08 15:17:05 -07:00
Andrzej Kapolka
faf8c35358 Head height's kind of screwy; let's use the eye position. 2014-04-08 15:01:56 -07:00
Andrzej Kapolka
add7bb26ed Use the head height to determine the pushback amount. 2014-04-08 14:55:46 -07:00
Andrzej Kapolka
5776514e6a Working on pushing the mirror camera back to prevent intersecting the near 
clip plane.  Closes #2617.
 2014-04-08 14:48:01 -07:00
Thijs Wenker
6754a6ca69 Fixed some style 2014-04-08 23:45:27 +02:00
Stephen Birarda
6681754994 Merge branch 'master' of https://github.com/highfidelity/hifi into authentication 2014-04-08 14:26:10 -07:00
Atlante45
8ad7c3b239 Moved ModelUploader to interface + New error messages 2014-04-08 14:03:27 -07:00
Brad Hefta-Gaub
8e097be28d Merge pull request #2614 from Atlante45/undo_redo_system 
Undo redo system
 2014-04-08 08:30:29 -10:00
Brad Hefta-Gaub
c865df8b82 Merge pull request #2613 from Atlante45/more_upload_work 
More upload work
 2014-04-08 08:16:07 -10:00
Andrzej Kapolka
ccd7106527 Include "InterfaceConfig" before QOpenGLFramebufferObject to fix Windows 
build.
 2014-04-08 10:54:41 -07:00
Atlante45
eaca699a6d Merge branch 'master' of https://github.com/highfidelity/hifi into more_upload_work 2014-04-08 10:35:23 -07:00
Stephen Birarda
080b0d7221 Merge branch 'master' of https://github.com/highfidelity/hifi into authentication 2014-04-08 10:28:14 -07:00
Andrzej Kapolka
d4706bba8a Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-04-08 10:21:13 -07:00
Atlante45
174f37f531 Merge branch 'master' of https://github.com/highfidelity/hifi into undo_redo_system 2014-04-08 10:20:58 -07:00
Brad Hefta-Gaub
2988239aed Merge pull request #2615 from ey6es/master 
Add the download stats back (they got lost in a merge), provide a way for bots to address joints by name (by including indices in the FST file).
 2014-04-08 07:20:00 -10:00
Andrzej Kapolka
5a61009099 Add metavoxel bandwidth to details. 2014-04-08 10:19:39 -07:00
Andrzej Kapolka
a157c67901 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-04-08 09:56:07 -07:00
Brad Hefta-Gaub
aad3085e08 Merge pull request #2611 from AndrewMeadows/avatar-speed 
fix for sometimes slow avatar
 2014-04-08 06:54:21 -10:00
Andrzej Kapolka
fa05a48270 Provide a means of supplying the joint mappings in the FST file so that agent 
scripts can address joints by name.  Closes #2526.
 2014-04-07 17:55:36 -07:00
Atlante45
d213cd7840 More work on Undo/Redo 2014-04-07 17:10:15 -07:00
Atlante45
d7b3c8b8fa Merge branch 'master' of https://github.com/highfidelity/hifi into undo_redo_system 2014-04-07 17:02:00 -07:00
Andrew Meadows
bf0eb69e2c fix for sometimes slow avatar 2014-04-07 16:28:55 -07:00
Andrzej Kapolka
15e9d45dc3 Switched from storing Euler angles to using quaternions along with a 
quaternion editor.  Also, use a default step of 0.01 for floats/doubles.
 2014-04-07 15:41:42 -07:00
Andrew Meadows
79670563d4 AvatarData stores its sessionID 2014-04-07 14:42:49 -07:00
Andrzej Kapolka
0011276b0b Added back the download stats, which got lost in a merge. 2014-04-07 14:19:17 -07:00
Atlante45
b21fe02fa2 Put ModelUploder on a different thread, not to block the rendering of the main window 2014-04-07 13:46:38 -07:00
Andrew Meadows
84d7e39d72 merge upstream/master into avatar-interaction 2014-04-07 10:05:25 -07:00
Andrew Meadows
d902580d6f Add Collision metatype to JS script system 2014-04-07 10:03:10 -07:00
Thijs Wenker
e9922b6db9 windows default device fix: 
- fixed tabs>spaces
- doesn't require atlbase anymore, so works on visual studio express
 2014-04-07 18:50:13 +02:00
Stephen Birarda
69504b0a9d proper cleanup of CA credentials on DTLSClientSession side 2014-04-07 09:47:51 -07:00
Stephen Birarda
efcf506383 resolve conflicts on merge with upstream master 2014-04-07 09:32:08 -07:00
Thijs Wenker
4335ba7b5a windows default device fix 2014-04-07 17:01:24 +02:00
ZappoMan
dfd6411a4f add hooks for local audio echo, first cut at diffusion 2014-04-06 10:11:11 -07:00
stojce
dd5a198740 Models browser fixes 2014-04-06 16:13:15 +02:00
stojce
ba5a092ad7 Frameless dialog position/size fixes 
Fixed frameless dialog size and position on main window resize and move
 2014-04-06 15:30:30 +02:00
stojce
b45f61ec54 Merge branch 'master' of https://github.com/worklist/hifi into 19508 2014-04-05 16:29:57 +02:00
matsukaze
bcce1155e1 Merge branch 'master' of https://github.com/matsukaze/hifi_nocr 2014-04-05 00:56:28 -04:00
ZappoMan
593fc6c963 lots of knobs and dials 2014-04-04 17:29:39 -07:00
Andrzej Kapolka
404b804b2f Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-04-04 16:41:43 -07:00
Andrzej Kapolka
2d535f3b86 Removed debugging code. 2014-04-04 16:36:58 -07:00
Andrzej Kapolka
d2b0cc43dd Extent tweaks. 2014-04-04 16:32:14 -07:00
Andrzej Kapolka
72d09a5cbe Merge pull request #2605 from AndrewMeadows/say-no-to-warnings 
removing a warning about hidden virtual override
 2014-04-04 16:00:57 -07:00
Andrzej Kapolka
1c822542c1 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-04-04 15:29:13 -07:00
Andrzej Kapolka
10288bce35 Merge pull request #2604 from AndrewMeadows/oculus-with-thrust 
fix #2567 thrust + oculus doesn't change body rotation
 2014-04-04 15:19:44 -07:00
Andrzej Kapolka
1f3a5d09d9 Merge pull request #2593 from Atlante45/display_models_metadata 
Display models metadata
 2014-04-04 15:18:18 -07:00
Andrew Meadows
403ad5e984 removing a warning about hidden virtual override 2014-04-04 15:18:12 -07:00
Atlante45
a0e70d0d2a Merge branch 'master' of https://github.com/highfidelity/hifi into undo_redo_system 2014-04-04 14:53:12 -07:00
Andrew Meadows
01c42c741c fix #2567 thrust + oculus doesn't change body rot 2014-04-04 14:46:54 -07:00
Andrzej Kapolka
3a125db1f8 Increase the rate at which we increase detail and put a limit on the LOD 
multiplier so that it never takes more than about five seconds to return to
default detail.  Also, since there seems to be a weird issue where OS X
throttles the frame rate to 30 fps (independent of our own throttling), use
that as the lower adjustment range.
 2014-04-04 14:31:30 -07:00
Andrzej Kapolka
a2b94aa433 Working on render modes. 2014-04-04 14:22:01 -07:00
Andrzej Kapolka
550a8fdb99 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-04-04 13:00:51 -07:00
stojce
8dc6ca75a4 Merge branch 'master' of https://github.com/worklist/hifi into 19508 
Conflicts:
	interface/interface_en.ts
	interface/resources/resources.qrc
	interface/src/Menu.cpp
 2014-04-04 21:16:29 +02:00
Andrzej Kapolka
a0c7e4d3cc Working on model rendering modes. 2014-04-04 11:45:03 -07:00
ZappoMan
c35d6bdb0c add reflection stats to stats display, add pre-delay, add toggle for separate ears, add surface randomness 2014-04-04 11:25:43 -07:00
Stephen Birarda
fd8e32190e perform cleanup of GnuTLS structures across targets 2014-04-04 11:08:53 -07:00
Stephen Birarda
85933545cd add GnuTLS init to Application 2014-04-04 10:59:58 -07:00
Stephen Birarda
e2224e0f0c cleanup node silence timing and use for DTLS timeouts 2014-04-04 10:56:04 -07:00
Andrew Meadows
5e2b8bb2c3 connect SIGNAL to SIGNAL to avoid forwarding slot 2014-04-04 10:43:06 -07:00
ZappoMan
4c0f83913b tweaks to bounce 2014-04-04 07:04:02 -07:00
Andrzej Kapolka
38022d2440 Fix for voxelizing models. 2014-04-04 00:33:33 -07:00
Andrzej Kapolka
1bf19111dc Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-04-03 23:57:30 -07:00
Andrzej Kapolka
dfaa98cc34 Blend when setting. 2014-04-03 23:51:49 -07:00
Andrzej Kapolka
d706e23012 Basic voxelization. 2014-04-03 23:47:31 -07:00
ZappoMan
f45f30234f more tweaks to reflections 2014-04-03 23:03:06 -07:00
ZappoMan
98f0fe8619 latest pass, improved distance calulations, added menu item to remove original source 2014-04-03 18:57:08 -07:00