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

5225 commits

Author SHA1 Message Date
Andrzej Kapolka
b408e31d91 More work on spanners. 2014-02-20 17:18:15 -08:00
Atlante45
d06f526bf4 Merge branch 'master' of https://github.com/highfidelity/hifi into clipboard_overlay 2014-02-20 16:57:31 -08:00
Atlante45
989a76fe6e Hooked up Clipboard preview 2014-02-20 16:56:40 -08:00
Jose Carlos
10c9b902b9 Removed duplicated calculation of bounding rect for display name 2014-02-21 00:37:29 +01:00
Jose Carlos
354c9bff09 Correct text position for default and non default meshes 
Bounding box for text background is now text dependent, much nicer now
 2014-02-21 00:29:52 +01:00
Stephen Birarda
2408d909ba resolve conflicts on merge with upstream master 2014-02-20 12:12:29 -08:00
Philip Rosedale
355b00fbca Merge branch 'master' of https://github.com/worklist/hifi 2014-02-20 12:10:44 -08:00
Andrzej Kapolka
09677b06f2 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	assignment-client/src/metavoxels/MetavoxelServer.cpp
 2014-02-20 12:05:15 -08:00
Jose Carlos
fa490acb8d Changed the display name background alpha to 0.2 (was 0.95) 2014-02-20 20:45:32 +01:00
Andrzej Kapolka
4dab2eb694 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-20 10:45:19 -08:00
Atlante45
904ce7bf1c Repositionned nivigation buttons in ImportDialog 2014-02-20 10:38:08 -08:00
Stephen Birarda
7f9794d52b Merge branch 'master' of https://github.com/highfidelity/hifi 2014-02-20 10:14:47 -08:00
Stephen Birarda
6f84230d9d resolve conflicts on merge with upstream/master 2014-02-20 10:14:36 -08:00
matsukaze
b813438307 Consolidate primitive index with buffer index. 
Removed the extra space associated with primitive index and use buffer
index for both the VBO and primitive renderers since they are exclusive.
 2014-02-20 08:48:40 -05:00
ZappoMan
0e8cab7349 added Clipboard.nudgeVoxel() and added support for calling clipboard opertations with VoxelDetail as well as xyzs 2014-02-19 20:09:35 -08:00
Andrzej Kapolka
f017d0472f More work on spanners. 2014-02-19 18:17:26 -08:00
Stephen Birarda
ee9f8937e3 fix a silly typo 2014-02-19 18:03:34 -08:00
ZappoMan
91d79f65f2 fix crash on import from JS 2014-02-19 17:57:28 -08:00
ZappoMan
3a8a880a8b Merge branch 'master' of https://github.com/worklist/hifi into js_clipboard 2014-02-19 17:49:22 -08:00
Philip Rosedale
941821b69c Merge branch 'master' of https://github.com/worklist/hifi 2014-02-19 17:45:56 -08:00
Stephen Birarda
4ee416ba96 fixes for scripted avatars, closes #2033 2014-02-19 16:55:24 -08:00
Atlante45
b69bdccc8f Merge branch 'master' of https://github.com/highfidelity/hifi into fix_import 2014-02-19 16:11:31 -08:00
Atlante45
af3e19e640 Added style and pngs for the buttons 2014-02-19 16:01:14 -08:00
Andrzej Kapolka
25ae81e2de More work on spanners. 2014-02-19 15:25:21 -08:00
Jose Carlos
44d5b9b2f8 cosmetic change 2014-02-20 00:22:29 +01:00
Philip Rosedale
4b033b3b98 Merge branch 'master' of https://github.com/worklist/hifi 2014-02-19 15:07:45 -08:00
Philip Rosedale
b368001af4 Adding DC offset calculation to noise cancellation 2014-02-19 15:04:39 -08:00
Andrzej Kapolka
a8d0aa6d17 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-19 14:57:18 -08:00
Jose Carlos
ee7b5844b8 Minor cosmetic change 2014-02-19 23:24:26 +01:00
Stephen Birarda
57538af8fd give a separate QNetworkAccessManager to the AccountManager 2014-02-19 14:19:00 -08:00
Stephen Birarda
c5b8ff181e indicate that both username or email can be passed for login 2014-02-19 14:14:17 -08:00
Stephen Birarda
5f130872af repair usage of INI file for QSettings 2014-02-19 14:09:18 -08:00
Jose Carlos
241214ba37 Fixed compilation after merged from upstream 2014-02-19 23:08:19 +01:00
Jose Carlos
828508bbf1 merged from master 2014-02-19 23:01:13 +01:00
Jose Carlos
ba0b01d028 Style changes after ZappoMan's comments 2014-02-19 22:51:40 +01:00
Stephen Birarda
0b4021ea43 switch to ini settings file by default for Interface, closes #2029 2014-02-19 13:17:53 -08:00
ZappoMan
1dde40167d Merge branch 'master' of https://github.com/worklist/hifi into js_clipboard 2014-02-19 13:16:41 -08:00
Atlante45
406768bf12 Code style fixes 2014-02-19 13:13:17 -08:00
Stephen Birarda
78c246f1ba repair to saveSnapshot call from interface 2014-02-19 13:08:57 -08:00
Jose Carlos
4fd735e28f Added a factor to correct display name position for non default models 
For the default avatar, the position is wrong
 2014-02-19 22:08:47 +01:00
Stephen Birarda
ff7a49d8c2 resolve conflicts on merge with upstream master 2014-02-19 13:07:26 -08:00
Atlante45
919891d73c Merge branch 'master' of https://github.com/highfidelity/hifi into fix_import 2014-02-19 12:38:08 -08:00
Atlante45
0ed7b959d7 Changed import dialog UI 2014-02-19 12:36:27 -08:00
Atlante45
7bce649080 Fix for voxelImporter 2014-02-19 12:35:45 -08:00
Atlante45
f24cd0ceba Added switch to pasteMode after successful import. 2014-02-19 12:34:38 -08:00
Andrzej Kapolka
4e7a7892ec Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-19 12:06:55 -08:00
Andrzej Kapolka
5f9139dcd0 Fixed some left/right issues. 2014-02-19 11:54:27 -08:00
Andrzej Kapolka
f7fcbc234e Fixes for Xcode warnings with no Visage, explanatory comments for Model's 
base geometry pointer.
 2014-02-19 11:47:40 -08:00
Andrzej Kapolka
0138ecb3b2 Layout tweaks. 2014-02-19 11:35:45 -08:00
ZappoMan
897da67118 Merge branch 'master' of https://github.com/worklist/hifi into js_clipboard 2014-02-19 10:54:05 -08:00
Andrzej Kapolka
3c4d2aa199 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-19 10:29:57 -08:00
Andrew Meadows
a2e0fa674f Putting new private method next to others. 2014-02-19 10:14:58 -08:00
Andrew Meadows
c24cbdadc1 Merge branch 'master' of ssh://github.com/highfidelity/hifi into cleanup 
Conflicts:
	interface/src/avatar/MyAvatar.cpp
 2014-02-19 10:00:51 -08:00
AndrewMeadows
6c8291cc7d Merge pull request #2016 from ey6es/kissage 
Basic Visage integration.
 2014-02-19 09:53:17 -08:00
AndrewMeadows
306bdc783c Merge pull request #2015 from ZappoMan/more_js_edit_tools 
More js edit tools
 2014-02-19 09:46:40 -08:00
AndrewMeadows
a8d07296b8 Merge pull request #2010 from ZappoMan/voxelnotshownbug 
merge fix for "sometime voxels don't show when you move" bug
 2014-02-19 09:44:30 -08:00
Andrew Meadows
85e05539ad Adding comment about bug as a reminder to fix. 2014-02-19 08:59:17 -08:00
matsukaze
75ecdbd1f0 Merged clearAllOcclusions into inspectOcclusions 2014-02-19 06:56:12 -05:00
Jose Carlos
a6b202ccbe My Avatar's display name is shown 2014-02-19 10:01:15 +01:00
ZappoMan
bf814410ac first cut at exposing clipboard support to JavaScript 2014-02-19 00:10:16 -08:00
matsukaze
8aa645b6de Merge and resolve conflicts of remote-tracking branch 'upstream/master' 2014-02-18 22:45:25 -05:00
Andrzej Kapolka
a89983a1c0 Removed tab, variable fix. 2014-02-18 18:49:34 -08:00
Andrzej Kapolka
c4e643e3a4 Eyes were reversed. 2014-02-18 18:43:45 -08:00
Andrzej Kapolka
8076f571fd Working on blinking, etc. 2014-02-18 18:39:38 -08:00
Andrzej Kapolka
636e3b1910 Working on blendshape integration. 2014-02-18 18:24:25 -08:00
Andrew Meadows
4010f3ab3f Remove Avatar::_head, use AvatarData::_headData 2014-02-18 17:41:46 -08:00
Andrzej Kapolka
e97a912d97 Working on blendshape coefficients. 2014-02-18 17:19:29 -08:00
Andrew Meadows
c134b8de5b Remove Avatar::_hand, use AvatarData::_handData 2014-02-18 17:08:12 -08:00
Andrzej Kapolka
9c4143e1be Working on gaze deflection. 2014-02-18 17:03:43 -08:00
Andrzej Kapolka
fe79706653 Working on the translation scale. 2014-02-18 16:42:30 -08:00
Andrzej Kapolka
ada2594ad1 Working on getting the head translation, too. 2014-02-18 16:36:54 -08:00
ZappoMan
baa1762056 added support for overlays to editVoxels.js 2014-02-18 16:23:34 -08:00
Andrzej Kapolka
f83254882a Attempting to get the head rotation from Visage. 2014-02-18 16:07:08 -08:00
Stephen Birarda
949f79e945 hook up request for domain registration information for Interface 2014-02-18 15:38:43 -08:00
Andrzej Kapolka
cc6b663ea6 Use the ABI-compatible library (hopefully). 2014-02-18 15:37:40 -08:00
Andrew Meadows
490b9149fa Moving "play slaps" code into its own method. 
Cleaning up hand collision code in prep for more correct collisions.
 2014-02-18 15:18:27 -08:00
Jose Carlos
59f8851b50 Merge remote-tracking branch 'upstream/master' into 19489 2014-02-19 00:05:16 +01:00
Jose Carlos
46ed506196 Display names are shown when distance is below a threshold 
Used polygon offset to render display names
Saved model view and projection matrices in order to save glGetDoublev calls
 2014-02-19 00:04:00 +01:00
Andrew Meadows
4b58d04c17 Merge branch 'master' of ssh://github.com/highfidelity/hifi into camera-occlusion 2014-02-18 15:00:39 -08:00
Stephen Birarda
b57a5cea6a complete access token request flow after login window presentation 2014-02-18 14:27:52 -08:00
Andrzej Kapolka
036230ec8d Merge branch 'master' of https://github.com/highfidelity/hifi into kissage 2014-02-18 13:59:31 -08:00
Andrzej Kapolka
55e2ebd92f More spanner bits. 2014-02-18 13:58:44 -08:00
Stephen Birarda
8a0136efe1 more work on authentication, show login window when domain asks 2014-02-18 13:21:32 -08:00
Stephen Birarda
c762b92e5a replace DataServerClient and Profile with AccountManager 2014-02-18 11:27:37 -08:00
Stephen Birarda
37f1f7ba4f add a DomainInfo class to hold domain information 2014-02-18 09:59:22 -08:00
ZappoMan
5cf0ad46e7 Merge pull request #2000 from gaitat/master 
Worklist Job #19503
 2014-02-18 09:47:26 -08:00
Atlante45
710a960a35 Merge branch 'master' of https://github.com/highfidelity/hifi into fix_import 2014-02-18 09:37:54 -08:00
matsukaze
b838833c21 Swizzle bit pairs in the occlusion bit mask 2014-02-18 08:00:30 -05:00
stojce
7621d70c24 use base class - replaced MyAvatar with Avatar 2014-02-18 08:11:59 +01:00
stojce
d36ced9b92 fixed misplaced #endif 2014-02-18 07:33:03 +01:00
Andrzej Kapolka
5513524705 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-17 21:48:37 -08:00
Andrzej Kapolka
1d7f1afa5b Merge branch 'master' of https://github.com/highfidelity/hifi into kissage 2014-02-17 21:48:21 -08:00
Andrzej Kapolka
494685140b Various bits of work on spanners. 2014-02-17 21:44:32 -08:00
stojce
6c2f3b687e removed unnecessary references 2014-02-18 01:50:55 +01:00
Jose Carlos
0ec554ec82 Added fadein and fadeout animations for display name 2014-02-18 00:49:26 +01:00
Jose Carlos
e7b54a9ef4 merged from master 2014-02-17 21:59:53 +01:00
ZappoMan
44b60c92a1 Merge branch 'master' of https://github.com/worklist/hifi into voxelnotshownbug 2014-02-17 12:41:13 -08:00
Atlante45
96a160bade Moved some code in ImportDialog.cpp for consistency 2014-02-17 12:35:42 -08:00
stojce
c57cae6437 Merge branch 'master' of https://github.com/worklist/hifi into 19497 2014-02-17 21:20:42 +01:00
stojce
0df0c23c32 Windows build fix (3) 2014-02-17 21:14:28 +01:00
Andrew Meadows
48f28ecee7 Merge branch 'master' of ssh://github.com/highfidelity/hifi into camera-occlusion 
Conflicts:
	interface/src/Menu.h
	interface/src/avatar/Avatar.cpp
 2014-02-17 12:12:47 -08:00
ZappoMan
ab3e1af64d fix the sometime voxels don't show when you move bug 2014-02-17 12:02:11 -08:00
Andrew Meadows
bca50a5b70 Split render options for head/body collision proxy 
This makes the poor proxy shapes easier to see.
 2014-02-17 11:23:01 -08:00
stojce
677e6f5ce9 windows build fix (2) 2014-02-17 20:19:35 +01:00
Andrew Meadows
d635ffaaba Remove cruft: old avatar-avatar collision option 2014-02-17 10:40:32 -08:00
Andrew Meadows
6ce028bbab Simplifiy API for camera mode transitions 
Specify the "period" for the transition rather than the "rate".
 2014-02-17 10:27:33 -08:00
stojce
2ba7426757 windows build fix 2014-02-17 19:25:53 +01:00
stojce
9e7597a6ad bad merge fix 2014-02-17 19:06:55 +01:00
stojce
13485065a5 Merge branch 'master' of https://github.com/worklist/hifi into 19497 2014-02-17 18:59:44 +01:00
Andrew Meadows
4848aa1d16 Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction 2014-02-17 09:14:06 -08:00
Andrew Meadows
e4ef09e06d Helper method for adding avatar collision submenu 2014-02-17 09:12:38 -08:00
matsukaze
32f0a81708 Backed out last change to recursion. 2014-02-17 00:27:24 -05:00
matsukaze
04b1c3e935 Fix occlusions between cousins. Recurse only to shouldRender or isLeaf voxel when inspecting for occlusions 2014-02-16 23:38:10 -05:00
matsukaze
1f7f4d2a22 Added id checking and remove try/catch 2014-02-16 23:25:06 -05:00
ZappoMan
dd0909659a Merge branch 'master' of https://github.com/worklist/hifi into overlaysupport 2014-02-16 19:20:06 -08:00
Philip Rosedale
37e1c00828 Merge pull request #2002 from ZappoMan/lowerLODnoFPSdrop 
Automatically Adjust LOD
 2014-02-16 18:14:24 -08:00
ZappoMan
d101f19e40 removed bounds properties from Overlay so it only lives in Overlay2D 2014-02-16 13:39:01 -08:00
ZappoMan
78f4df912d added 3D line overlay support 2014-02-16 13:25:49 -08:00
Jose Carlos
73e0c0ccf5 Moving pow evaluation to const 2014-02-16 21:33:46 +01:00
ZappoMan
7c350b3acb add 3D sphere overlay support 2014-02-16 12:30:15 -08:00
ZappoMan
5abf908874 added 3D cube overlay support 2014-02-16 11:36:06 -08:00
Jose Carlos
a8f1f9a00a Added animation for fade out 2014-02-16 14:25:41 +01:00
ZappoMan
cb1c659e2e fix windows 2014-02-15 21:25:20 -08:00
ZappoMan
ef11865d24 implement text overlay support 2014-02-15 21:13:44 -08:00
gaitat
e30cf33a03 Fix for Worklist Job #19503 
Formatting errors
 2014-02-15 23:04:58 -05:00
ZappoMan
0a9f9a7c7a fix windows build 2014-02-15 19:20:08 -08:00
ZappoMan
37bb85fca6 tweaks to overlays 2014-02-15 19:15:30 -08:00
ZappoMan
f7f695d145 add support for detecting clicked on overlays 2014-02-15 17:45:42 -08:00
ZappoMan
1ddd856ca8 removed getProperties() which was not implemented 2014-02-15 16:31:09 -08:00
ZappoMan
f6adce255d more work on image overlays 2014-02-15 16:26:34 -08:00
Jose Carlos
af48998cc7 Fixed position of display name: we take into account skeleton and head's height 
Saved opengl state in renderDisplayName
Moved display data to AvatarData
Unified static chat function for chat and display name
 2014-02-15 18:40:36 +01:00
gaitat
fcd44f5817 Fix for Worklist Job #19503 2014-02-15 08:16:05 -05:00
Andrzej Kapolka
3e40927d3a More work on spanning objects. 2014-02-14 18:01:48 -08:00
gaitat
eee839f423 Merge branch 'master' of github.com:highfidelity/hifi 2014-02-14 20:12:39 -05:00
Andrew Meadows
2d1218d304 Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction 2014-02-14 16:34:32 -08:00
Andrew Meadows
335141049c Cleaning up collision check API's and re-enabling collisions with particles. 2014-02-14 16:33:19 -08:00
Andrew Meadows
b7352335f2 Adding collisions options to menu at a second location. 
And adding CollideWithParticle option which will be working soon...
 2014-02-14 16:31:53 -08:00
Jose Carlos
19cb20f0cd Added rect around the display name with proper size, paying attention to 
QFontMetrics data
Fully wired up the message sending and receiving from server
 2014-02-15 01:05:21 +01:00
Andrzej Kapolka
5b1229e1d0 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-14 15:49:36 -08:00
ZappoMan
2eac9c293f first working version of scriptable Overlays 2014-02-14 15:37:47 -08:00
Andrzej Kapolka
855bc19c5a Merge branch 'master' of https://github.com/highfidelity/hifi 2014-02-14 15:36:13 -08:00
Andrzej Kapolka
af0d395751 Added sanity check for zero vertices. 2014-02-14 13:11:16 -08:00
Andrzej Kapolka
76142c92f2 Adjust offset when skipping parts that don't match the translucency setting. 
Closes #2001.
 2014-02-14 13:04:17 -08:00
Jose Carlos
04c59b825e merged from master 2014-02-14 20:52:22 +01:00
Andrzej Kapolka
8b3356f819 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-14 11:17:14 -08:00
Andrzej Kapolka
f4b47ea443 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-02-14 11:09:35 -08:00
ZappoMan
8e284a55b1 Merge branch 'master' of https://github.com/worklist/hifi into overlaysupport 2014-02-14 10:50:35 -08:00
stojce
0ddc475928 Merge branch 'master' of https://github.com/worklist/hifi into 19497 2014-02-14 18:30:54 +01:00
stojce
d5b87fbe8a Merge branch 'master' of https://github.com/worklist/hifi into 19494 2014-02-14 18:28:34 +01:00
gaitat
58e773340a Worklist Job #19503 
Exposing the average audio intensity to javascript through the MyAvatar
object.
 2014-02-14 09:40:59 -05:00
ZappoMan
cd137b2b12 tweak to reload scripts 2014-02-13 21:00:20 -08:00
ZappoMan
9d841ce918 add Stop All Scripts and Reload All Scripts 2014-02-13 18:19:20 -08:00
Andrzej Kapolka
91fac4eebe Merge branch 'master' of https://github.com/highfidelity/hifi 2014-02-13 17:38:23 -08:00
Andrzej Kapolka
1afd3ab712 Fixes for OS X warnings. 2014-02-13 17:07:57 -08:00
Andrzej Kapolka
1fba28d45e Merge branch 'master' of https://github.com/highfidelity/hifi into kissage 2014-02-13 16:51:44 -08:00
Andrzej Kapolka
b08d452749 Fix for head appearing at wrong position for a single frame. 2014-02-13 16:49:42 -08:00
Andrzej Kapolka
5f38c328d5 Removed debugging code. 2014-02-13 16:25:04 -08:00
Andrzej Kapolka
078b15c02d Add some hysteresis on the LOD switching to prevent rapid switching back 
and forth.
 2014-02-13 16:20:43 -08:00
Jose Carlos
b899834c54 Show "displayname" in correct position 
Show "displayname" when on mouse hover
Persistant displayname data
 2014-02-14 00:23:21 +01:00
ZappoMan
601c155303 correctly lock arrays on init 2014-02-13 14:46:59 -08:00
ZappoMan
ed7fa6e311 added back setupNewVoxelsForDrawing() on changeTree() 2014-02-13 14:39:10 -08:00
ZappoMan
4fb5e68425 removed some debug 2014-02-13 14:33:23 -08:00
ZappoMan
caab3afb69 add menu item for auto adjust LOD 2014-02-13 14:26:30 -08:00
Andrzej Kapolka
ff01470850 Wait until each LOD level is actually requested before we start loading; 
before a level is loaded, try to use the closest already-loaded level.
 2014-02-13 14:25:01 -08:00
Andrew Meadows
50d864901e Improved comment about limitation of collision check. 2014-02-13 14:02:25 -08:00
stojce
ab4164a6df #19505 - Add domain & orientation parsing to hifi:// protocol handler 2014-02-13 22:44:10 +01:00
Andrzej Kapolka
684a43da64 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-02-13 13:40:17 -08:00
Andrzej Kapolka
6a39290bf5 Basic LOD switching based on distance to camera. 2014-02-13 13:37:29 -08:00
ZappoMan
3aba29b015 first working cut at recreateVoxelGeometryInView() 2014-02-13 13:26:31 -08:00
ZappoMan
cac67d7baa add proper readWriteLocks around the VBO arrays to preven random triangles 2014-02-13 13:06:45 -08:00
Andrew Meadows
439cbe3f87 Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction 
Conflicts:
	interface/src/avatar/Hand.h
	interface/src/avatar/MyAvatar.cpp
 2014-02-13 12:36:01 -08:00
Andrew Meadows
b75de42802 Making the lean recovery use more tuneable parameters. 2014-02-13 12:22:40 -08:00
Andrew Meadows
d9b50359a6 Hand-face collisions now work (sorta). 2014-02-13 12:21:28 -08:00
ZappoMan
e9259db944 Merge branch 'master' of https://github.com/worklist/hifi into lowerLODnoFPSdrop 2014-02-13 12:20:29 -08:00
stojce
08c8f47cd4 added SNAPSHOT_EXTENSION constant 2014-02-13 20:05:59 +01:00
ZappoMan
156fa6dc5a more tweaks, removed old clouds 2014-02-13 11:03:35 -08:00
matsukaze
6c50491ee7 Fix compiler warnings on linux 2014-02-13 13:59:56 -05:00
ZappoMan
6d75efd2b0 tweaks to default menus for alpha, make Gravity false so we don't fall into abyss 2014-02-13 10:46:28 -08:00
Andrzej Kapolka
23169c098e Merge branch 'master' of https://github.com/highfidelity/hifi 2014-02-13 10:27:36 -08:00
Andrzej Kapolka
9c91d3c2e7 Use the existing session stuff for metavoxels rather than a separate system. 2014-02-13 10:25:10 -08:00
Andrew Meadows
312bc7521f Making arm restoration rate independent of FPS and easier to tune. 2014-02-13 10:04:58 -08:00
Andrew Meadows
9523ea7d03 Only do slaps for MyAvatar. 2014-02-13 10:03:39 -08:00
Andrew Meadows
e793c207f9 Minor whitespace removal. 2014-02-13 10:03:14 -08:00
stojce
fe6f5a341c Merge branch 'master' of https://github.com/worklist/hifi into 19497 2014-02-13 18:14:20 +01:00
stojce
e5072bc00f Merge branch 'master' of https://github.com/worklist/hifi into 19494 2014-02-13 18:12:40 +01:00
matsukaze
bf43db7c14 Merge remote-tracking branch 'upstream/master' 2014-02-13 11:37:53 -05:00
matsukaze
11a399ec82 Fix crash bug 
Doh!! Renderer used before initialized.
 2014-02-13 11:19:14 -05:00
matsukaze
0a7614ce21 Fix compiler warnings on linux 2014-02-13 11:18:10 -05:00
matsukaze
25f87093f2 Fixes for tyle conformance 2014-02-13 10:03:41 -05:00
ZappoMan
5ad74a04f1 Merge pull request #1989 from PhilipRosedale/master 
Improved EditVoxels script, improve and cleanup noise reduction
 2014-02-13 00:14:40 -08:00
Philip Rosedale
50df17dc10 fix windows build buster 2014-02-12 23:37:19 -08:00
Philip Rosedale
595eb38c72 comment out debug 2014-02-12 22:57:13 -08:00
Philip Rosedale
be7d1a5723 Adjustments to noise gate, commit to min sampling method 2014-02-12 22:53:46 -08:00
ZappoMan
20a6f4eea9 first cut at auto-LOD adjustment 2014-02-12 21:22:21 -08:00
Andrzej Kapolka
bb56e2847f Global edits, edits use virtual function. 2014-02-12 20:00:07 -08:00
Philip Rosedale
3a807c1914 comment out debugging spam, improved EditVoxels 2014-02-12 17:57:52 -08:00
Andrzej Kapolka
5b207e4f8e Work on creating new attributes. 2014-02-12 17:10:32 -08:00
Andrzej Kapolka
d6d95a586d Working on deleting attributes. 2014-02-12 14:16:14 -08:00
stojce
0244ead5df fixed glm::quat initialization 2014-02-12 21:06:30 +01:00
matsukaze
9e5c8b1634 Merging upstream master 2014-02-12 12:32:53 -05:00