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

4483 commits

Author SHA1 Message Date
Niraj Venkat
e036602726 Fixing merge conflicts 2015-07-24 11:08:40 -07:00
Bradley Austin Davis
975c95eded Merge remote-tracking branch 'tony/ajt/overlay-fade' into plugins 2015-07-24 13:59:11 -04:00
samcake
f3dc159e33 Merge pull request #5401 from ZappoMan/renderLaserPointers 
remove renderLaserPointers()
 2015-07-24 10:41:32 -07:00
Bradley Austin Davis
a60e669d3d Merge branch 'master' into plugins 2015-07-24 13:38:18 -04:00
Brad Hefta-Gaub
939638a3a8 Merge pull request #5414 from birarda/slow-events 
allow the QEvent queue in Application to get behind
 2015-07-24 10:10:42 -07:00
Brad Davis
6eec04c798 Merge pull request #5407 from samcake/yellow 
Removing the glNaked code for capturing the billboard snaphot and rendering the rearViewMirror in a separate render target
 2015-07-24 13:09:07 -04:00
samcake
e6f2504514 FIx the problem of clear when the color mask is not WRITE_ALL 2015-07-24 09:26:32 -07:00
Brad Davis
6899279d7d Merge pull request #5399 from ZappoMan/fixJSRayPick 
Fix JS calls to computePickRay() when mini-mirror is showing
 2015-07-24 11:46:07 -04:00
Seth Alves
6841a47c4b Merge pull request #5412 from AndrewMeadows/bohrium 
decouple FPS from rotation rate during mouse drag
 2015-07-24 07:44:22 -07:00
samcake
52ac5b3ef6 On mac cannot get ther erendering to properly display the overlay if the rear view mirror is active on resize 2015-07-24 03:38:21 -07:00
Sam Gateau
cb375e8ece FIund a nasty bug with the scissor which was the reason for many issues, tried to integrate the framebuffer setup and clear as part of the enginepipeline so calling display side is simpler 2015-07-24 02:15:50 -07:00
Anthony J. Thibault
87a0e48d30 Updates to overlay fade 
* vive rendering works again
* overlay fades away in standing mode, if you look or move away from the overlay sphere.
* middle mouse button can be used to fade in or out the overlay
* mouse pointer renders properly on overlay
 2015-07-23 20:36:58 -07:00
samcake
8421aafe33 try to fix the scaling issues on mac 2015-07-23 18:17:10 -07:00
Stephen Birarda
cdcab299b6 bring back delayed queue of Application events 2015-07-23 18:00:35 -07:00
Andrew Meadows
2fc158246d decouple FPS from rotation rate during mouse drag 2015-07-23 17:30:50 -07:00
Anthony J. Thibault
1d93abf90c Overlay can be shown and hidden and has better behavior in Standing HMD Mode. 
Added OverlayConductor class that "orchestrates" Overlays, ApplicationCompositor & AppliationOverlay instances
so that the overlay can be smoothly animated on and off, mouse/key events are blocked when overlay is disabled.
 2015-07-23 17:17:03 -07:00
Sam Gateau
a424ff98ca Fixing issues with the review process 2015-07-23 16:55:18 -07:00
Sam Gateau
d56b5f39fb strenghening the checks in GLBackend::downloadFramebuffer before actually calling the true glReadPixels 2015-07-23 16:31:11 -07:00
Sam Gateau
be9d99264f Introducing the download Framebuffer call on the context to capture a snapshot 2015-07-23 16:15:10 -07:00
Sam Gondelman
7c9189cfbe trying to fix init issue 2015-07-23 16:13:27 -07:00
Ryan Huffman
0b2e896ea4 Add Asset-related types and packets 2015-07-23 15:13:56 -07:00
Sam Gateau
dc10f30d3d Merged 2015-07-23 15:10:42 -07:00
Sam Gateau
a561874ce3 Render the rear view mirror in a separate target and then display it during overlay pass 2015-07-23 14:56:14 -07:00
Bradley Austin Davis
00342d2c76 Fixing the avatar / HMD pose compisition for Oculus 2015-07-23 17:48:06 -04:00
Stephen Birarda
9e7fb9ae16 shuffle Packet headers, use static enum for PacketType 2015-07-23 13:56:47 -07:00
Bradley Austin Davis
4ad72be0c7 Merge remote-tracking branch 'sam2/sam/input-plugins' into plugins 2015-07-23 15:40:22 -04:00
Bradley Austin Davis
96a52c4f02 Working on mac oculus functionality 2015-07-23 15:38:23 -04:00
Sam Gondelman
4c6783a791 Merge remote-tracking branch 'upstream/plugins' into sam/input-plugins 2015-07-23 11:46:07 -07:00
David Rowe
ad7167c67a Merge branch 'master' into 20602 2015-07-23 11:22:05 -07:00
Bradley Austin Davis
40485948f9 Fixing merge boo-boos 2015-07-23 13:49:17 -04:00
ZappoMan
f4ec09a48b move renderLaserPointers() into a draw item 2015-07-23 10:42:22 -07:00
Bradley Austin Davis
1db4162371 Merge branch 'master' into plugins 2015-07-23 13:42:03 -04:00
Niraj Venkat
9ccf316513 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar 2015-07-23 10:36:46 -07:00
Stephen Birarda
67ca8b2347 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2015-07-23 09:51:44 -07:00
ZappoMan
3350d638dd always use the _viewFrustum for caluclating the pick ray, not the _displayViewFrustum which can be the mirror 2015-07-23 09:29:27 -07:00
Brad Hefta-Gaub
a27a2f601b Merge pull request #5395 from huffman/fix-ray-picking 
Fix ray picking working intermittently
 2015-07-23 08:15:15 -07:00
Ryan Huffman
198b6cfa88 Fix ray picking working intermittently 
Ray picking relies on the Application's viewFrustum which was being set
to both the main camera and mirror camera for their respective pass
while rendering. This makes sure the viewFrustum only ever holds the
    main camera. Application::_displayViewFrustum still gets updated to
    the current camera while rendering.
 2015-07-23 06:17:08 -07:00
Stephen Birarda
7cee5f3ce5 don't reset the idleTimer if the interval hasn't changed 2015-07-22 18:05:04 -07:00
Stephen Birarda
db5e8c72ee force event processing up to a certain max time 2015-07-22 17:59:07 -07:00
Stephen Birarda
785ae190ca add back send posted touch events 2015-07-22 17:49:27 -07:00
ZappoMan
71eeecc7f6 Revert "Instrument the inter-idle time and tweaking the timeout setting" 
This reverts commit 0c88972f09.
 2015-07-22 16:53:56 -07:00
SamGondelman
e27ba86f75 fixing merge issues with plugins 2015-07-22 14:57:59 -07:00
SamGondelman
505ef4c5cc set up sixense/vive menu items with correct event forwarding 2015-07-22 11:36:31 -07:00
Sam Gateau
f70553ec95 Fixing merge 2015-07-22 11:31:46 -07:00
Anthony J. Thibault
700909d537 Fix for mirror rendering 
RenderArgs _renderMode was not getting set properly in
renderRearViewMirror().  Previously this was set in PaintGL but was lost
during display plugins refactor.
 2015-07-22 11:11:12 -07:00
Stephen Birarda
8363b0d522 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2015-07-22 11:06:53 -07:00
Sam Gateau
7ac2030862 Preparing for first pr 2015-07-22 10:43:50 -07:00
Niraj Venkat
adf7a1098d Merge branch 'master' of https://github.com/highfidelity/hifi into avatar 2015-07-22 10:27:39 -07:00
Bradley Austin Davis
408bb082d7 Merge fixes, OSX compile fixes 2015-07-22 13:24:47 -04:00
Bradley Austin Davis
114ab9e47f Merge branch 'master' into plugins 2015-07-22 11:47:56 -04:00
Bradley Austin Davis
2f13488f11 Fixing FBO bug on resizing windows 2015-07-22 11:28:36 -04:00
Bradley Austin Davis
c0048afbec Merge branch 'bart' into marge 2015-07-22 09:07:45 -04:00
Bradley Austin Davis
ae539afafb Fix deadlock when using textoverlay from main thread 2015-07-22 07:23:12 -04:00
SamGondelman
e3bc4b3b89 working on plugin menu manipulation 2015-07-21 13:45:33 -07:00
Stephen Birarda
086e4efe44 verify packet versions at ice-server 2015-07-21 13:03:39 -07:00
Niraj Venkat
e0634de403 Turn on/off debug AO from menu item 2015-07-21 12:14:09 -07:00
Stephen Birarda
a61c04aa92 allow socket owner to specify unfiltered packets 2015-07-21 12:00:16 -07:00
Bradley Austin Davis
fda1cb6f7b Merge remote-tracking branch 'upstream/master' into marge 2015-07-21 08:59:29 -07:00
Brad Davis
9016f437a8 Merge pull request #5371 from Atlante45/smart_pointers 
Smart pointers fixes
 2015-07-21 08:52:29 -07:00
Brad Davis
6d4c7cd4f2 Merge pull request #5374 from ZappoMan/warningFixes 
Warning fixes and removing dead code
 2015-07-21 07:23:40 -07:00
Brad Davis
9fd80d7954 Working on batch 2015-07-20 19:21:29 -07:00
Brad Davis
5744200f64 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/CMakeLists.txt
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/avatar/MyAvatar.h
 2015-07-20 19:21:02 -07:00
Brad Davis
51973674f5 Merge remote-tracking branch 'upstream/master' into marge 2015-07-20 17:26:36 -07:00
Brad Davis
c3a2b72c13 Breaking framebuffer ops out of texture cache 2015-07-20 17:26:26 -07:00
David Rowe
ac4b64c853 Merge branch 'master' into 20602 2015-07-20 17:14:52 -07:00
Sam Gateau
5bf85961d2 removing dead code 2015-07-20 17:13:02 -07:00
Brad Davis
94d57a2e43 fixing missing glew init 2015-07-20 16:51:01 -07:00
Sam Gateau
9d9142c274 cleaning commented code supposedly dead now 2015-07-20 16:50:24 -07:00
Sam Gateau
6a0ca6e113 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2015-07-20 16:22:12 -07:00
Stephen Birarda
9fb8b55359 repairs to early return for sendNackPackets 2015-07-20 16:10:11 -07:00
Sam Gateau
b5090883a0 merge with latest network pr 2015-07-20 15:49:10 -07:00
David Rowe
a488a12151 Merge branch 'master' into 20602 2015-07-20 15:37:43 -07:00
Sam Gateau
59666f664a merging my changes to remove cruff from application to AUstin;s latest 2015-07-20 15:37:17 -07:00
Anthony J. Thibault
80dea6831c Merge branch 'plugins' of github.com:highfidelity/hifi into sam/vive-hand-controllers 
Conflicts:
	interface/src/Application.cpp
	libraries/input-plugins/src/input-plugins/SixenseManager.cpp
 2015-07-20 15:18:23 -07:00
ZappoMan
648d0f6d43 fix a bunch of warnings 2015-07-20 15:12:27 -07:00
Niraj Venkat
eaf75c01b9 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar 
Conflicts:
	libraries/render-utils/src/AmbientOcclusionEffect.cpp
	libraries/render-utils/src/AmbientOcclusionEffect.h
 2015-07-20 14:55:27 -07:00
Niraj Venkat
85c9ee0feb Merge branch 'master' of https://github.com/highfidelity/hifi into avatar 
Conflicts:
	libraries/render-utils/src/AmbientOcclusionEffect.cpp
 2015-07-20 14:53:19 -07:00
Atlante45
8d6ff2d9f9 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-20 14:50:44 -07:00
Brad Davis
c0859ffd4c Removing some dead forward declarations 2015-07-20 14:33:10 -07:00
Andrew Meadows
7578a70c4c Merge pull request #5359 from birarda/protocol 
Network Protocol Refactor
 2015-07-20 14:30:58 -07:00
Brad Davis
9fafc920ee Merge branch 'homer' into plugins 
Conflicts:
	interface/src/Application.cpp
	libraries/render-utils/src/AmbientOcclusionEffect.cpp
 2015-07-20 13:53:15 -07:00
Atlante45
59acfc9f47 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-20 13:51:51 -07:00
Brad Davis
488a449cb1 Merge branch 'master' into homer 2015-07-20 13:34:21 -07:00
Brad Davis
359abd6474 Merge branch 'master' into plugins 
Conflicts:
	interface/CMakeLists.txt
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/GLCanvas.cpp
	interface/src/GLCanvas.h
	interface/src/devices/OculusManager.cpp
	interface/src/devices/OculusManager.h
	interface/src/devices/TV3DManager.cpp
	interface/src/ui/overlays/LocalModelsOverlay.cpp
	libraries/render-utils/src/OffscreenGlCanvas.cpp
	libraries/render-utils/src/OffscreenGlCanvas.h
	libraries/render-utils/src/text/EffectType.h
 2015-07-20 13:33:24 -07:00
Stephen Birarda
0177513285 resolve conflicts on merge with upstream/master 2015-07-20 12:29:38 -07:00
Sam Gateau
1a9f6e12a5 something not compiling but just before merge with upstream 2015-07-20 12:20:04 -07:00
Brad Hefta-Gaub
c41e20b90f Merge pull request #5366 from jherico/marge 
Naked GL removal work
 2015-07-20 12:12:22 -07:00
ericrius1
e75a6feafe can toggle hit effect on and off from a script 2015-07-20 11:58:26 -07:00
Brad Davis
dcaaeec593 Removing AO effect (temporarily) and wireframe mode 2015-07-20 10:55:11 -07:00
SamGondelman
d88e484b00 hand information is in correct coordinate space, cleanup 2015-07-20 10:44:27 -07:00
Atlante45
fc2956342e Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-20 10:39:16 -07:00
Brad Davis
de92e66635 Removing shadows code 2015-07-20 09:59:22 -07:00
Brad Davis
d4e637c5b8 Removing superfluous lighting and naked GL in mirror 2015-07-20 09:36:05 -07:00
Stephen Birarda
6b11495a20 resolve conflicts on merge with upstream master 2015-07-20 08:51:48 -07:00
Brad Davis
5b494c23fd More header cleanup 2015-07-18 22:38:26 -07:00
Brad Davis
35f7307f30 More header cleanup 2015-07-18 22:15:50 -07:00
Brad Davis
e4f6586c3c Working on star rendering, removal of naked GL 2015-07-18 16:40:54 -07:00
Philip Rosedale
61c2b172d4 Merge pull request #5357 from ctrlaltdavid/scriptable-muting 
Mute / un-mute face tracking when menu item is changed from script
 2015-07-18 15:45:01 -07:00
David Rowe
47fdbedfb2 Fix FPS throttle default 2015-07-18 15:22:47 -07:00
David Rowe
d0489bf2a0 Add menu item, Developer > Render > Throttle FPS If Not Focus 2015-07-18 14:18:06 -07:00
Brad Davis
b7fdfd8663 Working on lighting 2015-07-18 10:55:53 -07:00
Brad Davis
d68618e206 Removing GL headers from most files, and some naked GL from application.cpp 2015-07-18 00:46:09 -07:00
Atlante45
256c786e28 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-17 17:59:19 -07:00
Sam Gateau
a0590182ad Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2015-07-17 17:44:54 -07:00
Sam Gateau
96e18af77b trying to remove the naked gl calls aroiund the rearViewMirror 2015-07-17 17:44:25 -07:00
Anthony J. Thibault
01c740f415 cleaning up plugin architecture, fixed hand controllers 2015-07-17 17:19:49 -07:00
Stephen Birarda
f8c832e50b resolve conflicts on merge with upstream master 2015-07-17 16:48:46 -07:00
ZappoMan
26e8090ec1 Merge branch 'master' of https://github.com/highfidelity/hifi into removeNakeGL 2015-07-17 16:48:42 -07:00
Brad Hefta-Gaub
3ea348b73b Merge pull request #5349 from jherico/marge 
Working on text rendering overlays
 2015-07-17 16:47:48 -07:00
Niraj Venkat
0580c8477e 3-step groundwork for AO in the pipeline 2015-07-17 16:42:03 -07:00
ZappoMan
8692f51399 dead code cleanup 2015-07-17 16:15:02 -07:00
Stephen Birarda
1fd4a1f0c3 resolve conflicts on merge with upstream master 2015-07-17 16:07:45 -07:00
Stephen Birarda
54edc6f993 Merge branch 'master' of https://github.com/highfidelity/hifi into protocol 2015-07-17 16:04:45 -07:00
ZappoMan
c20c6e4b90 fix retina in an Austin approved manner 2015-07-17 16:01:32 -07:00
ZappoMan
03a44a1c80 fix retina 2015-07-17 15:45:42 -07:00
Atlante45
3f4041595a Fix compile error in connect 2015-07-17 15:26:04 -07:00
ericrius1
a44e5f949c Merge branch 'master' into polyLineInProgress 2015-07-17 15:01:40 -07:00
Brad Hefta-Gaub
2df75f8bff Merge pull request #5337 from bwent/audioStatsDialog 
Added a dialog box to display Audio Network Statistics
 2015-07-17 14:45:51 -07:00
David Rowe
550e9224c5 Mute / un-mute face tracking when menu item is changed from script 2015-07-17 11:45:15 -07:00
Stephen Birarda
7a13c867ae quit the ScriptEngine thread once the script is done 2015-07-17 11:18:14 -07:00
Anthony J. Thibault
5fe4d06562 fixed input devices menu exclusivity 2015-07-17 11:11:31 -07:00
Stephen Birarda
e5722098f6 resolve conflicts on merge with upstream/master 2015-07-17 11:06:01 -07:00
Ryan Huffman
9725184b24 Move dataSent signal from PacketReceiver to LimitedNodeList 2015-07-17 11:05:07 -07:00
Brad Davis
ea74aac1d6 Working on cleaning up diff 2015-07-17 11:02:32 -07:00
ZappoMan
efa2001325 Merge branch 'master' of https://github.com/highfidelity/hifi into removeNakeGL 2015-07-17 09:25:37 -07:00
Brad Davis
7f6bb552a3 Working on cleaning up diff 2015-07-16 20:51:37 -07:00
Anthony J. Thibault
e8da4b9586 merge with plugins, needs testing 2015-07-16 18:47:39 -07:00
Anthony J. Thibault
060f6c19a6 almost finished plugin architecture, general plugin improvements. menu actions don't work all the time, joint controllers need to be handled better, and activate/deactive aren't always called correctly 2015-07-16 18:16:59 -07:00
Atlante45
ceea5143e1 Avoid string copy 2015-07-16 16:55:37 -07:00
Atlante45
6ce710f237 Fix domain request denied reason read 2015-07-16 16:47:09 -07:00
Brad Davis
ae882c8347 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/Menu.cpp
	interface/src/Menu.h
	interface/src/avatar/SkeletonModel.cpp
	interface/src/devices/OculusManager.cpp
	interface/src/devices/TV3DManager.cpp
	interface/src/ui/ApplicationCompositor.cpp
	interface/src/ui/overlays/LocalModelsOverlay.cpp
 2015-07-16 16:37:55 -07:00
ZappoMan
398075e45a hacking on more naked GL 2015-07-16 16:26:28 -07:00
Brad Davis
89faf85ad9 Working on text rendering overlays 2015-07-16 15:56:01 -07:00
David Rowe
f5b02c1731 Remove dead code 
Camera mode cannot be mirror
 2015-07-16 14:06:42 -07:00
David Rowe
6c6e3eb758 Rename and refactor eye deflection slider 2015-07-16 14:05:34 -07:00
Atlante45
b4121eb464 Remove unnecessary move 2015-07-16 13:14:17 -07:00
David Rowe
9980233a0d Use estimated eye pitch and yaw from DDE to deflect eyes 2015-07-16 13:03:33 -07:00
Stephen Birarda
61f23f6a5e Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2015-07-16 11:56:26 -07:00
Anthony J. Thibault
ce80bff7cb Merge branch 'sam/vive-hand-controllers' of github.com:hyperlogic/hifi into sam/vive-hand-controllers 2015-07-15 18:50:52 -07:00
Anthony J. Thibault
56e7af081e input plugin architecture, fixed sixense 2015-07-15 18:50:44 -07:00
Anthony J. Thibault
442b701c9a refactor of myAvatar sensor matrix updating 
Much simpler and maintanable.

* updateFromHMDSensorMatrix is called at start of Application::update()
  It moves the avatar forward taking into account head motion in the room.
* all other avatar manipulation call setPosition and setOrientation
  normally
* Then at the end of Application::update() updateSensorToWorldMatrix is
  called.  This ensures that rendering will use the correct camera
  position w.r.t. the body.
 2015-07-15 17:38:12 -07:00
Howard Stearns
01a3701b52 Merge pull request #5329 from SamGondelman/hydraFix 
Hydra hand and mouse fixes
 2015-07-15 19:03:04 -05:00
Stephen Birarda
6a02e6d001 resolve final conflict in Application 2015-07-15 16:23:23 -07:00
Stephen Birarda
05dde9d8f5 resolve conflicts on merge with upstream/master 2015-07-15 16:18:47 -07:00
samcake
de7aed1abc Merge pull request #5338 from ZappoMan/removeGlowEffect 
Remove the glow effect.
 2015-07-15 14:50:15 -07:00
Niraj Venkat
0ee916fb6f Merge branch 'master' of https://github.com/highfidelity/hifi into avatar 2015-07-15 14:10:42 -07:00
Niraj Venkat
1b13f837bd Porting AO to new pipeline 2015-07-15 14:10:17 -07:00
ZappoMan
c17794849d more GlowEctomy 2015-07-15 12:58:15 -07:00
ZappoMan
819fa852b8 first pass at GlowEctomy 2015-07-15 12:47:59 -07:00
bwent
70e3e7caa4 Merge branch 'master' into audioStatsDialog 2015-07-15 12:29:33 -07:00
bwent
2c24251b52 Clean up from previous commit 2015-07-15 11:41:26 -07:00
Sam Gateau
48f23a6eaf Merge branch 'master' of https://github.com/highfidelity/hifi into daft 2015-07-15 11:29:41 -07:00
bwent
5b0b7229ba Added a dialog box to display audio network statistics 2015-07-15 11:10:39 -07:00
Stephen Birarda
e127c5c06d rename Packet methods for clarity 2015-07-15 10:40:40 -07:00
Anthony J. Thibault
fb62fda2d2 started working on input plugin architecture 2015-07-15 10:26:48 -07:00
samcake
9df26c8488 removing naked glViewport from DeferredLightingEffect by adding the current viewport in renderArgs 2015-07-15 00:24:43 -07:00
ZappoMan
e39ea72daf removed dead code 2015-07-14 21:25:49 -07:00
Anthony J. Thibault
9363ca2f97 Fix for camera matrix position when in Vive HMD. 2015-07-14 18:36:42 -07:00
Sam Gondelman
6a0df442f9 emulated mouse events don't get sent back to the keyboard (can't right click and drag with sixense, etc) 2015-07-14 17:59:59 -07:00
ZappoMan
f1b85aefa9 more dead code removal: NodeBounds 2015-07-14 17:59:20 -07:00
Atlante45
fbb6a94579 Merge branch 'receive_packets' of https://github.com/huffman/hifi into protocol 2015-07-14 16:36:28 -07:00
Philip Rosedale
17ec524253 Merge pull request #5324 from ZappoMan/fixLaggingTouch 
fix lagging touch events
 2015-07-14 16:28:00 -07:00
Ryan Huffman
c6ffda12f9 Merge branch 'atp' of github.com:birarda/hifi into receive_packets 2015-07-14 16:21:57 -07:00
Stephen Birarda
e596733c8b fix for stats grab from iterator 2015-07-14 16:21:34 -07:00
Ryan Huffman
ede9217483 Merge branch 'atp' of github.com:birarda/hifi into receive_packets 2015-07-14 16:15:01 -07:00
Stephen Birarda
e4849d29ec re-use iterator when checking _octreeServerSceneStats 2015-07-14 16:14:43 -07:00
ZappoMan
68f4fe6566 fix lagging touch events 2015-07-14 16:03:44 -07:00
Ryan Huffman
bd345cdccd Merge branch 'atp' of github.com:birarda/hifi into receive_packets 
Conflicts:
	libraries/networking/src/PacketReceiver.cpp
 2015-07-14 15:59:16 -07:00
Stephen Birarda
bbe5a3d682 remove commented out call to resetCounters 2015-07-14 15:51:32 -07:00
Stephen Birarda
fb7cb7ff53 add the option for PacketReceiver to drop packets 2015-07-14 15:49:54 -07:00
Stephen Birarda
789235b8c7 make NodeList deleter be deleteLater 2015-07-14 15:28:38 -07:00
Ryan Huffman
56b5c9acff Merge branch 'atp' of github.com:birarda/hifi into receive_packets 
Conflicts:
	assignment-client/src/entities/EntityServer.cpp
	domain-server/src/DomainServer.cpp
 2015-07-14 14:53:45 -07:00
Stephen Birarda
8d4c945874 cleanup audioIO connections in Application 2015-07-14 14:34:39 -07:00
Stephen Birarda
1f4ac0f17c emit mutedByMixer signal for a noisy mute 2015-07-14 14:30:46 -07:00
Stephen Birarda
d617b71232 remove SharedNodePointer from some packet callbacks 2015-07-14 14:27:26 -07:00
Atlante45
bbb00b9d3a Merge branch 'protocol' of https://github.com/birarda/hifi into protocol 2015-07-14 14:11:41 -07:00
Stephen Birarda
0637f589b5 add PacketListener to help unregister for packets 2015-07-14 13:52:38 -07:00
Anthony J. Thibault
aa66691a73 Merge branch 'sam/vive-hand-controllers' of github.com:hyperlogic/hifi into sam/vive-hand-controllers 2015-07-14 12:37:09 -07:00
Atlante45
7bf45308b6 Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart 2015-07-14 12:31:37 -07:00
Anthony J. Thibault
dbc18ce51f merge with plugins 2015-07-14 12:30:47 -07:00
Anthony J. Thibault
9209e0745e Added "Standing HMD Sensor Mode" checkbox to menu 
removed static bool isRoomTracking and instead moved into the View menu.
 2015-07-14 12:12:38 -07:00
Ryan Huffman
0edc909818 Merge branch 'protocol' of github.com:birarda/hifi into receive_packets 
Conflicts:
	assignment-client/src/audio/AudioMixer.cpp
	interface/src/Application.cpp
	libraries/networking/src/Packet.cpp
 2015-07-14 10:21:31 -07:00
Stephen Birarda
821c16cbc4 resolve conflicts on merge with uptream/master 2015-07-14 09:52:20 -07:00
Anthony J. Thibault
158c1c6aa8 Removed some debugging prints and drawing 2015-07-13 20:41:19 -07:00
Brad Davis
fee5f7cd0f Merge fixes 2015-07-13 19:07:44 -07:00
Atlante45
c80df94b06 Update includes for moved files 2015-07-13 15:28:55 -07:00
Stephen Birarda
d990420565 repairs to octree packet receiving in interface 2015-07-13 13:10:57 -07:00
Anthony J. Thibault
d07a02cef3 Refactor of MyAvatar and Application HMD sensor 
MyAvatar now uses a cached copy of the HMDSensor location,
instead of calling into Application for every access.
This allows us to simplify application to always return the
most recent pose, instead of a different one pre and post physics.

Added accessors to HMD Sensor in MyAvatar, besides being helpful,
it also an optimization to avoid extracting quaternions from the
HMD matrix on every access.
 2015-07-13 12:56:33 -07:00
Brad Davis
9eb15d3d55 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/GLCanvas.cpp
	interface/src/devices/OculusManager.cpp
	interface/src/devices/OculusManager.h
	libraries/render-utils/src/DeferredLightingEffect.cpp
 2015-07-13 12:54:19 -07:00
Atlante45
957e6394a9 sendPacket function take Node& not a pointer 2015-07-13 11:57:20 -07:00
Stephen Birarda
264f39fa59 resolve conflicts on merge with upstream/master 2015-07-13 11:25:24 -07:00
ericrius1
0ce6737b34 merged and normals flipping 2015-07-13 09:43:15 -07:00
Stephen Birarda
3d62162812 cleanup octree networking code to use new API 2015-07-13 09:40:26 -07:00
Atlante45
80fe090a94 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-10 20:20:03 -07:00
Anthony J. Thibault
ac9e1384c0 controllers render in right position, wrong rotation 2015-07-10 18:27:12 -07:00
Anthony J. Thibault
94918be949 another fix for viewing vive user in third person 2015-07-10 18:27:12 -07:00
Stephen Birarda
ffcd8e1613 update connection for packet version mismatch 2015-07-10 17:54:51 -07:00
Stephen Birarda
9ee62a8a38 fix for connection denied packet in Application 2015-07-10 17:52:51 -07:00
Howard Stearns
51be245159 Remove old octreeFade code that wasn't working anyway. 2015-07-10 16:55:45 -07:00
Atlante45
ec7e1df8c0 Move and rename menu item 2015-07-10 15:47:46 -07:00
Ryan Huffman
99aaefbd03 Fix and update signature of Application::handleDomainConnectionDeniedPacket 2015-07-10 15:00:29 -07:00
Atlante45
4702b39130 Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart 2015-07-10 10:56:11 -07:00
Brad Hefta-Gaub
33016e2797 Merge pull request #5293 from jherico/bart 
More profiling ranges and updated performance testing scripts
 2015-07-09 19:10:45 -07:00
Anthony J. Thibault
653b0d7789 started working on rendering controllers 2015-07-09 19:03:11 -07:00
Brad Hefta-Gaub
74ef91550c Merge pull request #5296 from venkatn93/master 
Entities are now added/removed from rendering based on Scene.shouldRenderEntities
 2015-07-09 18:54:06 -07:00
Niraj Venkat
007d662db1 Re-added for shouldRenderEntities 2015-07-09 17:40:14 -07:00
Niraj Venkat
706f85e4ce Fixes to comply with coding standard 2015-07-09 17:31:38 -07:00
Seth Alves
d0d0b2a143 Merge pull request #5295 from birarda/master 
potential fix for windows domain connect cycling
 2015-07-09 17:04:06 -07:00
Atlante45
bfeb095fb4 Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart 2015-07-09 16:30:56 -07:00
Niraj Venkat
adf5b95835 Changing formatting 2015-07-09 16:25:29 -07:00
Niraj Venkat
52095fd38d Fixing merge 2015-07-09 16:23:40 -07:00
Niraj Venkat
1dce5f80cc Entities are now added/removed from rendering based on Scene.shouldRenderEntities 2015-07-09 16:17:58 -07:00
Brad Davis
214405a0e5 Fixing typo 2015-07-09 16:06:27 -07:00
Stephen Birarda
efb89c281f fix creation of QTimer parented by NodeList 2015-07-09 16:02:29 -07:00
Stephen Birarda
a4f1145f06 fix QTimer connection to nodeList 2015-07-09 16:01:41 -07:00
Stephen Birarda
408ecb9735 move domain server check in timer to node thread 2015-07-09 15:59:32 -07:00
Brad Davis
446f800aee More profiling ranges and updated performance testing scripts 2015-07-09 15:43:30 -07:00
Ryan Huffman
5e65f422fa Move mute environment handling to Application 2015-07-09 15:30:25 -07:00
Ryan Huffman
dd9dea7a97 Merge remote-tracking branch 'birarda/protocol' into receive_packets 
Conflicts:
	interface/src/DatagramProcessor.cpp
	interface/src/octree/OctreePacketProcessor.cpp
	libraries/entities/src/EntityEditPacketSender.cpp
	libraries/networking/src/LimitedNodeList.h
	libraries/networking/src/NLPacket.h
 2015-07-09 14:08:35 -07:00
Stephen Birarda
1b4e333c49 Merge pull request #3 from birarda/atp 
initial networking API changes for new protocol
 2015-07-09 16:51:37 -04:00
Stephen Birarda
a363f42bb2 pass const NLPacket& for all sendUnreliablePacket calls 2015-07-09 11:42:18 -07:00
Anthony J. Thibault
2ac6b6cd32 misc. changes 2015-07-09 09:57:12 -07:00
Brad Hefta-Gaub
fb07956689 Merge pull request #5284 from hyperlogic/ajt/mirror-view-fix 
fix for mirror rendering on windows
 2015-07-09 08:38:55 -07:00
Stephen Birarda
19c5f0b67c resolve conflicts on merge with upstream/master 2015-07-08 22:54:36 -07:00
Stephen Birarda
8c2cf2cf25 fix an unused variable warning 2015-07-08 22:48:44 -07:00
Anthony J. Thibault
1be0e7ebc3 fix for mirror rendering on windows 
* added preScale to Transform class.
* preScale by -1 about the xAxis instead of post scale.
  I think this was working on Mac due to the different code paths in
  GLBackendTransform::updateTransform for core vs legacy gl profile.
 2015-07-08 21:33:27 -07:00
Brad Davis
b173ac397c Merge pull request #5278 from samcake/yellow 
Adding more NSight instrumentation
 2015-07-08 20:28:18 -07:00
Stephen Birarda
658ad6bd02 fix eachNode lambda in Application 2015-07-08 18:55:26 -07:00
Stephen Birarda
da3502eb6c resolve conflicts on merge with upstream/master 2015-07-08 18:41:48 -07:00
Stephen Birarda
cf15cbc62f fix a cast, move a packet 2015-07-08 18:37:25 -07:00
Stephen Birarda
dc7c268467 fixes for changed API in Application 2015-07-08 18:27:10 -07:00
Stephen Birarda
9c18277e9c packet fixes in script-engine and Application 2015-07-08 18:24:49 -07:00
Atlante45
ee3a8b1b6e Clear resource caches instead of restarting 2015-07-08 18:23:16 -07:00
ZappoMan
7790e35d24 added bytes consumed result to decode, and exit early after bytes consumed 2015-07-08 18:19:12 -07:00
ZappoMan
e885ac1821 improved performance of ByteCountCoding<> decode 2015-07-08 17:32:51 -07:00
Anthony J. Thibault
0f30da64bc added Plugin interface to ViveControllerManager 
mostly I just added this to add the isSupported method, so it wouldn't
attempt to initialize if there was no HMD attached.
 2015-07-08 16:31:52 -07:00
Sam Gateau
4c44eb63da Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-08 14:25:41 -07:00
Sam Gateau
f992e875b4 Adding intrsumentation for nsight and hiding the nsight specific code in cpp 2015-07-08 14:25:13 -07:00
Anthony J. Thibault
07141fd1e3 rotation and thrust work in both 2d and hmd mode 
known issue, hmd does thrust doesnt work when avatar collisons are disabled.
 2015-07-08 12:25:57 -07:00
Atlante45
ed296850e2 Rename to clear cache and restart 2015-07-08 12:24:45 -07:00
Atlante45
39cb5100a3 Clear cache and restart first draft 2015-07-08 12:23:22 -07:00
Ryan Huffman
0b0446e527 Add handleComainConnectionDeniedPacket to Application 2015-07-08 11:54:22 -07:00
Ryan Huffman
b960d86f80 Remove datagramProcessor from Application 2015-07-08 11:54:06 -07:00
Philip Rosedale
574758eae9 Merge pull request #5252 from ctrlaltdavid/20601 
DO NOT MERGE - QA for #20601 - Fix and improve eye gaze
 2015-07-08 11:37:40 -07:00
Stephen Birarda
74940a2132 replace lingering PacketTypes in old format 2015-07-08 10:18:13 -07:00
Anthony J. Thibault
15cf008f13 hand controllers and arrow keys now work 2015-07-07 17:29:45 -07:00
Stephen Birarda
1f68ad892a replace PacketList usage with NLPacketList 2015-07-07 16:14:57 -07:00
Stephen Birarda
11d5aa9803 fix queryPacket initialization in Application 2015-07-07 15:41:07 -07:00
Stephen Birarda
56880e8858 return fixes for NAK PacketLists 2015-07-07 15:33:03 -07:00
Stephen Birarda
45b549398d use PacketList for application nack packets 2015-07-07 15:31:58 -07:00
Anthony J. Thibault
4f8cf0af8c moved sdl2manager to input-plugins 2015-07-07 15:24:39 -07:00
Anthony J. Thibault
d75353eeb2 added left/right hand click actions, vive controller should be able to emulate mouse events 2015-07-07 14:35:55 -07:00
Stephen Birarda
e05470a11c change to new packet sending in Application 2015-07-07 11:11:20 -07:00
Anthony J. Thibault
5293effc2e more work in progress vive room tracking 
Found and disabled torso twist
use an old copy of the hmd pose before physics, and the most up to date
one after physics.
 2015-07-07 00:12:48 -07:00
Sam Gondelman
f69b755166 merge with hifi/plugins 2015-07-06 17:41:45 -07:00
Brad Davis
95000eec3c Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/src/ui/overlays/LocalModelsOverlay.cpp
 2015-07-06 16:22:03 -07:00
Brad Davis
ba7c3a2c27 Attempting to get UI and navigation keys/mouse working 2015-07-03 07:10:33 -07:00
Brad Davis
2a1776303d Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/avatar/SkeletonModel.cpp
	interface/src/devices/OculusManager.cpp
	interface/src/devices/TV3DManager.cpp
 2015-07-03 06:17:35 -07:00
Bradley Austin Davis
0034a14fc1 Working on mac functionality 2015-07-02 18:14:12 -07:00
Stephen Birarda
a9420d4212 replace controlled broadcast to nodes in Application 2015-07-02 17:55:26 -07:00
Sam Gondelman
3f6fbd058c merge with standing-mode, hands relative to neck 2015-07-02 17:44:19 -07:00
Stephen Birarda
0d64e82fe2 replace PacketType declarations with PacketType::Value 2015-07-02 16:38:52 -07:00
David Rowe
87ca7626d7 Merge branch 'master' into 20601 2015-07-02 15:45:32 -07:00
David Rowe
9efeda9716 Adjust gaze target for someone looking at me 2015-07-02 15:43:23 -07:00
Sam Gateau
8d8a902328 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-02 15:06:32 -07:00
David Rowe
3a92878544 Reinstate making someone looking at me look at my camera instead of face 2015-07-02 13:47:52 -07:00
Brad Davis
d5fe6f0bdb Inhibiting log spam unless a menu item is selected 2015-07-02 12:34:32 -07:00
ericrius1
ad97b28734 fixed merge conflicts 2015-07-02 11:01:40 -07:00
Clément Brisset
b616fff222 Merge pull request #5220 from howard-stearns/avatar-collision-sounds 
Avatar collision sounds
 2015-07-02 10:27:24 -07:00
Sam Gondelman
81efd99ae4 merge with hifi/plugins 2015-07-02 10:13:28 -07:00
David Rowe
c20cd40275 Merge branch 'master' into 20601 
Conflicts:
	interface/src/avatar/Head.cpp
 2015-07-02 09:51:47 -07:00
Anthony J. Thibault
f0d8916d8a First crack at room scale tracking from vive HMD. 
* modifed openvr plugin to return different eye pose matrices.
* avatar position and physics body now follow the head.
* orientation also follows head direction
 2015-07-02 09:47:08 -07:00
Brad Hefta-Gaub
f16b8d5083 Merge pull request #5246 from jherico/inter_idle_timing 
Instrument the inter-idle time and tweaking the timeout setting
 2015-07-02 09:01:44 -07:00
David Rowe
026f6d3690 Add mouth as third gaze target in addition to left and right eyes 2015-07-01 21:22:30 -07:00
David Rowe
4ced0dc6c4 Only deflect eyes for Faceshift; DDE doesn't provide eye pitch or yaw 2015-07-01 20:24:47 -07:00
David Rowe
26cbb14f45 Alternative look-at gaze left/right with face trackers too 
Instead of looking at one or other eye depending on look direction.
 2015-07-01 20:09:36 -07:00
Atlante45
7b5a5a339a Use make_shared/create to make shared pointers 2015-07-01 19:46:06 -07:00
Atlante45
ee13407066 Fix smart pointer casts 2015-07-01 19:22:40 -07:00
Sam Gondelman
0333adb95b moved controllers to input-plugins, they work now 2015-07-01 18:46:57 -07:00
David Rowe
fada70fe02 Remove redundant code 2015-07-01 18:32:33 -07:00
David Rowe
bc4c635106 Fix gazing at avatar (when no head tracking or HMD) 
Randomly look at avatar's left and right eyes if the face is visible.
Otherwise just look at their head.
 2015-07-01 18:31:16 -07:00
Sam Gateau
d019ef4373 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-01 18:12:11 -07:00
Sam Gateau
e8b11f1198 Exposing the display Item Status to js to turn it on/off 2015-07-01 17:27:41 -07:00
Brad Davis
88a733181e Fixing comment to reflect code 2015-07-01 16:54:59 -07:00
Brad Davis
4cffa26c01 CR comments and fixing the microsecond display 2015-07-01 16:53:12 -07:00
Brad Davis
59027959b8 CR comments and fixing the average calculation 2015-07-01 16:30:42 -07:00
Brad Hefta-Gaub
af932fde29 Merge pull request #5247 from ericrius1/handRender 
Fixed broken rendering of hydra visualization paraphernalia
 2015-07-01 16:21:32 -07:00
Brad Davis
0c88972f09 Instrument the inter-idle time and tweaking the timeout setting 2015-07-01 16:14:17 -07:00
ericrius1
8b00864175 hydra hand spheres and lasers are rendering again 2015-07-01 15:04:19 -07:00
Sam Gondelman
e54060d6bb more working on poses, LEFT_ and RIGHT_HAND input actions 2015-07-01 14:36:12 -07:00
Clément Brisset
eb3bddfe4c Merge pull request #5209 from ctrlaltdavid/20589 
QA for #20589 - Vertical field of view preference change should be applied immediately
 2015-07-01 13:53:25 -07:00
David Rowe
6a48b56e0f In mirror mode look directly at the camera in both normal and HMD view 2015-07-01 13:32:50 -07:00
Brad Davis
040f7c86ea Working on plugin menu items 2015-07-01 09:05:26 -07:00
Sam Gondelman
a154c809c0 working on using UserInputMapper::Pose, merging 2015-06-30 17:34:34 -07:00
Sam Gondelman
1ea8e85fe8 Merge remote-tracking branch 'jherico/input-plugins' into sam/vive-hand-controllers 2015-06-30 17:30:37 -07:00
Brad Davis
b2b571b5a1 Fixing app includes 2015-06-30 15:52:55 -07:00
Sam Gondelman
aaf84b47f3 Merge remote-tracking branch 'upstream/plugins' into sam/vive-hand-controllers 2015-06-30 10:37:06 -07:00
Brad Davis
e421141ec5 experimenting with input plugins 2015-06-30 09:52:54 -07:00
Sam Gondelman
a27196dfee initial testing of hand controller tracking 2015-06-29 17:13:33 -07:00
Brad Davis
196a92c1b4 A little bit of display plugin API cleanup 2015-06-29 10:55:13 -07:00
ericrius1
cf720f9e2e merged master 2015-06-29 09:27:40 -07:00
Brad Davis
a923c044a3 Merge remote-tracking branch 'upstream/master' into plugins 2015-06-28 22:51:46 -07:00
Brad Davis
dcdf47dd66 Fix mouse interaction with overlays in HMDs 2015-06-28 22:51:26 -07:00
Howard Stearns
af4b804d37 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-collision-sounds 2015-06-27 12:50:13 -07:00
Seth Alves
97cd5b8b99 Merge pull request #5223 from SamGondelman/cameraMode 
misc. key binding/camera fixes
 2015-06-27 10:55:34 -07:00
Brad Davis
7ca63a4ace Fixing overlay rendering in plugins 2015-06-27 00:43:38 -07:00
Brad Davis
69fa18c6c0 Working on overlay in plugins 2015-06-26 18:08:10 -07:00
Sam Gondelman
2f0fcba1eb key binding fixes as suggested by ctrlaltdavid, start in 3rd person if crashed in independent mode 2015-06-26 17:28:02 -07:00
Brad Davis
4417c00ae4 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/src/Application.h
	interface/src/Menu.h
 2015-06-26 17:02:16 -07:00
Howard Stearns
9a04fdf10a Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-collision-sounds 2015-06-26 16:24:27 -07:00
Howard Stearns
98f165f2ae Avatar collision sounds. 
collisionsSoundURL can be set in preferences:
  Currently defaults to https://s3.amazonaws.com/hifi-public/sounds/Collisions-hitsandslaps/airhockey_hit1.wav.
  Can be empty, which means no sound, rather than restoring default.
MyAvatar.collisionSoundURL can read/written in scripts.
Preloads when set, so that it won't have to fetch on first collision.
Plays at start of collision only, with volume proportional to "velocity change"^2.
 2015-06-26 16:23:16 -07:00
ericrius1
0a7c787109 created a custom pipeline that is a static class variable for renderable quad entity item 2015-06-26 13:44:54 -07:00
David Rowe
1898c6bd55 Merge branch 'master' into 20547 
Conflicts:
	libraries/networking/src/PacketHeaders.cpp
	libraries/networking/src/PacketHeaders.h
 2015-06-26 13:05:51 -07:00
Seth Alves
a0d77c061c lock the entity tree during physics operations that access then entity tree. if the simulation and entity-tree are both going to be locked, be sure to lock the entity tree first (and unlock it last), because this is what the network-reading thread does 2015-06-26 07:00:28 -07:00
Brad Hefta-Gaub
63812f28ad Merge pull request #5206 from SamGondelman/cameraMode 
fix bug that was preventing camera mode switches
 2015-06-25 18:55:13 -07:00
David Rowe
377979e380 Make field of view preference change be applied immediately 2015-06-25 15:41:10 -07:00
Sam Gondelman
56944afd39 avatar doesn't move in independent mode, alphabetized menu options 2015-06-25 12:36:36 -07:00
Brad Hefta-Gaub
77bbb23a1e Merge pull request #5175 from hyperlogic/ajt/first-person-avatar 
Render a different model when in first person view.
 2015-06-24 18:54:47 -07:00
Anthony J. Thibault
b88d7c2e05 Added FIXME comment to preRender 2015-06-24 16:10:47 -07:00
Anthony J. Thibault
99a03bac21 Render a different model when in first person view. 
Currently this model is identical to the third person model, except
that the head bones have been 'cauterized' by applying a zero scale transform.
This allows us to set the near clip back to a reasonable value.
 2015-06-24 16:10:47 -07:00
Brad Hefta-Gaub
734a11e12a Merge pull request #5199 from jherico/scale_rez_fix 
Fixing misplaced UI on scale resolution
 2015-06-24 16:10:33 -07:00
Sam Gondelman
19ec080e2b Merge with master 2015-06-24 15:04:03 -07:00
Ryan Huffman
4df1bea4ec Merge pull request #5167 from SamGondelman/hmdControls 
hmdControls.js for movement when wearing an HMD
 2015-06-24 14:40:31 -07:00
Brad Davis
5818805931 Fixing some merge issues 2015-06-23 17:34:44 -07:00
Brad Davis
8f8bda327c Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/devices/OculusManager.cpp
	interface/src/devices/OculusManager.h
 2015-06-23 16:54:32 -07:00
Brad Davis
fb2fb06371 Fixing misplaced UI on scale resolution, PC edition 2015-06-23 15:42:32 -07:00
Sam Gondelman
778e19ac11 fixed camera mode issue 2015-06-23 11:45:08 -07:00
Sam Gondelman
824c219fa0 started fixing camera mode issue 2015-06-23 09:26:38 -07:00
Bradley Austin Davis
f833121032 Fixing the initial missing UI on retina displays, again 2015-06-22 19:55:52 -07:00
Brad Davis
9f98547390 Merge branch 'master' into plugins 2015-06-22 13:35:40 -07:00
Brad Davis
4cd1c52987 Fixing HMD position offset bug in picking & stereo rendering in HMD 2015-06-22 11:20:48 -07:00
Brad Davis
3231bbba5a Merge remote-tracking branch 'upstream/master' into overlay 
Conflicts:
	interface/src/Application.cpp
 2015-06-22 09:44:16 -07:00
bwent
c315bcec24 Expose mouseDoublePressEvents to js 2015-06-19 15:52:27 -07:00
Brad Davis
cc6b589ae5 Merge remote-tracking branch 'upstream/master' into overlay 2015-06-19 14:48:38 -07:00
Brad Davis
99c217184b Fixing the mic/camera buttons and the mirror UI buttons 2015-06-19 14:46:39 -07:00
Sam Gateau
31633eca10 IMproving the probe system and cleaning the engine script 2015-06-19 10:41:40 +02:00
Brad Davis
9bef5f011b Reverting mirror functionality 2015-06-19 00:03:46 -07:00
Brad Davis
0fa6ac175f Merge branch 'master' into overlay 2015-06-18 21:56:11 -07:00
Brad Davis
48b27acc79 Merge remote-tracking branch 'upstream/master' into overlay 
Conflicts:
	interface/src/Application.cpp
	interface/src/ui/ApplicationOverlay.cpp
 2015-06-18 18:17:59 -07:00
Brad Hefta-Gaub
a7a53d8be7 Merge pull request #5148 from SamGondelman/rotationModes 
center player in view mode
 2015-06-18 18:02:47 -07:00
Seth Alves
b258aeaa3d merge from master 2015-06-18 10:04:14 -07:00
Sam Gondelman
f752534f7c actionEvent signal, captureActions, began work on hmdControls.js 2015-06-18 09:52:36 -07:00
Brad Davis
5c4fa77acd Merge branch 'temp' into overlay 2015-06-18 00:59:31 -07:00
Brad Davis
a83a4fb0a1 Merge remote-tracking branch 'upstream/master' into overlay 
Conflicts:
	interface/src/Application.cpp
	interface/src/devices/OculusManager.cpp
	interface/src/ui/ApplicationOverlay.cpp
 2015-06-17 19:53:31 -07:00
David Rowe
67206332e6 Make individual reload buttons reload scripts 2015-06-17 16:11:30 -07:00
David Rowe
2a00586e21 Fix missing hack 
Matches hack in stopScript().
 2015-06-17 16:11:29 -07:00
David Rowe
17f7d76025 Redownload scripts that are loaded via Script.load() when reloading all 2015-06-17 16:11:28 -07:00
David Rowe
5dab977c28 Add a reload script button after each script in list of running scripts 2015-06-17 16:11:26 -07:00
David Rowe
f220d40bb8 Re-download scripts upon Reload All 2015-06-17 16:11:25 -07:00
Bradley Austin Davis
1705eb8f80 Reverting some changes, putting overlay rendering in its own state manager 2015-06-17 16:08:19 -07:00
Brad Davis
8a1b519071 Working on overlays 2015-06-17 16:06:06 -07:00
Brad Davis
ae1c9603b9 Merge remote-tracking branch 'upstream/master' into overlay 2015-06-17 15:13:04 -07:00
Bradley Austin Davis
11fff7c6e5 debugging stack on OSX 2015-06-17 13:49:42 -07:00
Bradley Austin Davis
2172445db7 Merge remote-tracking branch 'upstream/master' into ovr6 2015-06-17 12:56:41 -07:00
Brad Davis
4282c044ef Working on mirror and overlay 2015-06-17 12:01:39 -07:00
Andrew Meadows
61f62f96b0 Merge pull request #5129 from SamGondelman/master 
Integrating gamepads/hydras to input mapping system, zooming
 2015-06-17 11:39:38 -07:00
Brad Davis
1e90aaf9c3 Working on overlays still, mirror rendering and overlay order 2015-06-17 11:35:30 -07:00
Brad Davis
5ded9e7eb9 Merge remote-tracking branch 'upstream/master' into overlay 2015-06-17 10:50:01 -07:00
ZappoMan
467609f2b6 standardize skybox and atmosphere batch 2015-06-17 09:44:26 -07:00
ZappoMan
b5731135dd cleanup 2015-06-17 09:08:41 -07:00
Brad Davis
2bf53b625e Working on overlays and stats 2015-06-17 02:00:13 -07:00
ZappoMan
006899d73f more hacking almost working 2015-06-16 22:23:14 -07:00
Brad Davis
4762e1a00c Merge remote-tracking branch 'upstream/master' into overlay 
Conflicts:
	interface/src/Application.cpp
 2015-06-16 21:01:00 -07:00
Brad Davis
659fa2387c Working on overlays / stats 2015-06-16 21:00:13 -07:00
Seth Alves
508ae276c6 enable -Wdouble-promotion 2015-06-16 18:23:10 -07:00
ZappoMan
722ac618f5 Merge branch 'master' of https://github.com/highfidelity/hifi into atmosphereBatchFix 2015-06-16 17:08:15 -07:00
ZappoMan
167e7d1377 first cut at atmospheres in batch (doesn't work) 2015-06-16 14:05:14 -07:00
Brad Davis
4f8ea3f624 Merge remote-tracking branch 'upstream/master' into ovr6 2015-06-16 09:58:20 -07:00
Brad Davis
ba13b7820c Working on overlay refactor 2015-06-16 09:58:03 -07:00
Brad Davis
1bae590389 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/src/Application.cpp
 2015-06-15 16:13:02 -07:00
Sam Gondelman
22961fcc9d added camera mode to keep player in center of view 2015-06-15 15:44:56 -07:00
Leonardo Murillo
c065269ba7 Merging with upstream 2015-06-15 11:58:52 -06:00
Brad Davis
00d8fe75ab Breaking up overlay into rendering and compositing classes 2015-06-13 17:36:08 -07:00
Brad Davis
e44b21ee0b Working on functional overlays 2015-06-13 10:36:52 -07:00
Brad Davis
737e418878 Revert "Revert "Merge pull request #5106 from jherico/render_cursor"" 
This reverts commit 0cdc2b53fe.
 2015-06-13 10:02:54 -07:00
Sam Gondelman
1a8df6509f userinputmapper supports hydra, but some hydra events still register as mouse events 2015-06-12 18:22:56 -07:00
Brad Davis
6fea9a39b2 Trying to get overlay input working 2015-06-12 17:36:13 -07:00
Brad Davis
15d214f335 Initial pass at OpenVR 2015-06-12 17:29:05 -07:00
Philip Rosedale
c834937472 Merge pull request #5122 from huffman/fix-rear-view-mirror 
Fix rear view mirror
 2015-06-12 15:49:38 -07:00
Brad Davis
7955eeda28 Merge branch 'master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/ui/ApplicationOverlay.h
 2015-06-12 15:49:35 -07:00
Ryan Huffman
ad77374732 Fix setting of _renderMode 2015-06-12 13:03:33 -07:00
ZappoMan
0cdc2b53fe Revert "Merge pull request #5106 from jherico/render_cursor" 
This reverts commit 4d18bd7cec, reversing
changes made to 24fda9a733.
 2015-06-12 12:57:24 -07:00
Sam Gondelman
b4e108cd3b added zooming to default joystick controls 2015-06-12 10:16:00 -07:00
Howard Stearns
27f40ea881 Signal Audio.disconnected, and use new hello/goodbye sounds in resources. 2015-06-11 20:33:30 -07:00
Sam Gondelman
72cc070f0a enabled remappable zooming (with keyboard: shift + w, shift + s, and others), switches to first person if you zoom in a lot 2015-06-11 18:24:32 -07:00
Brad Davis
9148b866bb Merge branch 'render_cursor' into cursor_manager 
Conflicts:
	interface/src/ui/ApplicationOverlay.cpp
 2015-06-11 16:19:57 -07:00
Sam Gondelman
b8b61e7c62 integrated joysticks with userinputmapper, enabling plug-in-and-play controllers and input mapping with js 2015-06-11 15:51:21 -07:00
Brad Davis
b7cd1ea72a Merge remote-tracking branch 'upstream/master' into render_cursor 2015-06-11 15:04:56 -07:00
Brad Davis
fa27550df4 Merge remote-tracking branch 'upstream/master' into render_cursor 2015-06-11 02:21:02 -07:00
Brad Davis
ef52035300 Working on functional overlays 2015-06-11 02:20:51 -07:00
Seth Alves
4216308b9b Merge branch 'master' of github.com:highfidelity/hifi into actions 2015-06-10 19:05:25 -07:00
Seth Alves
1c0c7f0fe3 Merge branch 'master' of github.com:highfidelity/hifi into actions 2015-06-10 15:30:28 -07:00
Brad Davis
7f6a49688a Merge branch 'master' into plugins 
Conflicts:
	interface/resources/qml/AddressBarDialog.qml
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/Environment.cpp
	interface/src/Environment.h
	interface/src/devices/TV3DManager.cpp
	interface/src/ui/ApplicationOverlay.h
	interface/src/ui/overlays/LocalModelsOverlay.cpp
 2015-06-10 14:21:48 -07:00
Bradley Austin Davis
1dfc9c89eb Fix doubled cursor on OSX 2015-06-10 13:57:48 -07:00
Leonardo Murillo
3bd0c7bd87 Code Review changes 2015-06-10 14:35:52 -06:00
Brad Davis
ca1af77763 Working on cursor manager 2015-06-10 13:24:56 -07:00
Leonardo Murillo
869461a01b Code Review changes 2015-06-10 14:14:00 -06:00
Leonardo Murillo
8f72763f17 Merge branch 'master' of github.com:highfidelity/hifi into auto-updater 2015-06-10 13:18:20 -06:00
Seth Alves
3dcc6c9b8c make action-factory interface and subclass it in Interface. this allows an action to use avatar data. the login the AvatarActionHold is still bogus. 2015-06-10 12:04:44 -07:00
Brad Davis
7374fb84e8 Working on fixing overlays with team-teaching merge 2015-06-10 09:36:14 -07:00
Brad Hefta-Gaub
fb4e5a70bd Merge pull request #5077 from jherico/render_cursor 
Always use GL rendered cursor & fix broken cursor after merge
 2015-06-09 12:09:24 -07:00
Leonardo Murillo
1d785c714b Merge branch 'master' of github.com:highfidelity/hifi into auto-updater 2015-06-09 09:01:50 -06:00
Brad Davis
6147844f93 Merge branch 'master' into ovr6 
Conflicts:
	interface/src/Application.cpp
	interface/src/avatar/SkeletonModel.cpp
	interface/src/devices/OculusManager.h
 2015-06-09 00:44:06 -07:00
Seth Alves
983ae5b2f0 quiet compiler, fix some whitespace 2015-06-08 21:19:37 -07:00
Brad Davis
c360dde71a Merge branch 'master' into render_cursor 
Conflicts:
	interface/src/Application.cpp
 2015-06-08 20:18:32 -07:00
ZappoMan
8fa31ec521 dead code removal machine 2015-06-08 14:30:31 -07:00
Leonardo Murillo
bd16072053 Conflict fixing 2015-06-08 15:00:06 -06:00
ZappoMan
24c8e7d0e6 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-08 13:50:50 -07:00
ZappoMan
5d6112d9c5 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-08 12:29:32 -07:00
Brad Davis
b3534210e4 Always use GL rendered cursor 2015-06-08 11:51:35 -07:00
Stephen Birarda
666830c04d add a sound once first AM packet received 2015-06-08 11:30:12 -07:00
Leonardo Murillo
83b7054138 Merge branch 'master' of github.com:highfidelity/hifi into auto-updater 2015-06-08 11:55:47 -06:00
Brad Davis
5faa53d7e9 Working on OVR SDK 0.6 2015-06-08 10:17:34 -07:00
Sam Gateau
de61f4ea0b Gettting th ehighlight on transparent to work 2015-06-08 02:52:13 -07:00
Bradley Austin Davis
5a52a389be Working on SDK 0.6 2015-06-07 23:23:21 -07:00
Brad Davis
de268c47b3 Working on 0.6 2015-06-07 18:25:16 -07:00
Brad Davis
f614268667 Moving windows to SDK 0.6 
Working on SDK 0.6 for windows

Working on SDK 0.6 for windows
 2015-06-07 01:40:44 -07:00
Leonardo Murillo
68b419deec Syncing 2015-06-05 17:11:32 -06:00
Leonardo Murillo
2236ccf0e1 Merge branch 'master' of github.com:highfidelity/hifi into auto-updater 2015-06-05 16:18:03 -06:00
Brad Davis
aac527f32c Merge remote-tracking branch 'upstream/master' into plugins 2015-06-05 13:49:37 -07:00
Niraj Venkat
827d8bd854 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-05 13:33:41 -07:00
Niraj Venkat
a3f19e9d4c Fixing title bar update on teleport 2015-06-05 13:33:14 -07:00
ZappoMan
7ebe64b52f Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-05 11:01:17 -07:00
Seth Alves
4e10c28b41 merge from upstream 2015-06-05 10:31:13 -07:00
Brad Davis
16f55c7557 Fix the skybox jiggle in the HMD 2015-06-05 09:52:56 -07:00
ZappoMan
807cc3db24 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-05 09:37:39 -07:00
Leonardo Murillo
01236e0159 Merge branch 'master' of github.com:highfidelity/hifi into auto-updater 2015-06-05 09:48:44 -06:00
Brad Davis
1b7efe9a02 Working on display plugins 2015-06-05 00:00:57 -07:00
Sam Gateau
3a93409080 Merging the day after the flight back to france, getting all the fixes 2015-06-04 23:02:05 -07:00
Seth Alves
9a67f35b59 Merge branch 'master' of github.com:highfidelity/hifi into actions 2015-06-04 19:02:46 -07:00
Eric Levin
5e15c14539 added sanitization for invalid line points data. Fixed bug where occasionally wrong view frustum would be sent to script" 2015-06-04 16:45:32 -07:00
Atlante45
94ba84a84c Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod 2015-06-04 18:48:15 +02:00
ZappoMan
d2deef97cc Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-04 09:24:37 -07:00
Atlante45
41be3fee87 Merge branch 'fix_world_box' of github.com:Atlante45/hifi into lod 2015-06-04 14:39:32 +02:00
Atlante45
96be60c0cf Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod 2015-06-04 14:22:12 +02:00
Atlante45
54b0a03fae Fix wrong enum used 2015-06-04 13:56:21 +02:00
Atlante45
6dc3bf9285 Fix world box messing up everything 2015-06-04 13:48:39 +02:00
Brad Davis
c86742decb Merge branch 'master' into plugins 2015-06-04 00:29:24 -07:00
Sam Gateau
329a3b4c7d force the worldbox to use the simple program which should fix its rendering 2015-06-03 23:29:32 -07:00
Seth Alves
4414b67837 Merge branch 'master' of github.com:highfidelity/hifi into actions 2015-06-03 20:43:22 -07:00
Leonardo Murillo
4f93328759 Merge branch 'master' of github.com:highfidelity/hifi into auto-updater 2015-06-03 19:39:00 -06:00
Leonardo Murillo
b60597aa90 AutoUpdate is now a singleton invoked via Dependency Manager, first steps towards QML update notification 2015-06-03 19:38:54 -06:00
Niraj Venkat
29a15453ac Visual studio tab issues fixed 2015-06-03 15:35:04 -07:00
Niraj Venkat
4db110a6e1 Final fixes. Snapshot should be good now 2015-06-03 15:09:45 -07:00
Niraj Venkat
694272ffaa "fixed" formatting issues and code cleanup 2015-06-03 14:48:25 -07:00
Niraj Venkat
57004c61c7 Fixed snapshot bug. Snapshots now save and load ok 2015-06-03 14:29:39 -07:00
Ryan Huffman
d6878c20b5 Merge branch 'team-teaching' of github.com:highfidelity/hifi into world-box-batch 2015-06-03 12:03:44 -07:00
Sam Gateau
b339aa683a adding caps for opaque and transparent draw jobs and the ui in js so we can debug the rendered items 2015-06-03 11:25:45 -07:00
Ryan Huffman
b8f3c42712 Update renderWorldBox to use batches 2015-06-03 09:03:04 -07:00
Atlante45
bbf1837796 Introduced RenderDetails/Stats don't pull details 
- Regrouped everything stat in a struct
	- Details are set into the stats
 2015-06-03 16:14:23 +02:00
Seth Alves
a31a5a1554 main actions interface is in EntityItem. changes in actions are queued up and applied before simulation step 2015-06-02 19:40:20 -07:00
Leonardo Murillo
cefdbc3126 Checkpoint auto updater 2015-06-02 19:32:03 -06:00
Sam Gateau
640071dd35 Avoiding any setVIewTransform in payloadREnder and introducing monitoring values 2015-06-02 18:23:53 -07:00
Sam Gateau
903837ab4f exposing some controls on the engine to js for debugging 2015-06-02 15:57:37 -07:00
Sam Gateau
3c7eb4de6d merging with upstream 2015-06-02 14:48:53 -07:00
Brad Davis
9d5a462a63 Working on UI in oculus 2015-06-02 12:18:00 -07:00
Sam Gateau
901717fb2c trying to fix the issues of model disappearing 2015-06-02 11:52:22 -07:00
Sam Gateau
ef2d8a0dbe tuesday morning rendering poor performances networking issue 2015-06-02 10:58:56 -07:00
Atlante45
c012a581a6 Set shouldRender method 2015-06-02 19:26:39 +02:00
Brad Davis
f22682fe39 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
 2015-06-01 22:59:10 -07:00
Sam Gateau
cd7914ad9d Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk 2015-06-01 17:31:39 -07:00
Brad Davis
a483dd27ba Trying to get widgets / windows working 2015-06-01 17:31:18 -07:00
Sam Gateau
bd7c22e715 Trying to transfer the rnedering from displaySide to RenderDeferredTask 2015-06-01 17:31:00 -07:00
ZappoMan
d4af454834 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-01 14:42:35 -07:00
Stephen Birarda
12bcbbf338 Merge pull request #5012 from ctrlaltdavid/20555 
DO NOT MERGE - QA for #20555 - Re-style QML Address Bar
 2015-06-01 17:08:00 -04:00
samcake
50f3d2d12b Merge pull request #5014 from ZappoMan/team-teaching-scene-api 
TEAM TEACHING - report correct part bounds
 2015-06-01 13:55:55 -07:00
ZappoMan
750d9c0616 poor mans version of mesh part bounds 2015-06-01 12:53:09 -07:00
samcake
98c0cd7d23 Merge pull request #5009 from ZappoMan/team-teaching-scene-api 
TEAM TEACHING - hacking on rendering mesh parts
 2015-06-01 12:24:27 -07:00
ZappoMan
4b46fc3ad9 cleanup Model::renderPart() 2015-06-01 11:11:27 -07:00
ZappoMan
1b8572640b more hacking sams tweaks 2015-06-01 09:07:32 -07:00
David Rowe
e41b4c1b7b Add new address bar dialog error message 
Implemented as a new simple InformationDialog so that can try it out
without reworking MessageDialog immediately for all QML UI.
 2015-06-01 09:01:11 -07:00
Sam Gateau
83c4a52454 Cleaning for PR 2015-05-31 19:34:03 -07:00
Sam Gateau
33d397a440 A fist update solution for the item 2015-05-31 19:10:37 -07:00
Brad Davis
23d6725a6a Consolidating GL display plugins 2015-05-31 00:24:19 -07:00
Sam Gateau
ddec8fd26f Trying to find a good solution for update message & data 2015-05-30 13:57:05 -07:00
Brad Davis
fec214c552 Working on consistent input response 2015-05-30 02:01:11 -07:00
Sam Gondelman
c19115a485 actually fixed billboard 2015-05-29 16:53:01 -07:00
Brad Davis
2758718c8d Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/src/ui/DialogsManager.cpp
	interface/src/ui/DialogsManager.h
 2015-05-29 16:50:59 -07:00
Brad Davis
912c003d58 Making (most) plugins into a library 2015-05-29 16:49:11 -07:00
Sam Gondelman
4c83c6918d fixed avatar billboards not displaying 2015-05-29 16:44:16 -07:00
Sam Gateau
7bde81e95f Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into daft 2015-05-29 15:50:31 -07:00
Sam Gateau
f04f3bda72 Introducing the RenderDeferredTask class which moves the current rendering pipeline into the render::ENgine scheme 2015-05-29 15:44:14 -07:00
samcake
f8a90684ce Merge pull request #5000 from huffman/scene-overlay 
Team Teaching - Move overlay rendering to Scene pipeline
 2015-05-29 15:31:46 -07:00
Sam Gateau
eef8077417 Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk 2015-05-29 13:20:43 -07:00
Atlante45
d8168811b3 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-05-29 19:58:22 +02:00
Howard Stearns
8e245ec4c2 getCollisionEvents has a side-effect on state (removing END events from further consideration), so it must be called once per step. 
Otherwise entities never get to see end events.
Also, entity collision processing should only be done when there are outgoing changes (just like for avatar).
 2015-05-29 09:59:21 -07:00
Ryan Huffman
b21d0a3a53 Remove Overlays::renderWorld from Application 2015-05-29 09:40:03 -07:00
Sam Gateau
dd9cafcd09 Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk 2015-05-28 18:14:41 -07:00
Sam Gateau
3f8bdc14c4 reinserting culling, lod and depth sort to the rendering 2015-05-28 18:01:31 -07:00
Brad Davis
1c49dde6f8 Merge branch 'master' into plugins 
Conflicts:
	CMakeLists.txt
 2015-05-28 14:30:19 -07:00
Brad Hefta-Gaub
1c3398f27e Merge pull request #4991 from ZappoMan/team-teaching 
TEAM TEACHING - merge from master
 2015-05-28 13:52:18 -07:00
Howard Stearns
0f30ec2ccc Undo the merge with the broken master checking. What could go wrong? 2015-05-28 13:48:27 -07:00
Howard Stearns
810c766f77 When an entity is added or changed with a collisionSoundURL, cache it so that it is ready to play on the first hit. 2015-05-28 12:50:02 -07:00
ZappoMan
1029a8af7c Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api 2015-05-28 12:38:16 -07:00
ZappoMan
a0e51469d3 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-05-28 12:36:34 -07:00
ZappoMan
2fba5a0928 more work on simple renderable 2015-05-28 12:19:43 -07:00
Brad Davis
171b6d18d0 Merge branch 'master' into plugins 
Conflicts:
	interface/src/ui/ApplicationOverlay.cpp
 2015-05-28 10:31:20 -07:00
ZappoMan
763e6dd97b Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-05-27 19:58:11 -07:00
Seth Alves
4fa6f388b9 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-27 18:20:59 -07:00
Ryan Huffman
c13254a9c4 Merge branch 'team-teaching' of github.com:highfidelity/hifi into scene-avatar 
Conflicts:
	interface/src/Application.cpp
 2015-05-27 12:44:52 -07:00
Ryan Huffman
f972e84d6c Move avatar renedering to Scene 2015-05-27 12:40:26 -07:00
Ryan Huffman
389d5556f5 Update Avatar*Pointers to use std::*_ptr instead of Q*Pointer 2015-05-27 12:36:55 -07:00
Howard Stearns
4b4bf9fd90 Merge branch 'master' of https://github.com/highfidelity/hifi into remove-global-collision-and-update-examples 2015-05-27 09:29:06 -07:00
Seth Alves
c80f2970fd Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-27 07:37:51 -07:00
Sam Gateau
58e3fe695c Refining once more for sir gcc on Ubuntu 2015-05-27 01:32:40 -07:00
Sam Gateau
a5c5cc9b70 First Item really rendering , for the WorldBox, desigining more of the RenderContext and task interface 2015-05-27 01:15:14 -07:00
Brad Davis
dd87707c7b Merge remote-tracking branch 'upstream/master' into plugins 2015-05-26 18:36:12 -07:00
Brad Davis
b5e6b737c4 Working on display plugins 2015-05-26 17:32:41 -07:00
Seth Alves
55028f6cb0 voxel data sent over wire and saved to json 2015-05-26 16:34:35 -07:00
ZappoMan
20ceb72d92 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-05-26 15:01:26 -07:00
Andrew Meadows
16e5710325 Merge pull request #4954 from ZappoMan/entitysmartpointers 
EnitityItem smart pointers
 2015-05-26 14:05:03 -07:00
Sam Gateau
e5755f52e5 Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into daft 2015-05-26 13:57:10 -07:00
samcake
84525aabec Merge pull request #4959 from ZappoMan/team-teaching-entitysmartpointer 
TEAM TEACHING BRANCH - Entity Smart Pointers
 2015-05-26 13:56:47 -07:00
Howard Stearns
3c718af43f Merge branch 'master' of https://github.com/highfidelity/hifi into remove-global-collision-and-update-examples 2015-05-26 13:26:02 -07:00
Sam Gateau
ad0b0cfade FIxing one more issue with compilation on ubuntu regarding the template functions specializationand the namespace 2015-05-26 11:40:35 -07:00
samcake
dd9d758da1 Fixing the compilation issue for real 2015-05-26 10:53:23 -07:00
Sam Gateau
0083ba6f85 trying again 2015-05-25 17:39:31 -07:00
Sam Gateau
ad054a640e Fixing a problem with Mac/ubuntu build maybe 2015-05-25 17:21:03 -07:00
Howard Stearns
cbf4e09a10 Remove global collision event. 2015-05-25 16:10:50 -07:00
Sam Gateau
f0ab6d96f5 merge with upstream team-teaching 2015-05-24 19:45:37 -07:00
Sam Gateau
35b8d45bee Insert a first scene and the engine in the Application and render a first Item 2015-05-24 17:03:43 -07:00
ZappoMan
9988f2d1cd EnitityItem smart pointers 2015-05-22 22:38:02 -07:00
ZappoMan
8b78fc4190 EnitityItem smart pointers 2015-05-22 17:57:50 -07:00
Brad Davis
e69362dadc Working on stereo rendering 2015-05-22 17:51:59 -07:00
Ryan Huffman
47d9cf42c5 Remove unused lodManager 2015-05-22 16:04:05 -07:00
Ryan Huffman
05f8ba558f Update RenderArgs construction in paintGL 2015-05-22 16:02:24 -07:00
Ryan Huffman
d1a5662ca7 Merge branch 'team-teaching' of github.com:highfidelity/hifi into ctx 
Conflicts:
	libraries/entities-renderer/src/EntityTreeRenderer.cpp
 2015-05-22 15:33:40 -07:00
Ryan Huffman
3f22b5f8b3 Add RenderArgs to more render methods 2015-05-22 15:25:53 -07:00
Sam Gateau
a28c99bb40 Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk 2015-05-22 14:40:00 -07:00
Sam Gateau
e7e3eb2b7c FIrst version of the design for the Engine, the Tasks and a DrawTask. Introduced the ItemFilter 2015-05-22 12:58:18 -07:00
Andrew Meadows
461d08c0a9 merge upstream/master into andrew/bispinor 2015-05-22 11:35:02 -07:00
Atlante45
20ff43e29a Don't sync by default 2015-05-22 20:29:25 +02:00
Ryan Huffman
6fd474a1a3 Fix comment 2015-05-22 09:56:21 -07:00
Ryan Huffman
4a4c9c75fc Add gpu::context to RenderArgs and start using RenderArgs in place of the flags 2015-05-22 09:50:51 -07:00
Andrew Meadows
01cc629224 fix crashes during init and shutdown 2015-05-22 09:20:08 -07:00
Atlante45
e5aa696dda syncInputStateCache 2015-05-22 17:39:08 +02:00
Brad Davis
ac93d2c721 Working on display plugins 2015-05-21 18:50:11 -07:00
Andrew Meadows
67f5d0773d some list management of AvatarMotionStates 2015-05-21 14:40:47 -07:00
Brad Davis
c0d84cfc54 Merge branch 'master' into plugins 
Conflicts:
	interface/src/Application.cpp
 2015-05-21 11:04:06 -07:00
ZappoMan
946878006d Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching 2015-05-20 18:46:32 -07:00
samcake
496898273c Merge pull request #4846 from jherico/dk1 
Second attempt at fixing the HMD eye projections, without breaking the camera this time.
 2015-05-20 17:02:28 -07:00
Brad Hefta-Gaub
79023763ef Merge pull request #4869 from ctrlaltdavid/20543 
CR for #20543 - Option to auto-mute mic if step away from PC when face tracking is enabled
 2015-05-20 14:47:31 -07:00
Howard Stearns
c5b8dd51d8 Fix https://app.asana.com/0/32622044445063/34195351184789 
Handle collision events when we do other updates (and their entity scripts) rather than when we do the physic updates while the tree is locked.
Given that, remove the check that kept sound from playing (or scripts from running) when we would have deadlocked, because now we don't.
 2015-05-20 11:07:03 -07:00
Brad Davis
827d7f6221 Merge branch 'master' into dk1 2015-05-20 09:41:20 -07:00
Andrew Meadows
f86c419988 stubbery for collidable avatars 2015-05-19 14:15:26 -07:00
Atlante45
a9a0c9f387 Render 3D overlays before entities 
This gets rid of some issues due to entities moving to render pipeline
 2015-05-18 17:13:32 +02:00
Brad Davis
7f2552c690 Merge branch 'master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/ui/ApplicationOverlay.cpp
	interface/src/ui/PreferencesDialog.cpp
 2015-05-16 22:38:15 -07:00
Sam Cake
e9ff06df24 FIx the issue where the view frustum used in the skybox wasn;t in sync with the true camera, except if shadows is on, THe one call missing is now always executed 2015-05-15 17:22:29 -07:00
Brad Davis
6797174b97 Fix picking in the HMD 2015-05-14 19:15:47 -07:00
Andrew Meadows
81d06e0dc3 Merge upstream/master into andrew/nova 
Conflicts:
	libraries/entities/src/EntityItem.cpp
	libraries/entities/src/EntityItemProperties.cpp
 2015-05-14 10:09:55 -07:00
Brad Hefta-Gaub
d1f52231be Merge pull request #4863 from samcake/orange 
Using the skymap for ambient lighting
 2015-05-14 09:12:46 -07:00
David Rowe
ff7b2016b4 Add option to auto mute microphone after lose face tracking 2015-05-14 08:50:43 -07:00
Brad Davis
c94b8b6e30 Merge branch 'master' into dk1 
Conflicts:
	interface/src/devices/OculusManager.cpp
	interface/src/devices/TV3DManager.cpp
 2015-05-13 21:25:56 -07:00
Brad Hefta-Gaub
77019eafa7 Merge pull request #4831 from jherico/plugins_pt2 
Display plugins part 2
 2015-05-13 20:40:33 -07:00
Brad Hefta-Gaub
3b7acae8a2 Merge pull request #4850 from jherico/web-entity 
Web entity
 2015-05-13 17:02:55 -07:00
Sam Cake
d13106f4c9 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-05-13 16:00:42 -07:00
Brad Davis
3b7e8a69b5 Attempting to fix threading issues with web entities 2015-05-13 14:00:41 -07:00
Bradley Austin Davis
a0097bcff8 Fixing offscreen rendering on retina display, even without a proxy window 2015-05-13 12:26:46 -07:00
Seth Alves
80749195e6 don't ddeTracker->init if HAVE_DDE isn't set 2015-05-13 11:44:42 -07:00
Sam Cake
8324268ec8 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-05-13 11:32:39 -07:00
Philip Rosedale
a5c49b7a13 Merge pull request #4813 from ctrlaltdavid/20532 
CR for 20532 - Default face tracking to Use Camera for first time users
 2015-05-13 11:06:46 -07:00
Brad Davis
9b6c20d93c Merge remote-tracking branch 'upstream/master' into web-entity 2015-05-13 09:49:53 -07:00
Andrew Meadows
fb34a5ba84 renaming and cleanup 2015-05-13 08:44:10 -07:00
Philip Rosedale
b658c26799 Merge pull request #4840 from jherico/menu 
Only display new menu in VR mode
 2015-05-13 08:15:04 -07:00
Brad Davis
a8d343bbf1 Working on web entities 2015-05-13 00:27:57 -07:00
Sam Cake
04d3f690dc Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-05-12 23:12:37 -07:00
Sam Cake
536fff4502 Trying to create the SH from the skybox cubemap 2015-05-12 23:11:52 -07:00
David Rowe
8a3c8e0d9a Merge branch 'master' into 20532 
Conflicts:
	interface/src/devices/DdeFaceTracker.cpp
 2015-05-12 17:41:12 -07:00
Philip Rosedale
65277e0573 Merge pull request #4836 from ctrlaltdavid/20535 
CR for #20535 - Improve DDE eyelid control
 2015-05-12 17:00:02 -07:00
Brad Davis
8c4f802dbf Merge remote-tracking branch 'upstream/master' into web-entity 
Conflicts:
	libraries/entities/src/EntityItemProperties.h
	libraries/entities/src/EntityTypes.h
 2015-05-12 15:56:02 -07:00
Brad Davis
f42e0c696a Merge branch 'master' into menu 2015-05-12 14:58:42 -07:00
Brad Davis
41d587bd2e Revert "Revert "Fixing HMD asymmetrical projections (esp DK1) and santizing the transform stuff"" 
This reverts commit 6e8c067bcb.

Conflicts:
	interface/src/Camera.h
 2015-05-12 14:47:44 -07:00
samcake
6e8c067bcb Revert "Fixing HMD asymmetrical projections (esp DK1) and santizing the transform stuff" 2015-05-12 14:34:43 -07:00
samcake
7c255738af Merge pull request #4837 from jherico/dk1 
Fixing HMD asymmetrical projections (esp DK1) and santizing the transform stuff
 2015-05-12 12:30:32 -07:00
Brad Davis
f844dcd25f Only display new menu in VR mode 2015-05-12 09:05:24 -07:00
Clément Brisset
9bf4cf1262 Merge pull request #4830 from ZappoMan/moreZoneProperties 
New Zone Features
 2015-05-12 14:28:01 +02:00
Brad Davis
666caf0d59 Working on fixing DK1 and santizing the transform stuff 2015-05-12 00:44:30 -07:00
Brad Hefta-Gaub
f56b5fcdcd Merge pull request #4833 from samcake/blue 
Clean the cube map loading behavior
 2015-05-11 18:40:42 -07:00
Seth Alves
866a6fba9b Merge pull request #4823 from birarda/master 
repairs to AC stop and clean shutdown
 2015-05-11 18:11:52 -07:00
David Rowe
667ad9b0cb Add menu option to enable/disable binary webcam eyelid control 2015-05-11 17:11:51 -07:00
ZappoMan
a2a1bf4e8c make stars fade in as sun drops below horizon 2015-05-11 16:32:27 -07:00
Stephen Birarda
68af209417 call Setting::init from Interface setupEssentials 2015-05-11 16:20:03 -07:00
Sam Gateau
f2c4e04a5a clean up for pr 2015-05-11 14:06:10 -07:00
Brad Davis
abab54aed8 Working on display plugins 2015-05-11 13:08:53 -07:00
Brad Davis
6a5c7b8b42 Merge remote-tracking branch 'upstream/master' into plugins_pt2 
Conflicts:
	libraries/script-engine/src/MenuItemProperties.cpp
 2015-05-11 12:40:17 -07:00
Brad Davis
1624ca4120 Merge branch 'master' into plugins_pt2 2015-05-11 12:32:49 -07:00
Seth Alves
9bd101ee2a oops 2015-05-11 12:01:59 -07:00
Seth Alves
de9e74a725 put max-octree-pps in Application rather than in the Octree 2015-05-11 12:01:13 -07:00
Seth Alves
83748096ef max pps for an octree-query is a per-query thing, not an application-wide thing. move the settings-related max-octree-pps stuff into the entity tree 2015-05-11 11:37:53 -07:00
Stephen Birarda
8c6715e4fc resolve conflicts on merge with upstream/master 2015-05-11 11:10:22 -07:00
Sam Gateau
72c3270ec6 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2015-05-11 10:48:29 -07:00
Clément Brisset
421ebeb3d7 Merge pull request #4795 from birarda/sequence-numbers 
add sequence number support to NL, don't double send data from AvatarMixer
 2015-05-11 19:23:33 +02:00
Sam Gateau
d51904b7b3 fixing file 2015-05-09 11:43:21 -07:00
Sam Gateau
5a11143a5d Using the skybox cubemap for ambient lighting 2015-05-09 11:40:46 -07:00
David Rowe
5092e385b1 Disable "calibrate" menu item if webcam isn't enabled 2015-05-08 18:39:22 -07:00
Bradley Austin Davis
230d1701b4 Merge remote-tracking branch 'upstream/master' into plugins 2015-05-08 17:14:39 -07:00
Brad Hefta-Gaub
a517e773f4 Merge pull request #4786 from ctrlaltdavid/20530 
CR for #20530 - Add DDE calibration
 2015-05-08 16:25:02 -07:00
Stephen Birarda
ddb52348bc don't force use of Settings to all QCoreApplication 2015-05-08 16:24:39 -07:00
Bradley Austin Davis
9f8a384c72 Merge branch 'plugins_pt2' into plugins 2015-05-08 16:05:51 -07:00
Brad Hefta-Gaub
bfb2b278ee Merge pull request #4791 from jherico/scale 
Fixing scale resolution issues
 2015-05-08 15:54:24 -07:00