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
Anthony J. Thibault
22756d168b
Changed grammar to support boolean and and or.
2015-12-15 10:35:35 -08:00
Anthony J. Thibault
2b0ed55077
Merge branch 'master' into tony/anim-expressions
2015-12-15 10:35:19 -08:00
samcake
3554f54e17
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-14 17:38:56 -08:00
Atlante45
146581714a
More warning fixes
2015-12-11 16:17:41 -08:00
Atlante45
ce51350b65
Fix warnings on windows 64bit
2015-12-11 15:42:15 -08:00
Sam Cake
7e59d5cc04
Fixing the failing test for shader compilations (because we removed the shadowing shaders)
2015-12-07 01:27:50 -08:00
Brad Hefta-Gaub
f71d2d00d2
Merge pull request #6548 from jherico/threaded_present
...
Threaded present
2015-12-04 13:42:09 -08:00
Brad Davis
11917ca501
Fixing preview / vsync functionality
2015-12-04 12:46:19 -08:00
Brad Hefta-Gaub
15c4dbfb11
Merge pull request #6554 from Atlante45/warnings
...
Last of the OpenGL warnings on OS X
2015-12-04 11:24:28 -08:00
Brad Hefta-Gaub
d07629489c
Merge pull request #6543 from Atlante45/pointer
...
gpu::Shader::create* return shared_ptr
2015-12-04 11:17:02 -08:00
Atlante45
528a17422d
Last of the OpenGL warnings on OS X
2015-12-04 10:33:10 -08:00
Brad Davis
c4514743d1
Fixing tests, moving some plugin container stuff to base class
2015-12-04 10:28:19 -08:00
Brad Davis
b9ace94ff1
Prototyping threaded present
2015-12-04 10:28:16 -08:00
Brad Hefta-Gaub
6fbb67021f
Merge pull request #6530 from hyperlogic/tony/mirrored-model-entity-fix
...
Fix for mirrored transforms in FBX models
2015-12-03 17:01:21 -08:00
Anthony J. Thibault
99223d0a3c
AnimExpression: support for parsing simple expressions
...
supports parens, binary +, -, / and *.
/ and * have higher precedence then + and -
2015-12-03 15:02:00 -08:00
Atlante45
3da80f5861
gpu::Shader::create* return shared_ptr
2015-12-03 14:56:07 -08:00
Brad Davis
cc80dfb9e1
Fixing case on gl surface format helper
2015-12-03 13:08:26 -08:00
Anthony J. Thibault
710ce7e639
Merge branch 'master' into tony/anim-expressions
2015-12-03 09:56:28 -08:00
Anthony J. Thibault
4f836568ad
Tests to verify AnimPose decomposition is working.
2015-12-02 17:26:32 -08:00
Anthony J. Thibault
f120e10ff4
Merge branch 'master' into tony/remove-joint-states
2015-11-24 15:00:05 -08:00
Anthony J. Thibault
0b410ecd92
RigTests build again
2015-11-21 11:09:31 -08:00
Anthony J. Thibault
cb89f09635
Removed EntityRig and AvatarRig. One Rig to rule them all.
2015-11-20 14:27:01 -08:00
Leonardo Murillo
9ad865c7f0
checkpoint
2015-11-20 15:19:45 -06:00
Brad Hefta-Gaub
4a0a481ac6
more fixes
2015-11-10 08:44:51 -08:00
Atlante45
767a7a7f1e
Fix warnings on OS X
2015-11-09 14:26:23 -08:00
samcake
7890aa6ec1
Merge pull request #6333 from jherico/rec2
...
Adding clip serialization implementation, tests
2015-11-06 16:38:39 -08:00
Brad Davis
bf70ae4724
PR feedback
2015-11-06 15:59:13 -08:00
Brad Davis
7c433f47c0
Breaking up input devices and input plugins classes.
2015-11-06 15:20:00 -08:00
Brad Davis
4513b638db
Adding clip serialization implementation, tests
2015-11-06 14:40:21 -08:00
Brad Davis
1dc392bb36
Merge pull request #6330 from Atlante45/master
...
// FIXME incredibly evil....
2015-11-06 11:43:33 -08:00
Brad Davis
0bf29a441f
Add recording classes
2015-11-06 11:14:46 -08:00
Atlante45
c53c0ec53f
Fix double delete on shutdown
2015-11-06 11:13:10 -08:00
Anthony J. Thibault
431a108c35
Bugfixes to expression for !!x expressions
...
Added stub eval methods. only boolean not, boolean and, boolean or and unary minus
are implemented.
2015-11-04 20:13:17 -08:00
Anthony J. Thibault
04d8a598da
First step toward evaluation
...
* added OpCodes
* added first parser rules
* removed mat4 support from AnimVariantMap
2015-11-04 16:56:34 -08:00
Anthony J. Thibault
32c40d37c0
Removed vec literals tokens and renamed int and float token types
2015-11-04 14:51:05 -08:00
Anthony J. Thibault
7f0fc4f6eb
Added limited floating point support
2015-11-04 14:51:05 -08:00
Anthony J. Thibault
340096d457
Initial version of AnimExpression class with minimal tokenizer
2015-11-04 14:51:05 -08:00
Anthony J. Thibault
e3e759248f
Merge branch 'master' into tony/anim-sync-blend
2015-11-02 08:37:10 -08:00
Brad Davis
cfb2fd1523
Support for runtime plugins (DLLs)
2015-11-01 11:12:12 -08:00
Anthony J. Thibault
f7b6fab0c3
Merge branch 'master' into tony/anim-sync-blend
2015-10-29 11:35:48 -07:00
Brad Davis
c4e82a85d9
Remove DeviceProxy in favor of InputDevice
2015-10-29 09:32:56 -07:00
Brad Davis
d61b3e5790
Fixing controller link requirements
2015-10-28 17:41:52 -07:00
Brad Davis
3c1a0930da
Merge remote-tracking branch 'upstream/master' into HEAD
...
Conflicts:
interface/src/avatar/MyAvatar.h
libraries/script-engine/src/ScriptEngine.cpp
libraries/script-engine/src/ScriptEngine.h
2015-10-28 13:38:22 -07:00
Brad Davis
5cbb2562cd
Move GL utilities out to their own library
2015-10-27 15:53:42 -07:00
Brad Davis
ef2d71e576
Merge remote-tracking branch 'upstream/master' into HEAD
...
Conflicts:
libraries/input-plugins/src/input-plugins/SixenseManager.cpp
2015-10-27 09:41:58 -07:00
Atlante45
9bead94fae
Remove cmake debug code
2015-10-26 12:07:12 -07:00
Brad Davis
bea6fdd890
Working on JSON parsing and cleanup
...
Conflicts:
libraries/controllers/src/controllers/Route.cpp
libraries/controllers/src/controllers/ScriptingInterface.cpp
libraries/controllers/src/controllers/StandardController.cpp
libraries/controllers/src/controllers/impl/RouteBuilderProxy.h
2015-10-20 10:20:28 -07:00
Brad Davis
5a0bb4c31b
Fixing line endings
2015-10-19 16:51:31 -07:00
Anthony J. Thibault
15f3894001
AnimTests: added tests for accumulateTime
2015-10-19 15:49:53 -07:00
Anthony J. Thibault
8e7e94c501
AnimTests: now compile and pass again.
2015-10-19 15:49:51 -07:00
Brad Davis
57be59935d
Move controller test to app
2015-10-17 19:13:38 -07:00
Brad Hefta-Gaub
293b7c12e1
change join to makeAxis, fix some warnings
2015-10-17 12:46:05 -07:00
Brad Davis
db0fa6b8ed
Update hydra mappings and test code
2015-10-16 17:23:09 -07:00
samcake
cdfe9788d1
Merging
2015-10-15 10:49:08 -07:00
Brad Davis
195045a4ec
Next time remember to hit build all before commiting
2015-10-14 17:20:30 -07:00
Brad Davis
0063f9ae1d
Merging old and new controller interfaces
2015-10-14 15:16:54 -07:00
samcake
3d5bf9aa1a
merging with current upstrem
2015-10-14 09:41:11 -07:00
samcake
fb4ff240ef
Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers
2015-10-13 09:16:00 -07:00
Brad Davis
8a0540234c
Find the joystick controller dynamically
2015-10-12 18:50:19 -07:00
samcake
dc32d5ae8d
Current status of my code for json
2015-10-12 18:03:21 -07:00
Brad Davis
58d3578fb1
Making anonymous mappings work
2015-10-12 17:59:01 -07:00
Brad Davis
f77878ee79
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-12 11:05:28 -07:00
Brad Davis
14f511350d
Working on refactoring the xbox hardware access and wiring up test code
2015-10-12 10:47:23 -07:00
Brad Davis
6f5f6450df
Cleanup CMake files
2015-10-11 00:01:03 -07:00
Brad Davis
14f33258ae
Working on test code, new controller interface
2015-10-10 16:08:44 -07:00
Brad Davis
52c65b917f
Merge remote-tracking branch 'upstream/master' into controllers
2015-10-10 12:48:49 -07:00
