Anthony J. Thibault
90f46ba2c8
Added hand state machines to AnimGraph.
...
* Application: Forward trigger values to the MyAvatar's PalmData
* SkeletonModel: Pass PalmData to Rig via updateRigFromHandData() this is more explicit then
the Rig::inverseKinematics methods.
* AnimNodeLoader & AnimOverlay: add support for LeftHand and RightHand bone sets
* Rig::updateRigFromHandData() read the triggers and set stateMachine trigger vars
* avatar.json - udpated with new hand state machine with temporary animations
2015-09-14 18:54:12 -07:00
Seth Alves
49ee251238
quiet compiler
2015-09-12 09:59:25 -07:00
Brad Hefta-Gaub
f85cb2c888
first cut at cleaning up ScriptEngine class
2015-09-11 19:12:09 -07:00
Seth Alves
e65ef93663
Merge pull request #5778 from jherico/homer
...
Fixing some entity race condition crashes
2015-09-11 17:54:53 -07:00
Andrew Meadows
9c6060160a
Merge pull request #5784 from howard-stearns/rationalize-rig-settings
...
Rationalize rig settings
2015-09-11 16:56:44 -07:00
Brad Davis
9b81842850
Merge branch 'master' into homer
...
Conflicts:
assignment-client/src/octree/OctreeSendThread.cpp
interface/src/Application.cpp
libraries/entities-renderer/src/EntityTreeRenderer.cpp
libraries/entities/src/EntityItem.cpp
libraries/entities/src/EntityTree.cpp
libraries/entities/src/EntityTreeElement.cpp
libraries/entities/src/EntityTreeElement.h
libraries/entities/src/EntityTreeHeadlessViewer.cpp
libraries/entities/src/RecurseOctreeToMapOperator.cpp
libraries/octree/src/Octree.h
libraries/physics/src/EntityMotionState.cpp
2015-09-11 16:31:18 -07:00
Brad Davis
e458eb7ae9
Merge pull request #5734 from sethalves/octree-shared-pointers
...
octree uses shared pointers
2015-09-11 16:00:04 -07:00
Howard Stearns
f8f2a067a1
whitespace
2015-09-11 12:59:07 -07:00
Howard Stearns
02fba12a48
Merge branch 'master' of https://github.com/highfidelity/hifi into rationalize-rig-settings
2015-09-11 11:53:19 -07:00
Howard Stearns
67ce0966d1
Rationalize the rig state setters.
2015-09-11 11:52:20 -07:00
Brad Davis
7fecd3261d
Fixing bad merge
2015-09-11 11:40:57 -07:00
Brad Davis
244795b629
Merge branch 'homer' into temp
...
Conflicts:
interface/src/Application.cpp
2015-09-11 11:21:29 -07:00
Atlante45
449d6a04d8
CR
2015-09-11 14:21:56 +02:00
Atlante45
42d1ab3745
Remove accidentally added header
2015-09-11 14:21:55 +02:00
Atlante45
5808658958
Make NodeJSONStats reliable
2015-09-11 14:21:53 +02:00
Brad Davis
e9edbb9dd1
Can't promote readlock to writelock
2015-09-10 22:52:40 -07:00
Brad Davis
aa989c3687
Fixing some entity race condition crashes
2015-09-10 20:53:17 -07:00
David Rowe
4aa553c183
Stop DDE and EyeTracker early but don't destroy until later in shutdown
2015-09-10 14:53:56 -07:00
Andrew Meadows
35b894872d
Merge pull request #5753 from ctrlaltdavid/20671
...
Terminate DDE earlier during shut-down and always at start-up
2015-09-10 07:46:53 -07:00
Brad Hefta-Gaub
f29bcd8b6a
Merge pull request #5755 from jherico/lisa
...
Fix possible hang when switching out of Oculus mode
2015-09-09 19:24:00 -07:00
Brad Davis
382de2b4aa
Fix possible hang when switching out of Oculus mode
2015-09-09 14:09:01 -07:00
Howard Stearns
ed2ed525b2
Tear down animGraph when turning off the avatar update thread. Otherwise, big time deltas accumulate.
2015-09-09 12:15:48 -07:00
David Rowe
01d7e68dbb
Terminate DDE earlier during shut-down and always at start-up
2015-09-09 11:29:57 -07:00
Seth Alves
9c4fdfd653
merge from upstream
2015-09-08 18:01:07 -07:00
Howard Stearns
eb67254e54
Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates
2015-09-08 16:54:14 -07:00
Howard Stearns
26f63a44fc
Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates
2015-09-08 15:30:22 -07:00
Howard Stearns
27f4bca0a4
Cleanup: This appears to be complete and working -- EXCEPT for loading animations on the update thread!
...
Until I figure that out, the answer is to turn off Developer->Avatar->"Enable Avatar Update Threading", run through forward/back/left/right/strafeLeft/strafeRight, and then turn "Enable Avatar Update Threading" back on.
2015-09-08 14:49:58 -07:00
Seth Alves
31fcd55d47
octree uses shared pointers
2015-09-08 11:59:48 -07:00
Stephen Birarda
25aeda2e18
Merge branch 'master' of https://github.com/highfidelity/hifi into protocol
2015-09-08 08:40:51 -07:00
Howard Stearns
d472fd66ff
Cleanup.
2015-09-07 17:26:22 -07:00
Howard Stearns
efeaf21305
Checkpoint smoother.
2015-09-07 16:32:51 -07:00
Howard Stearns
0065c64b31
Snapshot of no-judder, before cleanup.
2015-09-07 09:57:05 -07:00
James B. Pollack
670c5ee484
Merge pull request #5723 from jherico/lisa
...
Toggle mute while holding the hydras
2015-09-06 21:45:47 -07:00
David Rowe
6923e3ce70
Fix logging of intentionally crashing Interface
2015-09-06 16:28:55 -07:00
Brad Davis
644e81e20b
Toggle mute while holding the hydras
2015-09-04 16:19:58 -07:00
Brad Hefta-Gaub
b63e15f2e9
fix a bug in bad PPS calculation
2015-09-04 15:06:56 -07:00
Howard Stearns
d3106de7c1
Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates
2015-09-04 14:32:58 -07:00
Stephen Birarda
ed19987b7d
resolve conflicts on merge with upstream/master
2015-09-04 12:31:46 -06:00
Anthony J. Thibault
df28c7bf1a
Merge branch 'master' into ajt/new-anim-system
2015-09-04 09:27:02 -07:00
Brad Hefta-Gaub
20bd14c8db
Merge pull request #5684 from rabedik/fxaa
...
Post-process anti-aliasing effect
2015-09-04 09:01:39 -07:00
Howard Stearns
c0fec44f32
Menu item to switch between threaded and not (without restart!).
2015-09-03 19:34:25 -07:00
Anthony J. Thibault
3716d5612b
Merge branch 'master' into ajt/new-anim-system
2015-09-03 19:20:06 -07:00
Howard Stearns
32eb51d0fa
Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates
2015-09-03 13:55:57 -07:00
Brad Davis
1f83d04423
Fix oculus crash on switching display plugin to something else
2015-09-02 18:28:43 -07:00
Anthony J. Thibault
de31b92fd5
Merge branch 'master' into ajt/new-anim-system
2015-09-02 17:53:56 -07:00
Andrew Meadows
992bd5c9d2
fix sixense and vive rotation readings for palms
2015-09-02 11:37:36 -07:00
Howard Stearns
8cf71f285d
Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates
2015-09-01 16:03:40 -07:00
Stephen Birarda
33f6933544
Merge branch 'master' of https://github.com/highfidelity/hifi into protocol
2015-09-01 14:36:16 -06:00
Anthony J. Thibault
2401e6cc4b
Merge branch 'master' into ajt/new-anim-system
2015-09-01 10:58:38 -07:00
Stephen Birarda
de2bfd0d0d
some QThread cleanup and fix in Socket
2015-08-31 11:30:31 -07:00
Stephen Birarda
fa0abe2972
resolve conflicts on merge with upstream/master
2015-08-31 10:51:12 -07:00
Anthony J. Thibault
54aa0677f6
Merge branch 'master' into ajt/new-anim-system
2015-08-31 10:47:50 -07:00
Raffi Bedikian
59a758b5ec
Add AA state to RenderContext and Menu
2015-08-30 20:38:05 -07:00
Seth Alves
752c787f0b
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-28 12:50:31 -07:00
Stephen Birarda
1d6f43e0d0
cleaned up some warnings
2015-08-27 18:26:55 -07:00
Stephen Birarda
e3e529c4e5
resolve conflicts on merge with origin/protocol
2015-08-27 14:52:29 -07:00
Stephen Birarda
80cf7b6c76
resolve conflicts on merge with upstream/master
2015-08-27 14:50:04 -07:00
Howard Stearns
b3a919a5ca
Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates
2015-08-27 13:46:12 -07:00
Seth Alves
e97e7de19c
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-27 13:19:15 -07:00
Stephen Birarda
229015a5da
don't allow asset-server upload if no server present
2015-08-27 12:21:38 -07:00
Brad Hefta-Gaub
79a9694d4a
Merge pull request #5648 from ctrlaltdavid/20663
...
Clean Interface.ini after a crash
2015-08-27 10:52:25 -07:00
Anthony J. Thibault
a04f356857
Merge branch 'master' into ajt/new-anim-system
2015-08-27 09:32:53 -07:00
Seth Alves
435863d1f0
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-26 17:33:59 -07:00
Ryan Huffman
4105b7369c
Remove AssetScriptingInterface
2015-08-26 15:55:29 -07:00
Brad Davis
270f2f7a3b
Fixing framerate limit, moving vsync to 2d plugin
2015-08-26 15:47:45 -07:00
Ryan Huffman
aa7d8678e1
Merge branch 'protocol' of github.com:birarda/hifi into atp-server
2015-08-26 12:26:11 -07:00
Howard Stearns
0e18395fd0
Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates
2015-08-26 12:04:28 -07:00
Anthony J. Thibault
46c1e008bc
Merge branch 'master' into ajt/new-anim-system
2015-08-26 10:37:39 -07:00
Seth Alves
23dbbcc7bb
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-26 09:42:20 -07:00
Andrew Meadows
45c846572e
Merge pull request #5645 from jherico/maggie
...
Fixing problems reported by static analysis tool
2015-08-26 08:31:05 -07:00
Atlante45
179ee73e26
Merge branch 'master' of https://github.com/highfidelity/hifi into update_protocol
2015-08-26 16:50:33 +02:00
Brad Hefta-Gaub
b19f1e0631
Merge pull request #5658 from ctrlaltdavid/20653
...
Add Desktop object to JavaScript with width and height properties
2015-08-25 23:18:20 -07:00
Howard Stearns
38bc8634de
displayPlugin is not thread safe, and switch from simulate rate to interval in prep for sleep.
2015-08-25 21:26:46 -07:00
Brad Davis
d311e4f2ea
Fixing problems reported by static analysis tool
2015-08-25 19:18:55 -07:00
Brad Davis
f176003dad
Fixing aspect ratio on stereo plugins
2015-08-25 19:05:31 -07:00
Howard Stearns
b8ca604bf8
Checkpoint before GenericThread.
2015-08-25 16:17:50 -07:00
David Rowe
9d3d104ec3
Add Desktop object to JavaScript with width and height properties
2015-08-25 16:13:36 -07:00
Howard Stearns
2ca4768766
Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates
2015-08-25 10:44:54 -07:00
Seth Alves
91254245e4
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-24 20:21:24 -07:00
Brad Hefta-Gaub
34e32ddaeb
Merge pull request #5636 from howard-stearns/marketplace-avatars
...
marketplace avatars
2015-08-24 17:49:20 -07:00
Howard Stearns
828509e8eb
Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates
2015-08-24 15:01:46 -07:00
Anthony J. Thibault
fa5256eefd
Merge branch 'master' into ajt/new-anim-system
2015-08-24 14:32:28 -07:00
David Rowe
f6cf77ae68
Add Developer > Display Crash Options menu item
...
Is enabled by default. Disabling it stops the display of the crash
handling options dialog at start-up.
2015-08-24 13:24:31 -07:00
David Rowe
9c782f6a6d
Display dialog of crash handling options at startup if Interface crashed
...
Default option and Esc continue without taking any action.
2015-08-24 12:45:35 -07:00
David Rowe
63ad972576
Write and delete "application is running" marker file
2015-08-24 11:09:41 -07:00
David Rowe
07c9a0e2bb
Add Developer > Crash Interface menu item
2015-08-24 10:48:58 -07:00
Thijs Wenker
0f8cf80d45
Merge branch 'master' of https://github.com/worklist/hifi into 20660
2015-08-23 19:53:50 +02:00
Thijs Wenker
748625399e
"View -> World Axes" menu option
2015-08-23 17:59:58 +02:00
Brad Davis
d3135dcfa6
Stereo rendering work
2015-08-22 16:15:10 -07:00
Howard Stearns
74fd640f16
Restore the ability to change avatars from the edit.js marketplace button.
2015-08-21 16:49:07 -07:00
Seth Alves
fdad8fc651
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-21 13:19:19 -07:00
Howard Stearns
e84cc03bcc
Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates
2015-08-21 11:35:42 -07:00
samcake
66087872a3
Merge pull request #5621 from highfidelity/stereo
...
New stereo rendering mechanism
2015-08-21 11:23:14 -07:00
Seth Alves
105470bf26
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-21 11:02:16 -07:00
Seth Alves
6db0442fda
allow for asynchronous building of collision shape
2015-08-21 10:48:26 -07:00
Brad Davis
b8b0917d9d
Attempting to fix judder issues
2015-08-21 10:01:11 -07:00
ZappoMan
a0552050b0
set vsync on startup
2015-08-21 08:23:18 -07:00
Howard Stearns
ae3e052e72
Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates
2015-08-21 08:13:44 -07:00
Brad Davis
1e074ab81c
Remove superfluous clear
2015-08-21 00:29:28 -07:00
Brad Davis
cc037c8828
Fix culling calculations in HMD with new stereo mechanism
2015-08-21 00:29:27 -07:00
Brad Davis
476e5edb32
Fixing HMD wobble
2015-08-21 00:29:26 -07:00
Brad Davis
7fb491e48c
Cleanup plugin interface, break up oculus plugins
2015-08-21 00:29:25 -07:00
Brad Davis
76f236adf6
New stereo rendering implementation
2015-08-21 00:29:24 -07:00
ZappoMan
bd29fb2474
fix ifdef
2015-08-20 19:33:39 -07:00
ZappoMan
06b2a88fb6
toggle menu near top of window
2015-08-20 19:33:22 -07:00
ZappoMan
9f501d4d72
first cut at attempting to hide menu in full screen
2015-08-20 19:33:06 -07:00
ZappoMan
cd050b2e60
don't show hmd tools for direct mod HMDs
2015-08-20 09:53:58 -07:00
Brad Davis
9faf452196
Make sure that items added via plugins can be removed as well
2015-08-20 00:32:25 -07:00
ZappoMan
6a7f367e5f
fix throttled rendering for the 2D display plugin
2015-08-19 21:11:48 -07:00
Stephen Birarda
42a7262707
Merge pull request #5565 from murillodigital/node-version
...
DO NOT MERGE - Node versioning
2015-08-19 13:32:48 -07:00
Ryan Huffman
5884fcb17b
Merge branch 'ordered-sending' into atp-server
2015-08-19 12:23:31 -07:00
Seth Alves
537b690d60
Merge pull request #5566 from howard-stearns/recapitate
...
Get rid of separate head/body avatar
2015-08-19 10:46:05 -07:00
Philip Rosedale
eef556eeb2
Merge pull request #5593 from thoys/20528
...
CR for Job #20528 - Tool window unavailable in Windows Client.
2015-08-18 21:23:14 -07:00
Howard Stearns
c90845dfcb
Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates
2015-08-18 15:38:14 -07:00
Howard Stearns
dc75b238a8
Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates
...
And update with current code.
2015-08-18 15:35:37 -07:00
Brad Davis
944734fed2
Remove focus highlight on delete entity
2015-08-18 13:59:39 -07:00
Stephen Birarda
0f77ab8611
resolve conflicts on merge with upstream/master
2015-08-18 11:45:55 -07:00
Thijs Wenker
44399da41c
Removed the minimize button from the tool window. Close it to hide it. Fixes bug where ToolWindow hides forever.
2015-08-18 14:54:21 +02:00
Seth Alves
e29bb9183b
minimize diff
2015-08-18 02:08:21 -07:00
Seth Alves
8435550fe9
only update simRate once per second
2015-08-18 02:05:50 -07:00
Seth Alves
551f0aaba3
show how many times per second Application::idle is called
2015-08-18 01:41:17 -07:00
Brad Davis
3cbbb5fb79
Fix crash on mouse click
2015-08-18 00:05:02 -07:00
Howard Stearns
9ed418f7b6
Simple frequencey decoupling. Still same thread.
2015-08-17 19:19:11 -07:00
Brad Davis
cb5f80bf78
Add highlighting of keyboard focused items
2015-08-17 17:11:26 -07:00
Brad Davis
5d65937120
Merge pull request #5583 from ZappoMan/clickToFocusWebEntity
...
make web entity focus click based
2015-08-17 16:57:39 -07:00
Philip Rosedale
01108bdf6b
Merge pull request #5573 from howard-stearns/sync-eyes-and-vectors
...
Synchronize eye joint and debugging vectors
2015-08-17 16:56:01 -07:00
ZappoMan
49cf29ce8f
cleanup debugging and dead code
2015-08-17 15:57:20 -07:00
ZappoMan
47b0e2fda6
more hacking on click to focus
2015-08-17 14:02:24 -07:00
ZappoMan
b7d9dc444b
more work on clicking focus
2015-08-17 13:06:32 -07:00
ZappoMan
8cf450cb67
first cut at making focus click based
2015-08-17 11:41:54 -07:00
Brad Davis
9706a44ca1
Merge pull request #5571 from ZappoMan/hmdToolsRedux
...
remove HMD Tools as menu item, automatically hide/show it when display plugin is an hmd
2015-08-14 20:11:27 -07:00
Brad Davis
dc2ddd0303
switch statement spacing
2015-08-14 17:12:00 -07:00
Howard Stearns
d28c555a79
Synchronize eye joint and debugging vectors when the other avatar is looking at me.
2015-08-14 16:47:34 -07:00
Brad Davis
db95657455
PR comments
2015-08-14 16:40:53 -07:00
ZappoMan
6a802560f2
remove HMD Tools as menu item, automatically hide/show it when display plugin is an hmd
2015-08-14 16:27:50 -07:00
Brad Davis
208e41efd1
WebEntity keyboard input with mouse hover
2015-08-14 16:18:38 -07:00
Brad Hefta-Gaub
31a49a551a
Merge pull request #5556 from jherico/bart
...
QML framerate improvments
2015-08-14 11:11:14 -07:00
Howard Stearns
1133e053d1
Developer->Avatar->Fix Gaze menu option to not move the eyes around while we're debugging.
2015-08-14 07:33:36 -07:00
Howard Stearns
0f6c0a3117
Merge branch 'master' of https://github.com/highfidelity/hifi into recapitate
2015-08-13 15:56:13 -07:00
Howard Stearns
2756a00638
Get default avatar url from resources.
2015-08-13 14:23:34 -07:00
Leonardo Murillo
cda5b29fd3
Another take at versioning details exchange - checkpoint
2015-08-13 14:19:13 -06:00
Howard Stearns
62941c0914
Remove dead code.
2015-08-13 12:39:30 -07:00
Brad Davis
0fa3044231
QML framerate improvments
2015-08-12 16:24:34 -07:00
David Rowe
0f56285283
Fix HMD look-at positions and lines
2015-08-11 18:54:55 -07:00
David Rowe
3e8d0ad712
Fix to use new HMD methods
2015-08-11 13:40:08 -07:00
David Rowe
e6473fc8b9
Merge branch 'master' into 20639
...
Conflicts:
interface/CMakeLists.txt
interface/src/Application.cpp
interface/src/Menu.h
tests/ui/src/main.cpp
2015-08-11 12:34:28 -07:00
Brad Hefta-Gaub
35d6528d08
Merge pull request #5550 from jherico/marge
...
PLUGINS - Cleaning up HMD tools
2015-08-11 10:46:59 -07:00
Bradley Austin Davis
7694c1c0a6
Cleaning up HMD tools
2015-08-10 21:39:36 -07:00
Brad Davis
19d31938d3
Merge remote-tracking branch 'upstream/master' into plugins
2015-08-10 21:25:35 -07:00
David Rowe
80e296edd0
Merge branch 'master' into 20639
2015-08-10 19:25:12 -07:00
David Rowe
8b326414ac
Start eye tracker streaming such that don't block Interface
...
Start method is called in a separate thread.
2015-08-10 19:19:29 -07:00
Bradley Austin Davis
61ecee93b8
Fix mis-positioning of QML elements when moving from retina to non-retina display
2015-08-10 15:18:49 -07:00
ericrius1
0f7c21ddd7
rearranged entity props and added check in setNormals to avoid uninitialized binormal values
2015-08-10 11:55:47 -07:00
Brad Davis
57408c4338
Automatically show HMD tools when switching an HMD plugin
2015-08-09 12:14:29 -07:00
Brad Davis
5515b9d8ee
Decouple Application and plugin definitions, cleanup container usage
2015-08-08 17:51:16 -07:00
Bradley Austin Davis
2878950dbe
Fix crash on startup on mac
2015-08-08 15:26:38 -07:00
Brad Davis
751db23bc8
Fixing naming, and improving viewport handling
2015-08-08 14:19:43 -07:00
Brad Davis
639a0822fe
Fixing aspect ratio
2015-08-08 14:08:41 -07:00
Brad Davis
ccc4a59992
Cleanup and PR comments
2015-08-08 13:54:37 -07:00
Brad Davis
4b5c71e16d
Merge fixes
2015-08-08 13:37:46 -07:00
Brad Davis
caf93d1aff
Merge branch 'master' into plugins
...
Conflicts:
interface/src/Application.cpp
interface/src/Menu.h
2015-08-08 13:18:13 -07:00
David Rowe
051a398fa2
Merge branch 'master' into 20639
2015-08-07 18:26:56 -07:00
David Rowe
ea03067a02
When eye tracking data is lot for > N seconds handle as "not tracking"
...
Revert to default look-at behaviour and saccades until tracking resumes.
2015-08-07 12:23:43 -07:00
David Rowe
e2bf5cad3e
Resume eye tracking at start-up if was running at shut-down
2015-08-07 11:59:11 -07:00
ZappoMan
87f609b9af
remove shadow menu items, left in the dead code for now, until we have a plan for replacing shadows
2015-08-07 11:26:07 -07:00
ericrius1
3910cb0d69
Merge branch 'master' into polyLineInProgress
2015-08-07 10:12:02 -07:00
David Rowe
551c00dc23
Fix look-at position calculation when in HMD display
...
Calculate look-at target from camera position and orientation.
Render own look-at vectors from camera eye positions.
Draw other avatar's look-at vectors from their eyeballs.
With and without eye trackers.
2015-08-06 16:41:06 -07:00
Bradley Austin Davis
7e60aee1bf
Merge branch 'master' into plugins
...
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
interface/src/avatar/Head.cpp
interface/src/avatar/MyAvatar.cpp
interface/src/avatar/MyAvatar.h
interface/src/avatar/SkeletonModel.cpp
interface/src/avatar/SkeletonModel.h
interface/src/devices/3DConnexionClient.cpp
interface/src/ui/overlays/Overlays.cpp
2015-08-06 11:03:37 -07:00
David Rowe
d7b42e264e
Merge branch 'master' into 20639
...
Conflicts:
interface/CMakeLists.txt
2015-08-05 16:49:06 -07:00
Sam Gondelman
513c652ab3
merge from master and attempt to fix connexion conflicts
2015-08-05 12:42:39 -07:00
Andrew Meadows
59f6988e56
Merge pull request #5465 from SamGondelman/connexionFixes
...
Trying to fix/clean up 3DConnexion stuff
2015-08-05 11:16:34 -07:00
Stephen Birarda
052978898e
resolve conflicts on merge with upstream master
2015-08-05 11:16:20 -07:00
Philip Rosedale
06710618d1
Merge pull request #5463 from ctrlaltdavid/20640
...
CR for 20640 - Add DDE option to couple eyelids
2015-08-05 08:47:28 -07:00
Anthony J. Thibault
b8bae7cc3f
Debug rendering of MyAvatar’s skeletonModel skeleton
2015-08-04 18:14:47 -07:00
Anthony J. Thibault
91ca13c66d
Added AnimDebugDraw to render-utils
2015-08-04 18:14:46 -07:00
David Rowe
c771574578
Add 5 point eye tracker calibration option
2015-08-04 18:02:34 -07:00
Sam Gateau
fc0ee28b84
FIx the mirror rendering bugs by replacing the prvious technique by a simple true mirror during the final blit for both rear view mirror and full screen mirror, not working for HMD
2015-08-04 16:31:20 -07:00
David Rowe
fefddb631f
Add 1 and 3 point eye tracker calibration
2015-08-04 14:46:03 -07:00
Bradley Austin Davis
3c76c0d4b6
Merge remote-tracking branch 'upstream/master' into core
2015-08-04 10:23:54 -07:00
Bradley Austin Davis
29c9e6e45e
Updating plugins to core profile
2015-08-04 00:33:03 -07:00
Bradley Austin Davis
53ccbfc4fa
Merge branch 'core' into plugins
2015-08-03 22:25:50 -07:00
Bradley Austin Davis
ed5f70039f
Merge branch 'master' into core
2015-08-03 22:18:38 -07:00
David Rowe
b71ad31812
Merge branch 'master' into 20639
2015-08-03 20:53:12 -07:00
Ryan Huffman
027adf73bb
Merge branch 'master' of github.com:highfidelity/hifi into asset-server
2015-08-03 16:41:24 -07:00
Sam Gondelman
c9780338ae
merge from master
2015-08-03 16:27:45 -07:00
Ryan Huffman
4e1b52a022
Add thread for AssetClient
2015-08-03 16:25:07 -07:00
ericrius1
12770edbe1
Merge branch 'master' into polyLineInProgress
2015-08-03 15:52:26 -07:00
David Rowe
7749b912ea
Merge branch 'master' into 20639
2015-08-03 09:55:35 -07:00
ericrius1
47bc8f50ab
cleaning
2015-08-03 08:45:14 -07:00
Brad Davis
8ac33453b5
Fix v-sync functionality
2015-08-01 22:10:47 -07:00
Sam Gondelman
01c4e17236
trying to fix connexion linker errors, general style fixes, renamed some files
2015-08-01 11:41:29 -07:00
SamGondelman
8908c7c141
working on windows crash
2015-07-31 17:55:59 -07:00
Zander Otavka
0524155349
Expose face tracking to the script engine.
2015-07-31 11:26:04 -07:00
Zander Otavka
c77a91eb63
Expose address bar toggling to scripts.
2015-07-31 11:26:04 -07:00
Brad Davis
155f88e267
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/src/devices/OculusManager.cpp
interface/src/devices/TV3DManager.cpp
interface/src/devices/TV3DManager.h
libraries/gpu/src/gpu/GPUConfig.h
2015-07-31 10:28:06 -07:00
Bradley Austin Davis
ac0ec0a458
Ensure the app moves back to a non-rift screen if the saved geometry is bad
2015-07-30 17:09:08 -07:00
Brad Davis
948d5dab0c
Cleaning up diff
2015-07-30 15:30:05 -07:00
Sam Gateau
14f4c9c6c0
REmove more of the unnecessary GLBacken .h and GPUCOnfig.h include, The gpu::Context is now completely agnostic of the True Backend
2015-07-30 15:07:36 -07:00
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
