Brad Davis
bb29127eff
Merge remote-tracking branch 'upstream/master' into plugins
2015-07-28 23:14:41 -07:00
Brad Davis
87bd930854
Renaming mode menu
2015-07-28 23:14:34 -07:00
Anthony J. Thibault
608898848f
Fix for edit.js Camera.getPosition(), getOrientation() and getRotation()
...
JavaScript has problems with const refs, apparently.
Camera.getPosition() was returning undefined.
2015-07-28 19:49:06 -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
Anthony J. Thibault
ce7e385900
Updated comment
2015-07-28 18:03:03 -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
Brad Davis
ead9bbe866
Moving display plugins menu
2015-07-28 16:22:21 -07:00
ZappoMan
c15161b71a
fix crash in Particle Entities and pendingChanges.updateItem()
2015-07-28 14:56:38 -07:00
SamGondelman
e01cf1760b
remove unused method
2015-07-28 14:27:31 -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 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
SamGondelman
50f65b3a54
fixed controller mouse location in standing mode
2015-07-27 18:07:21 -07:00
Niraj Venkat
34e400ac67
Changing var name to 'DebugAmbientOcclusion'
2015-07-27 17:14:09 -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
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
Bradley Austin Davis
2bdebb6def
Trigger a build, and cleanup whitespace
2015-07-27 12:34:29 -04: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
1338671537
Working on win32 and linux builds
2015-07-27 10:48:08 -04:00
Bradley Austin Davis
0cbc12af8b
Merge remote-tracking branch 'upstream/master' into plugins
2015-07-27 10:15:10 -04:00
Bradley Austin Davis
3c6416d6b8
Merge branch 'master' into plugins
2015-07-27 10:09:02 -04:00
Brad Hefta-Gaub
a9d5723eb3
Merge pull request #5410 from kevinmthomas-carpool/20618
...
CR for Job #20618 - Move Reload Content item to Developer menu.
2015-07-26 21:54:55 -07: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
Brad Davis
f66492b444
Merge pull request #5422 from ctrlaltdavid/20591
...
CR for 20591 - Fix setting WebWindow's width and height
2015-07-25 11:49:53 -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
Philip Rosedale
e24395a226
Merge pull request #5383 from ctrlaltdavid/20630
...
Improve looking-at-me indication
2015-07-24 16:15:13 -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
Kevin M. Thomas
67c9a33cc0
Update Menu.cpp
2015-07-24 15:16:02 -04:00
Kevin M. Thomas
5f7fe30b9b
Merge branch 'master' of https://github.com/highfidelity/hifi into 20618
...
# Conflicts:
# interface/src/Menu.cpp
2015-07-24 15:10:34 -04:00
Niraj Venkat
fc612ab8cd
Merge conflict fix
2015-07-24 11:29:52 -07:00
Brad Davis
9727302d02
Merge pull request #5423 from hyperlogic/ajt/overlay-fade
...
Update ApplicationCompositor to use QPropertyAnimation for alpha fades
2015-07-24 14:28:32 -04:00
Anthony J. Thibault
c602346cad
Update ApplicationCompositor to use QPropertyAnimation for alpha fades
2015-07-24 11:14:09 -07:00
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
David Rowe
3893add148
Fix setting WebWindow's width and height
...
Width and height parameters now set the WebWindow's width and height
instead of its minimum size, when not part of a tool window.
2015-07-24 10:43:24 -07:00
samcake
f3dc159e33
Merge pull request #5401 from ZappoMan/renderLaserPointers
...
remove renderLaserPointers()
2015-07-24 10:41:32 -07:00
