Howard Stearns
b08f364447
yes!
2016-02-07 18:29:10 -08:00
Atlante45
72790d361b
Update gpu-test
2016-02-01 18:50:01 +01:00
Atlante45
ccb183e518
Unify Named/Normal calls
2016-02-01 18:50:01 +01:00
Brad Hefta-Gaub
721a911cf1
Merge pull request #6972 from jherico/qml
...
Small QML Fixes
2016-01-29 09:57:15 -08:00
Brad Davis
afd3ddf534
Cleaning up message box
2016-01-28 21:17:05 -08:00
Brad Davis
5b817ccc21
Make all 2D overlays QML
2016-01-28 16:03:26 -08:00
Brad Davis
18d6a09dc9
Better preferences dialog initial state
2016-01-28 09:20:31 -08:00
Brad Davis
664100b9b1
Attachment dialog
2016-01-26 21:55:40 -08:00
Brad Davis
fee920723a
Cleaning up test project
2016-01-26 17:25:20 -08:00
Brad Davis
e52e35df8c
Better initial window positioning
2016-01-23 22:06:13 -08:00
Brad Davis
71ae36f5c0
Button prefs and conditionally enabled prefs
2016-01-22 19:06:30 -08:00
Brad Davis
858bbbf987
Adding OffscreenUI API for QInputDialog functionality
2016-01-22 17:31:03 -08:00
Brad Davis
c7186590ea
Support for directory browsing
2016-01-22 17:30:09 -08:00
Brad Davis
205ab05506
First pass on preferences dialog
...
Conflicts:
tests/ui/qmlscratch.pro
2016-01-22 17:30:07 -08:00
Anthony J. Thibault
8bfa80d5fc
Merge remote-tracking branch 'upstream/master' into tony/hmd-recenter-on-rotation
2016-01-22 13:37:43 -08:00
Brad Davis
f343598d91
Focus hack for menu fix
2016-01-22 00:55:32 -08:00
Brad Davis
3d46eda165
Frame construction in onCompleted was messing up the browser keyboard focus
2016-01-22 00:55:31 -08:00
Brad Hefta-Gaub
e1c369dc10
Merge pull request #6766 from samcake/hdr
...
Ambient Occlusion
2016-01-21 18:10:52 -08:00
Anthony J. Thibault
ca8a832818
CharacterController: added hard limit to follow displacement
...
To prevent tunneling when the rigid body cannot reach it's target due to being blocked by a wall or some other obstacle.
Also, added unit tests for physics/BulletUtil rotateVector and clampLength functions.
2016-01-21 17:27:45 -08:00
Anthony J. Thibault
a91c181a89
MyAvatar: Recenter when the head turns away from the hips
...
Compute HMD facing moving average.
When the moving average diverges from the hips by more then 45 degrees, recenter the body.
Also, the follow code has been changed, instead of a follow velocity being passed to the CharacterController
a desired target is passed. The CharacterController homes toward it's target based on the time remaining.
Any follow deltas applied to move the avatar's position closer to it's target is stored and re-applied
to the bodySensorMatrix. This centralizes the moving/homing code to one place, the CharacterContoller.
A new FollowHelper class was also introduced, it groups together the data and logic necessary to perform the
re-centering/follow procedure. This "hopefully" makes it easier to maintain.
2016-01-21 16:38:42 -08:00
samcake
2471a88e85
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-01-21 15:53:25 -08:00
Brad Davis
f9f9ddd8bd
Yet more atmosphere removal
2016-01-21 15:15:17 -08:00
Brad Davis
b8109af196
Ignite the atmosphere
2016-01-21 15:15:15 -08:00
Leonardo Murillo
098b7a4ff3
Merge pull request #6870 from birarda/console
...
Your Stack Manager is now a Server Console
2016-01-21 14:31:34 -06:00
Brad Davis
d2900200a1
More cleanup & menu fixing
2016-01-20 11:23:56 -08:00
Stephen Birarda
8bc063e758
Merge branch 'master' of https://github.com/highfidelity/hifi into console
2016-01-19 16:21:19 -08:00
samcake
df496b065c
Merging with master
2016-01-18 16:40:34 -08:00
Brad Davis
5aa8398adb
Working on keyboard focus issues
2016-01-17 20:56:07 -08:00
Brad Davis
746c388f7a
Cleanup of QML windowing and message boxes
2016-01-15 23:14:49 -08:00
samcake
577666da6e
Merging upstream master
2016-01-14 15:10:54 -08:00
Atlante45
c30569cd55
Naming coding standard
2016-01-13 11:47:43 -08:00
Atlante45
205c14eb43
Remove unused headers
2016-01-13 11:47:43 -08:00
samcake
31bea5034c
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-01-12 10:02:15 -08:00
Zach Pomerantz
801dde7950
Merge branch 'master' of github.com:highfidelity/hifi into feat/render-shape
2016-01-11 16:38:04 -08:00
Anthony J. Thibault
e4e4cb0110
Bug fix for Transform.postMult() with non-uniform scale.
...
Previously it would not flag the matrix as non-uniform, this would
cause some operations (such as inverse) to be incorrect.
2016-01-11 12:03:44 -08:00
Zach Pomerantz
d8ff133cc6
Fix include in gpu-test
2016-01-05 18:11:24 -08:00
Stephen Birarda
8d0478dbef
remove ALL_TEST_TARGETS debug
2016-01-04 16:03:40 -08:00
samcake
387706ea64
Fix shader-test compilation
2016-01-04 19:45:43 -04:00
Andrew Meadows
ec27c75332
Merge pull request #6660 from hyperlogic/tony/anim-expressions
...
AnimExpression: boolean expression parser and evaluator
2015-12-30 08:36:44 -08:00
Anthony J. Thibault
5d596bcbc4
Added tests for GLMHelpers::safeEulerAngles.
...
To verify that converting to and from quats and eulers will use the same angle order.
Also I fixed some naming inconsistencies in GeometryUtilTests.
2015-12-29 10:07:38 -08:00
samcake
f9070ee989
Cleanup cruft in the shaders, glowIntensity and alphaThreshold not needed anymore
2015-12-22 12:41:31 -08:00
samcake
1e8e3fec87
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-19 11:38:20 -08:00
Brad Davis
6098c4a1d6
Revert "Revert "Migrate QML based web views to Qt WebEngine""
...
This reverts commit 1f3adeb666
2015-12-18 17:18:46 -08:00
samcake
7e66515beb
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-18 17:13:48 -08:00
Brad Davis
1f3adeb666
Revert "Migrate QML based web views to Qt WebEngine"
2015-12-18 17:09:38 -08:00
samcake
41525a7c4d
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-18 16:20:41 -08:00
Brad Davis
88b88a3306
Fixing warnings
2015-12-18 14:32:35 -08:00
Brad Davis
82c865af2c
Rename QmlWebWindow to OverlayWebWindow, move ctor registration to script engine
2015-12-17 12:20:38 -08:00
Brad Davis
fa5bab08b1
Support web content inside QML
2015-12-16 16:25:38 -08:00
Anthony J. Thibault
ab85e2967a
AnimExpression: support for unary not.
2015-12-15 13:18:30 -08:00
