Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 02:03:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
18489 commits 76 branches 59 tags 1.2 GiB
Commit graph

9544 commits

Author SHA1 Message Date
Philip Rosedale
e5d64a0d5d Merge pull request #3644 from birarda/data-web-page 
fix for DataWeb hifi link handling
 2014-10-23 21:11:32 -07:00
Philip Rosedale
3f7df5962d Merge pull request #3657 from ey6es/metavoxels 
Further incremental improvements to heightfield voxelization.
 2014-10-23 21:10:21 -07:00
Andrzej Kapolka
003d2f031a Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-23 16:15:11 -07:00
Stephen Birarda
8c79d19e3e Merge branch 'master' of https://github.com/highfidelity/hifi 2014-10-23 16:07:54 -07:00
Sam Gateau
9f6454f570 Merge branch 'temp0' of https://github.com/samcake/hifi into temp1 2014-10-23 15:20:20 -07:00
Sam Gateau
d92c03364a Improve comment regarding the replacement of the QGLProgram->bind() 2014-10-23 14:53:43 -07:00
Ryan Huffman
fde7b30501 Add Camera::modeUpdated() 2014-10-23 14:47:41 -07:00
Sam Gateau
d7fca1fd27 FIxing the merge 2014-10-23 14:39:22 -07:00
David Rowe
844be60f18 Fix CMake to find ATL on Windows build PC 2014-10-23 14:34:23 -07:00
Atlante45
1ae1d28e7b typo 2014-10-23 14:07:42 -07:00
Sam Gateau
ac269e16c0 start working on the target framerate control 2014-10-23 13:19:34 -07:00
Andrzej Kapolka
34cba5c031 Added options to selectively toggle heightfield/dual contour surface 
rendering.
 2014-10-23 13:16:43 -07:00
Leonardo Murillo
a4965e7f60 No need for https when downloading assets 2014-10-23 13:59:08 -06:00
Philip Rosedale
9394f72b18 clarify fake blendshape array size 2014-10-23 11:55:06 -07:00
Andrzej Kapolka
9c43748d35 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-23 11:50:46 -07:00
Philip Rosedale
1d68413b66 Audio-only mouth uses multiple blend shapes 2014-10-23 11:43:13 -07:00
Ryan
9495c2c87a Merge remote-tracking branch 'hifi/master' 2014-10-23 08:01:43 -07:00
stojce
4e75837a64 Merge branch 'master' of https://github.com/highfidelity/hifi into 20143 2014-10-23 14:26:13 +02:00
Clément Brisset
b1b7114e66 Revert "Reverb" 2014-10-22 22:46:37 -07:00
Philip Rosedale
3ba3354e11 Merge pull request #3636 from Atlante45/reverb 
Reverb
 2014-10-22 21:51:57 -07:00
Andrzej Kapolka
631419d23c Tweaks to heightfield conversion. 2014-10-22 18:22:21 -07:00
Clément Brisset
0525c562b0 Merge pull request #3643 from ctrlaltdavid/rift-calibration-countdown 
Rift calibration countdown
 2014-10-22 17:42:35 -07:00
Clément Brisset
bf9d467328 Merge pull request #3638 from huffman/entity-tools-updates 
Entity tool fixes
 2014-10-22 17:40:21 -07:00
Stephen Birarda
04416ff40c fix for DataWebPage hifi link handling 2014-10-22 17:27:42 -07:00
David Rowe
0e3495986d Add countdown to HMD calibration billboard 2014-10-22 16:58:10 -07:00
Atlante45
93a0eb18bd Added readme 2014-10-22 16:50:02 -07:00
David Rowe
38d50a76eb Add IsFacingAvatar getter and setter to Text3DOverlay 2014-10-22 16:47:40 -07:00
Ryan
883bb5aa68 Merge remote-tracking branch 'hifi/master' 2014-10-22 16:44:37 -07:00
Atlante45
8ccbfcf695 code cleanup 2014-10-22 16:41:41 -07:00
Stephen Birarda
7b0f1477a1 expose AvatarList to Interface SE, add avatarWithDisplayName method 2014-10-22 15:28:04 -07:00
Ryan Huffman
14555c4534 Add UndoStackScriptingInterface and support when editing entities 2014-10-22 14:54:04 -07:00
David Rowe
e514f345e1 Change to use dedicated speech recognition engine instead of shared 2014-10-22 14:35:09 -07:00
Atlante45
86c965a922 Merge branch 'master' of https://github.com/highfidelity/hifi into reverb 2014-10-22 14:20:22 -07:00
Sam Gateau
d13283192f Fix the bug happening on mac due to order in which parmaeters are evaluated for all of the gl calls, now fixed with an order independant code 2014-10-22 14:07:15 -07:00
Atlante45
ad2eb08964 Correctly link in cmake 2014-10-22 13:11:45 -07:00
Atlante45
ccc8e0d876 Statically link gverb 2014-10-22 12:56:44 -07:00
Stephen Birarda
e97aef581a use InvokeMethod so that texture change happens on the right thread 2014-10-22 12:07:00 -07:00
Stephen Birarda
e079ec4363 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-10-22 12:03:46 -07:00
David Rowe
375c71d2ef Tidying 2014-10-22 11:38:45 -07:00
Atlante45
1739cf019d Gverb library CMakeLists 2014-10-22 11:35:51 -07:00
David Rowe
69b1c4273f Tidy object management 2014-10-22 11:27:06 -07:00
Ryan
2894a04027 Merge remote-tracking branch 'hifi/master' 2014-10-22 10:35:33 -07:00
Atlante45
e9d3729238 Remove unnecessary header 2014-10-22 10:30:46 -07:00
David Rowe
a45d4b2d7d Add first pass at Windows speech recognizer implementation 2014-10-22 10:17:29 -07:00
ZappoMan
2f9766e051 first cut at light entity 2014-10-22 08:41:31 -07:00
stojce
a3707a09ae fix mirror ratio on retina 2014-10-22 09:42:55 +02:00
Brad Hefta-Gaub
f76d060de3 Revert "Record graphics API commands in a "gpu::Batch" to separate traversal from rendering" 2014-10-21 20:22:44 -07:00
Brad Hefta-Gaub
650660a0fc Merge pull request #3632 from ey6es/metavoxels 
Added network condition simulator for metavoxels, fixed crash issues with reliable deltas.
 2014-10-21 18:36:11 -07:00
Sam Gateau
057c17fd2f fix suseless spaces around parameters in functions 2014-10-21 18:14:26 -07:00
Sam Gateau
86819b9344 fix endline on Batch.cpp 2014-10-21 18:03:53 -07:00
Sam Gateau
f8f9383c43 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-10-21 17:57:38 -07:00
Sam Gateau
821284edfd Introduce the gpu::Batch for the full Model::render call 2014-10-21 17:46:41 -07:00
Atlante45
d81158f941 Remove Gverb source code 2014-10-21 17:45:21 -07:00
Andrzej Kapolka
4840c44d7c Time calculation fix. 2014-10-21 17:41:41 -07:00
Andrzej Kapolka
311d1332f1 Include a simple bandwidth limit option. 2014-10-21 17:29:28 -07:00
Andrzej Kapolka
0f58b42795 Forgot these guys. 2014-10-21 16:27:26 -07:00
Stephen Birarda
fc39e82734 allow a texture change in ModelOverlay properties 2014-10-21 16:11:58 -07:00
Andrzej Kapolka
3d43e86faa Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-21 15:49:06 -07:00
Stephen Birarda
cc28fe958e add a hack method to NetworkGeometry to change a material texture by name 2014-10-21 15:44:34 -07:00
Ryan
76afc32c1a making hair look and move more like Rick James and less like Blondie 2014-10-21 15:28:06 -07:00
Clément Brisset
9476154375 Merge pull request #3628 from ZappoMan/master 
add 3D text overlay support
 2014-10-21 12:39:30 -07:00
ZappoMan
228de963ab CR feedback 2014-10-21 12:28:44 -07:00
Stephen Birarda
047ee0a513 pipe texture names through to NetworkTexture 2014-10-21 12:20:12 -07:00
Andrzej Kapolka
02c6b5a8bf Fix for send delay, delay ordering. 2014-10-21 12:16:55 -07:00
Andrzej Kapolka
5efb108e6c Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-21 11:45:43 -07:00
Sam Gateau
f090a1868c qerge branch 'master' of https://github.com/highfidelity/hifi into temp0 
q Please enter a commit message to explain why this merge is necessary,
 2014-10-21 10:51:46 -07:00
Sam Gateau
00dbe486d9 FIrst working version of the GLBatching system introduced in the MOdelrendering path 2014-10-21 10:50:53 -07:00
ZappoMan
1b9565e575 cleanup 2014-10-21 08:25:04 -07:00
ZappoMan
956d7c73b2 removed debug 2014-10-21 08:21:01 -07:00
ZappoMan
99adb413e3 add 3D text overlay support 2014-10-21 08:20:15 -07:00
Philip Rosedale
4e605f5f67 First headMove "no-barf" version with lean/nod to walk, turn 2014-10-21 00:20:08 -07:00
Andrzej Kapolka
45fb31cd08 Basic network simulation for metavoxels. 2014-10-20 18:43:41 -07:00
Atlante45
5854036296 cmake fix for ubuntu 2014-10-20 16:02:59 -07:00
Atlante45
94f66ef37a Reverb logic tweaks 2014-10-20 15:35:01 -07:00
Atlante45
6f9557fe67 Do not destroy script reverb settings 2014-10-20 15:06:02 -07:00
David Rowe
66a2639fae Add non-SAPI specific functionality 2014-10-20 14:04:19 -07:00
David Rowe
524c413681 Enable SpeechRecognizer menu item and JavaScript object for Windows 2014-10-20 13:52:37 -07:00
David Rowe
f872902ab9 Add stubs for Windows SpeechRecognizer interface 2014-10-20 13:40:11 -07:00
David Rowe
7566b7e546 Add SpeechRecognizer.h and .cpp to Windows builds 2014-10-20 13:26:51 -07:00
Atlante45
85d56824a0 Merge branch 'master' of https://github.com/highfidelity/hifi into reverb 2014-10-20 11:51:39 -07:00
Atlante45
37b47b52d3 Stream reverb settings from mixer to interface 2014-10-20 11:49:57 -07:00
AndrewMeadows
2569f70ac3 Merge pull request #3623 from ey6es/master 
For FBX files with marked "skeleton" joints, only show those marked nodes in the upload dialog.  Also added some more default node names to look for on upload.
 2014-10-20 09:00:06 -07:00
AndrewMeadows
2e958599aa Merge pull request #3621 from ey6es/metavoxels 
Sculpt brush, very rough conversion of heightfield patches to dual contour surfaces on edit.
 2014-10-20 08:55:01 -07:00
AndrewMeadows
f7c4804f33 Merge pull request #3613 from ctrlaltdavid/20112 
CR for Job #20112 - chat alerts persist
 2014-10-20 08:32:32 -07:00
Andrzej Kapolka
32c5f6e40e Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-17 18:28:16 -07:00
Andrzej Kapolka
da60a17b45 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-10-17 18:27:31 -07:00
Sam Gateau
0def490db7 startign to record all the gl commands in the Batch 2014-10-17 18:17:44 -07:00
Andrzej Kapolka
e98b99fe84 Merge pull request #3622 from birarda/domain-tunnel 
work around double login issue by generating keypair on each launch
 2014-10-17 18:05:45 -07:00
Andrzej Kapolka
c979ace924 Read the unit scale factor and include it in the offset scale. 2014-10-17 17:34:27 -07:00
Stephen Birarda
5882001311 Merge pull request #3619 from ZappoMan/modelOverlayRayPick 
ray picking support for Model and 3D volume overlays
 2014-10-17 17:03:37 -07:00
Andrzej Kapolka
1940fe67a0 Add jointEyeLeft/jointEyeRight/jointNeck to list of nodes we check for on 
upload.
 2014-10-17 16:57:15 -07:00
Stephen Birarda
5ecdb58e20 generate a new keypair on every interface launch 2014-10-17 16:55:50 -07:00
Andrzej Kapolka
1b9b0f9fc9 Look for and store the "Skeleton" type flag so that we can offer only skeleton 
joints in the dropdown.
 2014-10-17 16:51:55 -07:00
Atlante45
86b87770c2 Merge branch 'master' of https://github.com/highfidelity/hifi into reverb 2014-10-17 16:50:19 -07:00
ZappoMan
61b53701f3 fix some comments 2014-10-17 16:07:08 -07:00
ZappoMan
70d718178d make all volume3DOverlays handle proper ray picking against their rotated bounding box, make model overlays property ray pick as well 2014-10-17 13:36:37 -07:00
Atlante45
9ee0138ccf Merge branch 'master' of https://github.com/highfidelity/hifi into reverb 2014-10-17 10:50:08 -07:00
ZappoMan
fc507850be Merge branch 'master' of https://github.com/highfidelity/hifi into removeParticles 2014-10-16 20:36:28 -07:00
Andrzej Kapolka
1fdfb51600 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-16 18:54:03 -07:00
Sam Gateau
a8c3b18e78 Adding the Batch class to GPU and fixing the compilation issues 2014-10-16 17:29:40 -07:00
Sam Gateau
f09133f413 Adding the Batch class to GPU 2014-10-16 17:23:31 -07:00
Brad Hefta-Gaub
a46610a7c1 Merge pull request #3609 from ZappoMan/groupMaterialsRendering 
small optimization to model rendering
 2014-10-16 16:24:28 -07:00
Andrew Meadows
c44a592032 longer lengths for experimental hair 2014-10-16 16:21:59 -07:00
ZappoMan
47f5d499f6 small optimization 2014-10-16 15:26:01 -07:00
Atlante45
5d146a00e7 Merge branch 'master' of https://github.com/highfidelity/hifi into reverb 
Conflicts:
	interface/CMakeLists.txt
 2014-10-16 15:21:34 -07:00
Andrzej Kapolka
fc6f0afb93 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-16 15:03:29 -07:00
samcake
a6b9fe34b5 Merge pull request #3606 from ZappoMan/groupMaterialsRendering 
More Model::render() improvements
 2014-10-16 14:42:37 -07:00
ZappoMan
148b880bb1 handle case of meshes with multiple parts with different materials better, don't mix them in with single material meshes 2014-10-16 14:32:07 -07:00
ZappoMan
d1f263ecc5 group materials together when rendering models 2014-10-16 14:05:35 -07:00
Andrzej Kapolka
459b9aba38 Gradual progress on converting heightfield portions to dual contour data. 2014-10-16 13:05:38 -07:00
Stephen Birarda
7bbaaf6b78 cleanup some username signature debug, fix interest list pull 2014-10-16 11:54:55 -07:00
AndrewMeadows
e75d2a167a Merge pull request #3602 from ZappoMan/frustumCullModelParts 
More Model::render() improvements
 2014-10-16 11:04:57 -07:00
Atlante45
0f128509d8 removed old processReceivedAudio method 2014-10-16 10:58:19 -07:00
Brad Hefta-Gaub
866b3d40fc Merge pull request #3604 from AndrewMeadows/inertia 
experimental hair tuning
 2014-10-16 10:53:31 -07:00
AndrewMeadows
4fbc589606 Merge pull request #3598 from birarda/domain-tunnel 
initial pass at using keypairs for username verification for basic domain-server ACL
 2014-10-16 10:49:03 -07:00
Andrew Meadows
8b54569480 experimental hair tuning submitted by Ryan 2014-10-16 10:20:12 -07:00
ZappoMan
ffb7bcf9d3 wire up different culling options to debug menus 2014-10-16 09:32:24 -07:00
ZappoMan
d238d06df5 build a cached lookup table for the shouldRenderMesh() LOD method 2014-10-16 01:00:32 -07:00
ZappoMan
bf77adc4bc add support for LOD occulsion for too small meshes in Model::render() 2014-10-16 00:30:24 -07:00
Brad Hefta-Gaub
8ee26923da Merge pull request #3600 from birarda/master 
some dead code removal
 2014-10-15 20:23:59 -07:00
ZappoMan
4c7ecba579 spelling change 2014-10-15 20:23:04 -07:00
ZappoMan
921a3fb8c0 switch QList<> to QVector<> and add some guards against out of range indices 2014-10-15 20:18:04 -07:00
samcake
01b64d78e3 Merge pull request #3601 from ZappoMan/frustumCullModelParts 
Implement "segregation" of mesh groups
 2014-10-15 18:09:48 -07:00
ZappoMan
56b4d58f18 implement mesh groups and pull out shader programs in renderMeshes() to outside the loop based on group 2014-10-15 17:08:47 -07:00
Stephen Birarda
fcd73858b8 remove Faceplus as a face tracker option 2014-10-15 15:13:52 -07:00
ZappoMan
8a83511942 first cut at separating opaque from transparent meshes 2014-10-15 14:40:42 -07:00
ZappoMan
c8db8855cc move tallyAllTimerRecords out of conditional so they don't pile up 2014-10-15 14:23:29 -07:00
AndrewMeadows
8372975bad Merge pull request #3582 from PhilipRosedale/master 
'Ribbons' that are driven by audio loudness and tuned/draped for mask avatars
 2014-10-15 14:08:20 -07:00
ZappoMan
3a6715c0bc improve timing stats display 2014-10-15 14:00:56 -07:00
ZappoMan
46cb780aa5 view cull mesh parts 2014-10-15 10:08:21 -07:00
ZappoMan
eab96587fe add stats for entity rendering details 2014-10-15 09:24:58 -07:00
ZappoMan
da4c179a9f correctly track rendered entities 2014-10-15 09:23:59 -07:00
ZappoMan
8c37181635 add menu item for enable/disable culling of model parts 2014-10-15 09:23:27 -07:00
Andrzej Kapolka
3006950b83 Comment fix. 2014-10-14 18:24:44 -07:00
Stephen Birarda
e9bcc90166 handle remaining conversions for AccountManager passing QNetworkReply 2014-10-14 16:16:54 -07:00
Stephen Birarda
c4b0dc9dcc initial handling of username signature in domain-server 2014-10-14 16:03:35 -07:00
Atlante45
954be926e1 Fix cmake 2014-10-14 15:48:43 -07:00
Andrzej Kapolka
fba383f6d3 Render voxel cursor on heightfields, too. 2014-10-14 15:21:45 -07:00
Atlante45
4a3f72ab0b Merge branch 'master' of https://github.com/highfidelity/hifi into reverb 2014-10-14 15:13:50 -07:00
Andrzej Kapolka
394bf2b4ee Basic sculpt tool, refactored common material bits in tools. 2014-10-14 14:37:32 -07:00
Stephen Birarda
22b599b8cc repair for persisting of Account to file after keypair generation 2014-10-14 14:21:18 -07:00
Andrzej Kapolka
ff368f9848 Merge pull request #3592 from samcake/temp0 
Rendering resolution can be different than the native window resolution
 2014-10-14 11:56:50 -07:00
Stephen Birarda
69402e275c use DER format for generated keys in RSAKeypairGenerator 2014-10-14 11:51:58 -07:00
Stephen Birarda
5f67194564 fix member variable order in Joystick class 2014-10-14 11:39:28 -07:00
Stephen Birarda
d0f91c5c2e remove old mechanism for octree payments 2014-10-14 11:38:50 -07:00
Stephen Birarda
912512936e add RSAKeypairGenerator to generate a 2048-bit keypair 2014-10-14 11:36:40 -07:00
David Rowe
a619d0460d Show chat alerts in icon tray only if not already seen 2014-10-14 11:08:24 -07:00
David Rowe
5151563b79 Coding standard 2014-10-14 11:08:02 -07:00
Stephen Birarda
cca8b68d2e update location and profile paths for new format 2014-10-14 10:40:58 -07:00
AndrewMeadows
2a35c4af4d Merge pull request #3593 from huffman/20024 
CR for Job #20024 - UI edits to Running Scripts dialog
 2014-10-14 09:52:13 -07:00
Stephen Birarda
20f97792bf Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel 2014-10-14 09:26:11 -07:00
Sam Gateau
153d3b532b merged with upstream, all clear 2014-10-14 00:19:19 -07:00
samcake
e7af0cbe7f Using the correct scaling factor for the avatar display name call. CHanged the scale coming from the widget.devicePixelRatio to the actual RenderResolutionScale we assign in the Application 2014-10-14 00:08:29 -07:00
Sam Gateau
113fb1908a fix the first issues 2014-10-13 23:28:43 -07:00
NextPrior
a0a5530641 Initial reverb implementation 
Conflicts:
	interface/CMakeLists.txt
	interface/src/Audio.cpp
	interface/src/Audio.h
	libraries/script-engine/src/ScriptEngine.cpp
 2014-10-13 18:13:51 -07:00
samcake
700ec5cf79 Rendering resolution can be different than the native window resolution 
- Get rid of the different GlowModes since we found the correct one (DIFFUSE and ADD)
  Get rid of the ui to change the mode

- INtroduce a "RenderResolutionScale" in the application that controls the ratio ofthe resolution between the framebuffers and the native window provided by Qt

- In the paintGL, in the default rendering path:
  the rendering Framebuffers are resized to the window.size * renderResolutionScale.
  The viewport is assigned to the framebuffer size from GlowEffect.prepare() to GlowEffect.render() (and not the original GLCanvas size)
  at the end of GLowEffect render, the final step is to blit the colorbuffer from the rendering into the window's default framebuffer at the original resolution, and that requires one more glViewport

- add the ui in developer/render/ menu "scale resolution" where you can select the scaling level. THis should show in the rendering with ugly aliasing when selecting a scale under 1/2.
 2014-10-13 18:00:50 -07:00
Andrzej Kapolka
00490af837 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-13 17:59:35 -07:00
Clément Brisset
87d067c8f0 Merge pull request #3590 from ctrlaltdavid/extra-logging 
Minor logging improvements
 2014-10-13 16:20:43 -07:00
Clément Brisset
f6f187e7f0 Merge pull request #3587 from ctrlaltdavid/20101 
CR for Job #20101 - Upload model file function is broken
 2014-10-13 16:16:49 -07:00
Clément Brisset
9d050782cc Merge pull request #3586 from ctrlaltdavid/20093 
CR for Job #20093 - Add a menu item corresponding to the apostrophe key (reset sensors)
 2014-10-13 16:14:04 -07:00
Andrzej Kapolka
fcbdf04c19 Apply alpha restrictions when we apply the edit. 2014-10-13 16:01:38 -07:00
Andrzej Kapolka
13efaba22c Basic metavoxels example. 2014-10-13 15:34:38 -07:00
Andrzej Kapolka
60576bdcbd Basic metavoxel scripting bits. 2014-10-13 15:05:16 -07:00
ZappoMan
c7d544cd58 wire up collision signals 2014-10-13 14:36:06 -07:00
ZappoMan
4c85e9f581 removing particles 2014-10-13 14:10:57 -07:00
David Rowe
958acfcfe0 Fix version logging include to include build number and write in log 2014-10-13 13:23:31 -07:00
David Rowe
bd9451d4c6 Log Oculus SDK version used in build 2014-10-13 13:20:24 -07:00
AndrewMeadows
d90d30ad9f Merge pull request #3585 from ZappoMan/editToolsImprovements 
various edit tool fixes
 2014-10-13 10:12:47 -07:00
AndrewMeadows
3d888b6c27 Merge pull request #3584 from huffman/sdl-update 
Update to SDL2
 2014-10-13 09:37:16 -07:00
Philip Rosedale
99e596ae7e really remove file 2014-10-13 17:35:00 +01:00
Philip Rosedale
c4000eb468 fix windows error 2014-10-13 17:33:01 +01:00
David Rowe
c6bf09f509 Fix model uploading for the case that haven't uploaded model before 2014-10-13 08:35:52 -07:00
Philip Rosedale
18979adf23 remove startup debug from buckyballs 2014-10-12 20:42:53 -07:00
Philip Rosedale
e5f93d00ac remove unused utility functions 2014-10-12 20:42:15 -07:00
Philip Rosedale
dc09572776 remove unused functions 2014-10-12 20:17:20 -07:00
Philip Rosedale
bc6346c257 Removed unused constant, class 2014-10-12 20:14:51 -07:00
Philip Rosedale
a054408abb Merge branch 'master' of https://github.com/worklist/hifi 2014-10-12 17:04:37 -07:00
ZappoMan
a08ddecc3a fix shifting tickmarks 2014-10-10 22:06:12 -07:00
Ryan Huffman
42479b1ae2 Add joystickWithName for PrioVR 2014-10-10 18:03:08 -07:00
Andrzej Kapolka
d1c6aef953 Fixed my swizzle! 2014-10-10 17:36:21 -07:00
Ryan Huffman
a24b5c24a9 Update max axis value to reflect maximum negative value 2014-10-10 17:28:09 -07:00
Andrzej Kapolka
1f63656a14 Comment fix. 2014-10-10 17:25:25 -07:00
Andrzej Kapolka
dc8dc112c9 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-10 17:19:24 -07:00
Andrzej Kapolka
60da0f1567 Allow drawing cursor on dual contour surface, wired up material paint tool. 2014-10-10 17:18:52 -07:00
Philip Rosedale
9be2b33971 Hair draped for masks and driven by audio loudness 2014-10-10 17:06:11 -07:00
Ryan Huffman
762cc71d31 Update to SDL2 2014-10-10 17:03:10 -07:00
Andrzej Kapolka
1911cfd0be Basic ray/voxel intersection testing up and running. 2014-10-10 15:11:37 -07:00
Stephen Birarda
21114d5f56 Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel 2014-10-10 14:30:43 -07:00
Stephen Birarda
df6f4d4c95 remove cara face tracking, cleanup warnings 2014-10-10 14:17:52 -07:00
David Rowe
edf8cb671d Add "reset sensors" menu item corresponding to the apostrophe key 2014-10-10 13:24:48 -07:00
Andrzej Kapolka
c8c09a1e7b Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-10 13:02:10 -07:00
David Rowe
b718d27ac6 Merge branch 'master' into 20073 2014-10-10 12:04:36 -07:00
David Rowe
357d49d442 Fix building without Oculus library 2014-10-10 11:36:47 -07:00
David Rowe
b0f4bc0d1c Tidy up log messages 2014-10-10 11:08:15 -07:00
David Rowe
0a5fdee1f2 Use NULL rather than 0 for "no overlay" 2014-10-10 11:00:41 -07:00
David Rowe
aa37ba5dfd Use const parameters 2014-10-10 10:57:17 -07:00
David Rowe
64d9a96a2b Update SVG file location 2014-10-10 10:42:13 -07:00
Stephen Birarda
76d00f351d Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel 2014-10-10 09:28:14 -07:00
AndrewMeadows
2a8b002725 Merge pull request #3576 from ZappoMan/editToolsImprovements 
First cut at new rotation UI/UX
 2014-10-10 08:17:22 -07:00
Brad Hefta-Gaub
961590414c Merge pull request #3574 from PhilipRosedale/master 
Oculus fixed for 3rd person and fullscreen mirror view
 2014-10-09 21:30:18 -07:00
ZappoMan
8105ded4eb handle reloading a new url in billboard overlays 2014-10-09 21:12:05 -07:00
Andrzej Kapolka
7b0d002355 Working on ray/voxel intersection testing. 2014-10-09 19:51:02 -07:00
ZappoMan
e5572e9deb don't render if alpha is 0 2014-10-09 19:20:33 -07:00
Andrzej Kapolka
51ff4cf7bb Merge pull request #3567 from samcake/master 
Improve the TextRenderer::draw(), step 1
 2014-10-09 18:46:23 -07:00
Sam Gateau
6687660d2f Fixing Andrzej's comments bis 2014-10-09 17:29:06 -07:00
Sam Gateau
1fc78e4277 Fixing Andrzej's comments 2014-10-09 17:18:51 -07:00
Stephen Birarda
31df339565 pipe username signature requirement through to DomainHandler 2014-10-09 16:53:22 -07:00
Philip Rosedale
f18faf9e3e removed commented code. 2014-10-09 16:46:06 -07:00
Philip Rosedale
2da4345b21 First person and mirror HMD view almost fixed 2014-10-09 13:32:35 -07:00
Sam Gateau
86c20b26eb Adding proper TODO and comments 2014-10-09 12:20:46 -07:00
Sam Gateau
d080d6347b Fixing const usage on a template function 2014-10-09 11:10:04 -07:00
Sam Gateau
b0c02311c0 Fixing include filename case 2014-10-09 10:56:41 -07:00
Sam Gateau
adc4e8c513 Fixing unix file format issues with msdev2010 2014-10-09 10:39:28 -07:00
samcake
9f0936de53 Improve the TextRenderer::draw(), first step 
- Introduce a managed Buffer for data to be used on the GPU. THis is the first type of resource (second will be texture) that we plan to    use in the graphics engine in the long term. this is an api agnostic replacement to QGLBuggerObject
  It's in the new file gpu/Resource.h(.cpp)

- Add two gpu::Buffers in the TextRenderer that collect all the glyph vertices (coords + texcoords + color) during the for loop on the string characters of the TextRenderer::draw(). Right now the text glyphs are then drawn in one draw call (and not one per character) at the end of the function.

THe step 2 plan is to keep on collecting all the glyphs from all the TextRenderer::Draw() issued during one frame and to draw all of them in a single drawcall. We decided to split the task in 2 so it's easier to review.
 2014-10-09 10:17:50 -07:00
ZappoMan
2004159778 implement basic support for planar overlay type intersections 2014-10-08 20:29:53 -07:00
Brad Hefta-Gaub
c9c3ab985a Merge pull request #3565 from PhilipRosedale/master 
Simplify camera class to have no interpolation, simpler structure
 2014-10-08 17:06:21 -07:00
Brad Hefta-Gaub
80e82c95ca Merge pull request #3560 from birarda/xbox-controller 
allow a call to Joysticks.reset to reset SDL while interface is running
 2014-10-08 17:06:12 -07:00
Brad Hefta-Gaub
a673634245 Merge pull request #3559 from stojce/20084 
CR for Job #20084 - Microsoft Windows - Chat window font needs to be fixed (see attached)
 2014-10-08 17:05:40 -07:00
Philip Rosedale
01bef6be6d remove unused cameraPushback variable 2014-10-08 15:28:29 -07:00
Andrzej Kapolka
19ec68309b Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-08 15:22:17 -07:00
Andrzej Kapolka
37eff685bc Remove the "render lower detail as points" option. It doesn't seem too 
promising.
 2014-10-08 15:11:55 -07:00
Andrzej Kapolka
b5b82ed387 Provide the option to display lower detail metavoxel data as points. 2014-10-08 14:05:14 -07:00
Stephen Birarda
ce505c1b0c add a missing HAVE_SDL wrap on setter in Joystick 2014-10-08 12:09:40 -07:00
Clément Brisset
e4f5f11429 Merge pull request #3557 from birarda/master 
fix for window modalities
 2014-10-08 11:53:48 -07:00
David Rowe
05915ae134 Make calibration message update its location more often 2014-10-08 11:53:07 -07:00
Andrzej Kapolka
049a00b85b Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-08 11:51:10 -07:00
Stephen Birarda
8e2d41f37f remove deadzone handling from Joystick class 2014-10-08 11:41:07 -07:00
AndrewMeadows
4873528068 Merge pull request #3543 from birarda/domain-tunnel 
handle local socket changes when moving networks for auto networked domains
 2014-10-08 11:36:56 -07:00
Stephen Birarda
17b9f4a37d allow a call to Joysticks.reset to reset SDL while interface is running 2014-10-08 11:34:45 -07:00
Philip Rosedale
12349a8854 Fix rearview mirror camera 2014-10-08 10:59:46 -07:00
Philip Rosedale
00c182ad7b Fix full screen mirror keyboard controls 2014-10-08 10:51:06 -07:00
Philip Rosedale
2636fdd3cb Fix third person camera distance 2014-10-08 10:23:45 -07:00
Stephen Birarda
b0a99c48a7 don't force metavoxel editor to stay on top 2014-10-08 10:05:13 -07:00
Stephen Birarda
a8a8b81386 don't make long and address bar modal so they don't steal input 2014-10-08 10:00:50 -07:00
Philip Rosedale
c4c9f4820d First pass at simplifying camera, removes interpolation to target and setbacks 2014-10-08 10:00:47 -07:00
Stephen Birarda
3794e166ad change LoginDialog modality so it doesn't steal input 2014-10-08 09:51:16 -07:00
AndrewMeadows
c56923d316 Merge pull request #3549 from ZappoMan/editToolsImprovements 
add tick marks to planar ellipse/circle overlays
 2014-10-08 09:33:34 -07:00
Stephen Birarda
7773a94df7 resolve conflicts on merge with upstream master 2014-10-08 09:27:16 -07:00
Sam Gateau
dda7c6699e backup current work on TextRenderer 2014-10-07 23:52:00 -07:00
Philip Rosedale
f4b9ccbceb remove unused camera functions 2014-10-07 21:51:46 -07:00
stojce
54ad9477e7 Add style to chat entry 2014-10-08 03:12:53 +02:00
Andrzej Kapolka
04b628bede Added option to display Hermite data 2014-10-07 16:44:55 -07:00
stojce
fa58f53bff remove font settings for chat entry 2014-10-08 01:28:24 +02:00
Stephen Birarda
6e81bde7bd make position path clearer for address bar 2014-10-07 15:30:44 -07:00
Stephen Birarda
ec6b6999a0 fix for location hash in address bar 2014-10-07 15:29:57 -07:00
Andrzej Kapolka
604fc84232 More fiddling with averages. 2014-10-07 14:33:01 -07:00
Stephen Birarda
ea4c5a8900 repairs for new user scoped paths 2014-10-07 14:18:05 -07:00
Andrzej Kapolka
c9fb73ecf8 Playing around with using points to represent distant voxel surfaces. 2014-10-06 18:52:10 -07:00
Andrzej Kapolka
9fc0abe2b3 Working on metavoxel averaging. Still pretty rough. 2014-10-06 17:30:28 -07:00
David Rowe
ebf615fc30 Fix header declaration 2014-10-06 17:25:40 -07:00