Brad Davis
f7a2513f26
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/CMakeLists.txt
interface/src/Application.cpp
interface/src/Menu.cpp
interface/src/Menu.h
interface/src/avatar/MyAvatar.h
tests/ui/src/main.cpp
2015-07-30 12:55:22 -07:00
Bradley Austin Davis
fccb07dc93
Tweaking timing of geometry restoration
2015-07-30 12:44:47 -07:00
Brad Davis
5878a4661c
Restoring HMD tools dialog, phase 1
2015-07-30 11:35:55 -07:00
Brad Davis
382ef057b0
Revert to using QGLWidget
2015-07-30 10:59:05 -07:00
samcake
e32e45ed2b
make sure the writting mask is on for depth buffer
2015-07-29 18:06:46 -07:00
samcake
ac46b2bd17
Keep the resetstage in
2015-07-29 17:38:23 -07:00
Sam Gateau
8b7ad9cfcb
merge with upstream
2015-07-29 17:13:48 -07:00
Sam Gateau
ab4b940d83
merge with upstream
2015-07-29 17:11:13 -07:00
Sam Gondelman
9025bc3ead
press o to toggle overlays in case you don't have a middle mouse click
2015-07-29 16:43:25 -07:00
samcake
4ebc75da1f
Merge pull request #5369 from ericrius1/hitEffect
...
Added functionality for displaying a screen-space hit effect
2015-07-29 11:28:08 -07:00
Andrew Meadows
a1e6fdc4b2
Merge pull request #5435 from MarcelEdward/hifi-2-20069
...
Hifi 2 20069
2015-07-29 11:13:30 -07:00
Brad Davis
900c2c11df
Another whack at touch events
2015-07-29 10:29:27 -07:00
ericrius1
697cb4c9d0
fixed merge conflicts and refactored hit effect to catch up with refactored rendering engine
2015-07-29 10:02:06 -07:00
Brad Davis
07553e7a7c
Accept touch events in the GL window
2015-07-29 10:00:41 -07:00
Brad Davis
bb29127eff
Merge remote-tracking branch 'upstream/master' into plugins
2015-07-28 23:14:41 -07:00
Anthony J. Thibault
044ea2ace5
Changed mirror position to not be achored to the head.
...
But instead it's anchored to the "default" eye position, which
is where the eyes are in the model, before IK or animations occur.
2015-07-28 19:31:43 -07:00
Brad Davis
3210037bc1
Merge pull request #5449 from ZappoMan/plugins
...
Plugins Branch - Fix a crash in pendingChanges.updateItem() for the Particle Entity
2015-07-28 16:49:30 -07:00
Brad Davis
91768b3992
Merge pull request #5450 from SamGondelman/sam/input-plugins
...
Plugins branch - re-remove hand lasers
2015-07-28 16:25:55 -07:00
Brad Davis
8202862750
Working on display plugins stability
2015-07-28 16:22:22 -07:00
samcake
9cf3dfd3f7
test this on windows ?
2015-07-28 15:49:39 -07:00
ZappoMan
c15161b71a
fix crash in Particle Entities and pendingChanges.updateItem()
2015-07-28 14:56:38 -07:00
SamGondelman
482f064c64
Merge remote-tracking branch 'upstream/plugins' into sam/input-plugins
2015-07-28 12:56:54 -07:00
SamGondelman
782a5c491e
removed hand lasers because they had been renamed so they weren't removed
2015-07-28 12:56:31 -07:00
Bradley Austin Davis
6df260b3f9
Bad variable usage on OSX
2015-07-28 12:47:52 -07:00
Brad Davis
2bb7a20578
Working on fullscreen targeting
2015-07-28 11:30:35 -07:00
Sam Gateau
22e70ee691
merged master
2015-07-28 10:13:05 -07:00
Sam Gondelman
469696f283
Merge remote-tracking branch 'upstream/plugins' into sam/input-plugins
2015-07-28 10:06:42 -07:00
Brad Davis
a049b14d13
Merge remote-tracking branch 'upstream/master' into plugins
2015-07-28 10:04:19 -07:00
Brad Hefta-Gaub
43eec08514
Merge pull request #5376 from venkatn93/avatar
...
New ambient occlusion effect in render pipeline
2015-07-28 09:58:51 -07:00
David Rowe
8a7cdb1c64
Make Throttle FPS If Not Focus be enabled by default
2015-07-27 19:53:38 -07:00
Sam Gateau
baf7873ce1
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
2015-07-27 17:40:19 -07:00
Sam Gateau
f525a8a245
Removing all the unecessary calls of Batch from the gl legacy time
2015-07-27 17:17:56 -07:00
Niraj Venkat
34e400ac67
Changing var name to 'DebugAmbientOcclusion'
2015-07-27 17:14:09 -07:00
Sam Gateau
a5ad40bee9
INtroduce the resetStage command to clear up all cache and state in the gpu::Conference and make sure no more resource are linked
2015-07-27 14:07:28 -07:00
Sam Gondelman
b2e18b529b
toggle overlay with mouse middle click, controller 'right click'
2015-07-27 10:09:59 -07:00
Stephen Birarda
d3c6d8b3cc
move call to get VoxelPositionSize inside debug that uses it
2015-07-27 10:06:34 -07:00
Marcel Verhagen
32d0513962
The 3Dconnextion files from https://github.com/highfidelity/hifi/pull/5351
...
For now without a merge conflict.
Updated the menu name.
Still have to look at the fast zooming and yaw on windows, probably have to add a var to prevent the button changes to be pushed to fast. Not sure why the yaw thing does not always work, could be that the position is also send at the same time and the input mapper does not not process all those synchronical. Probably will have to do something with masking the postion when the rotation is set for yaw.
2015-07-27 19:04:49 +02:00
Stephen Birarda
615218c77d
use a ref in stats unpacking
2015-07-27 09:58:58 -07:00
Stephen Birarda
9c57d1544f
fix OctreeSceneStat unpacking in Application
2015-07-27 09:53:27 -07:00
Niraj Venkat
83e0856279
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar
2015-07-27 09:20:19 -07:00
Bradley Austin Davis
0cbc12af8b
Merge remote-tracking branch 'upstream/master' into plugins
2015-07-27 10:15:10 -04:00
Seth Alves
24fff719c5
quiet compiler
2015-07-25 21:11:23 -07:00
Bradley Austin Davis
7edf138843
Attempting to fix offscreen UI event handling
2015-07-25 19:26:38 -04:00
Sam Gondelman
f801471dd7
remove unnecessary line
2015-07-24 17:33:06 -07:00
Sam Gondelman
1af51572af
fixed init crash if you follow very specific startup steps
2015-07-24 17:10:39 -07:00
Sam Gondelman
0e4d065cbc
Merge remote-tracking branch 'upstream/plugins' into macPluginsFix
2015-07-24 16:52:16 -07:00
Brad Davis
dc4ef8e648
Merge pull request #5426 from hyperlogic/ajt/vive-camera-fix
...
paintGL camera change for Vive
2015-07-24 18:43:34 -04:00
Sam Gondelman
07aed20280
paintGL camera change for Vive
...
During rendering the application camera needs to be somewhere near where it's final position.
This is because it is used in several places, specifically it is used to determine if the camera is close
to the avatar's head, in order to hide it.
2015-07-24 15:37:39 -07:00
Bradley Austin Davis
0efa2c0eee
Merge remote-tracking branch 'upstream/master' into plugins
2015-07-24 17:33:24 -04:00
Niraj Venkat
fc612ab8cd
Merge conflict fix
2015-07-24 11:29:52 -07:00
