Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-27 12:36:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
40896 commits 71 branches 56 tags 1.2 GiB
Commit graph

4840 commits

Author SHA1 Message Date
Brad Davis
82c865af2c Rename QmlWebWindow to OverlayWebWindow, move ctor registration to script engine 2015-12-17 12:20:38 -08:00
samcake
d8a71db929 Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-17 10:11:03 -08:00
Howard Stearns
da27cacdec Merge branch 'master' of https://github.com/highfidelity/hifi into pid-render-limits 2015-12-16 20:56:33 -08:00
samcake
1b1365fd40 Exposing the tone curve in the js api 2015-12-16 16:32:53 -08:00
Brad Davis
fa5bab08b1 Support web content inside QML 2015-12-16 16:25:38 -08:00
Seth Alves
ea202c5271 Merge branch 'master' of github.com:highfidelity/hifi into dejitter-hold-action 2015-12-16 15:44:44 -08:00
Seth Alves
d3c57821c0 call a method on actions before each physics simulation step. use this to attempt to dejitter held objects 2015-12-16 14:00:04 -08:00
Anthony Thibault
0c1ae5bb61 Merge pull request #6657 from AndrewMeadows/avatar-capsule-2 
Correct collision capsule for scaled avatars
 2015-12-16 11:36:08 -08:00
howard-stearns
d15da79d90 Merge branch 'master' of https://github.com/highfidelity/hifi into pid-render-limits 2015-12-16 10:14:33 -08:00
samcake
7c8f12b9c4 Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr 2015-12-16 09:55:37 -08:00
samcake
b4b541178d Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-16 09:42:06 -08:00
Brad Davis
1e5793893b Merge pull request #6665 from ZappoMan/rightClickMenu 
fix bug in simulated left click - make qml menus work
 2015-12-15 21:40:00 -08:00
samcake
d2ebaef69e Adding a simple manual exposure control to configure the tonemapping and expose it to js. Add a convenient way to access the Job._concept._data with template 2015-12-15 18:18:42 -08:00
Andrew Meadows
e9f52b1211 properly scale avatar collision shape 2015-12-15 18:18:08 -08:00
Brad Hefta-Gaub
76da3a14ac fix bug in simulated left click - make qml menus work 2015-12-15 17:58:07 -08:00
Brad Davis
29516619ee Merge pull request #6661 from ZappoMan/rightClickMenu 
first cut at simulating mouse/reticle behavior with input contorllers
 2015-12-15 16:08:59 -08:00
howard-stearns
a2c2ab6c94 Merge branch 'master' of https://github.com/highfidelity/hifi into pid-render-limits 2015-12-15 16:07:57 -08:00
howard-stearns
069199554c checkpoint 2015-12-15 16:07:37 -08:00
Brad Hefta-Gaub
aa53900fa3 CR feedback 2015-12-15 15:40:50 -08:00
Brad Hefta-Gaub
3dcdfbc0f1 first cut at simulating mouse/reticle behavior with input contorllers 2015-12-15 13:59:22 -08:00
David Rowe
541af36794 Fix signal connection to ScriptEngine::finished 2015-12-16 09:12:07 +13:00
samcake
e70ab472af Merging with upstream master/graphics 2015-12-14 18:38:29 -08:00
samcake
84d1e3b123 Merged with upstream master 2015-12-14 18:30:24 -08:00
samcake
a50b14dfae Merging with upstream graphics 2015-12-14 18:18:39 -08:00
samcake
3554f54e17 Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-14 17:38:56 -08:00
samcake
9f1f0798cb cleaning up the code 2015-12-14 17:04:26 -08:00
samcake
ed2d45d0b6 HMD Mirror looks correct 2015-12-14 16:18:44 -08:00
samcake
1597d3d466 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2015-12-14 10:25:22 -08:00
samcake
2aad26154e THis should fix the mirror and the skybox issue 2015-12-14 10:24:51 -08:00
samcake
e005bb7b5a MAybe a mirror solution ? 2015-12-14 09:25:32 -08:00
Sam Cake
6288e99798 Playing with mirror 2015-12-11 23:28:04 -08:00
Atlante45
b8495a6912 Merge branch 'master' of https://github.com/highfidelity/hifi into warnings-win 2015-12-11 18:05:47 -08:00
samcake
b3acde4462 Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-11 17:49:00 -08:00
samcake
1ddbc15df4 Exploring how to solve the mirror fullscreen bug 2015-12-11 17:47:33 -08:00
Clément Brisset
c160a98c5c Merge pull request #6636 from samcake/controllers 
Fix the broken skybox and simplify a bit the vertex shader used
 2015-12-11 17:06:33 -08:00
samcake
7ee066b9ed Merge branch 'controllers' of https://github.com/samcake/hifi into red 2015-12-11 16:35:18 -08:00
Atlante45
c782b01fde More warning fixes 2015-12-11 16:31:27 -08:00
Atlante45
79fdb2e882 Fix warnings on windows 64bit 2015-12-11 16:31:27 -08:00
samcake
68134aafe5 Fix the broken skybox and simplify a bit the vertex shader used 2015-12-11 16:14:55 -08:00
Brad Davis
1bcf42a799 Merge pull request #6629 from ZappoMan/resetSkyBoxOnDomainChange 
reset skybox on changing domains
 2015-12-11 15:48:20 -08:00
Brad Hefta-Gaub
d918eca030 reset skybox on changing domains 2015-12-11 11:36:02 -08:00
Brad Hefta-Gaub
a1a3c4470c reload own avatar on Content Reload 2015-12-11 11:02:16 -08:00
Brad Hefta-Gaub
a7a924153a Merge pull request #6617 from huffman/entity-query-keyhole 
Add keyhole radius to OctreeQuery
 2015-12-11 09:35:46 -08:00
samcake
5d395ae54f Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-10 18:06:43 -08:00
Brad Hefta-Gaub
a472d293bb Merge pull request #6599 from jherico/aeryn-sdl2 
Moving SDL2 to external plugin
 2015-12-10 18:02:15 -08:00
Brad Davis
98263f0c0d Moving sdl2 to external plugin 2015-12-10 14:56:41 -08:00
Ryan Huffman
b6ecd539df Merge branch 'master' of https://github.com/highfidelity/hifi into entity-query-keyhole 2015-12-10 14:36:03 -08:00
Ryan Huffman
b5e3dce376 Add keyhole radius to OctreeQuery 2015-12-10 14:34:28 -08:00
Seth Alves
8ca6c7acc3 Merge pull request #6611 from Atlante45/attachments 
Fix Attachments jitter
 2015-12-10 11:46:19 -08:00
Seth Alves
dbde0b641e Merge branch 'attachments' of github.com:Atlante45/hifi into no-physics-until-ready 2015-12-10 11:38:08 -08:00
Seth Alves
d10221f53a merge from upstream 2015-12-10 11:21:36 -08:00
Atlante45
739e184b52 Fix attachments jitter 2015-12-10 11:19:11 -08:00
Brad Hefta-Gaub
589adde41e Merge pull request #6541 from howard-stearns/correct-target-frame-rate 
Don't limit avatar rendering when not vsync'd
 2015-12-10 11:17:23 -08:00
James B. Pollack
d21e4ff5e1 Merge pull request #6592 from huffman/script-engine-fixes 
Fix concurrency issues for bools in ScriptEngine
 2015-12-10 10:48:54 -08:00
Seth Alves
a59af2c1b2 Merge branch 'master' of github.com:highfidelity/hifi into no-physics-until-ready 2015-12-10 09:03:57 -08:00
Seth Alves
d09f70239c make entity-tree a global. change how network-requests to load model geometry are triggered 2015-12-10 09:03:53 -08:00
Ryan Huffman
ad0865171b Fix unused variable in scriptFinished 2015-12-09 15:52:30 -08:00
Howard Stearns
dd2d040253 Merge branch 'fix-sync-period-calc' into correct-target-frame-rate 2015-12-09 15:43:43 -08:00
Howard Stearns
d964032572 Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc 2015-12-09 15:23:00 -08:00
Howard Stearns
270cfe8af7 coding standards 2015-12-09 15:22:44 -08:00
Ryan Huffman
fc6a78d9ef Update scriptFinished signal to be a DirectConnection 2015-12-09 14:49:05 -08:00
Ryan Huffman
4bfce768ca Add locks around read/writes of _scriptEnginesHash 2015-12-09 14:48:33 -08:00
Seth Alves
446ca8236f disable physics disabler 2015-12-09 11:25:44 -08:00
howard-stearns
1d65cbce88 Remove unneeded getTargetFramePeriod and isVSynchronized. 2015-12-08 18:08:57 -08:00
howard-stearns
9ae22800fe Merge branch 'fix-sync-period-calc' into correct-target-frame-rate 2015-12-08 17:32:53 -08:00
howard-stearns
32e4967ee0 cleanup 2015-12-08 16:38:05 -08:00
howard-stearns
7afc803fb5 Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc 2015-12-08 15:30:48 -08:00
howard-stearns
5b41d4da1c Snapshot of "working" version. 2015-12-08 15:30:23 -08:00
Seth Alves
c462bda86c disable physics when moving to a new domain 2015-12-08 14:01:18 -08:00
Seth Alves
164439b303 don't enable physics until an entire scene has been received from the entity server and until nearby (to MyAvatar) entities are ready 2015-12-08 13:53:39 -08:00
samcake
ede375a889 Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr 2015-12-08 12:28:16 -08:00
samcake
83279489f3 Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-08 09:46:29 -08:00
Howard Stearns
481fe5a7d0 Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc 2015-12-07 18:52:29 -08:00
Seth Alves
5bf0ddfc2e Merge branch 'master' of github.com:highfidelity/hifi into parents 2015-12-07 18:05:03 -08:00
Brad Hefta-Gaub
4cbbd252d5 Merge pull request #6587 from jherico/rigel 
Fix crashes on exit due to poor cleanup
 2015-12-07 18:04:52 -08:00
Bradley Austin Davis
b7aeb34a8c Fix crashes on exit due to poor cleanup 2015-12-07 17:50:08 -08:00
Seth Alves
bee423718a Merge branch 'master' of github.com:highfidelity/hifi into parents 2015-12-07 17:48:05 -08:00
James B. Pollack
6cf1ad464f Merge pull request #6583 from birarda/extension-ci 
use a case insensitive check for extensions in Application
 2015-12-07 17:33:03 -08:00
howard-stearns
9512c3f73d Debugging. 
Please enter the commit message for your changes. Lines starting
 2015-12-07 16:58:59 -08:00
Stephen Birarda
7beaf5e235 force asset upload to use a lowercase extension 2015-12-07 15:18:32 -08:00
Stephen Birarda
0fee004bdd use case insensitive check for extensions 2015-12-07 15:13:14 -08:00
Seth Alves
f99812a903 adjust method names to fit convention 2015-12-07 14:31:08 -08:00
samcake
9ddc3c27bf compilation errors fixed 2015-12-07 13:25:55 -08:00
Howard Stearns
289c8d6137 Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc 2015-12-07 11:54:33 -08:00
Clément Brisset
42365acef5 Merge pull request #6561 from ZappoMan/cruftRemovalRedux 
More Cruft Removal
 2015-12-07 11:39:54 -08:00
Howard Stearns
8303b63491 Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc 2015-12-07 10:11:12 -08:00
Howard Stearns
1d4cc7c984 Checkpoint exploring use of getLastSynchronizedElapsed and fixing paintWait (which may go away). 2015-12-07 10:01:46 -08:00
Clément Brisset
390836b64e Merge pull request #6431 from huffman/proto-received-message 
Combine Packet and PacketList into ReceivedMessage on receiving end
 2015-12-07 09:58:52 -08:00
Ryan Huffman
34138f07bd Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message 2015-12-07 08:58:47 -08:00
Atlante45
f8ee377f01 Fix QOpenGL warning 2015-12-07 08:37:07 -08:00
Seth Alves
f6b1ef85b3 remap entity IDs on export also 2015-12-07 06:03:47 -08:00
Seth Alves
f53571ac81 remap IDs on export, also 2015-12-07 05:41:34 -08:00
Seth Alves
3cc423ca03 remap IDs when importing entities 2015-12-06 17:55:48 -08:00
Atlante45
acb9e2774e Basic implementation of debug zone resizing 2015-12-04 21:01:53 -08:00
samcake
119cc733b5 Merging with master 2015-12-04 17:17:33 -08:00
Howard Stearns
fa0ad1fe4d Merge branch 'master' of https://github.com/highfidelity/hifi into correct-target-frame-rate 2015-12-04 16:12:22 -08:00
Brad Hefta-Gaub
2a243ccd17 Merge branch 'master' of https://github.com/highfidelity/hifi into cruftRemovalRedux 2015-12-04 14:58:38 -08:00
Brad Hefta-Gaub
46946212cf remove WANT_LOW_RES_MOVING_BIT from OctreeQuery always true 2015-12-04 14:24:31 -08:00
Brad Hefta-Gaub
f44a9daa21 remove WANT_DELTA from OctreeQuery 2015-12-04 14:04:57 -08:00
Brad Davis
11917ca501 Fixing preview / vsync functionality 2015-12-04 12:46:19 -08:00
Ryan Huffman
89c412c324 Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message 2015-12-04 11:38:28 -08:00
Atlante45
c27944ae28 Simple normal map debug 2015-12-04 10:44:23 -08:00
Brad Davis
60aa93c38c Fixing menu items in display plugins 2015-12-04 10:28:19 -08:00
Brad Davis
d8bb9f8d18 Fixing screenshot functionality 2015-12-04 10:28:17 -08:00
Brad Davis
b9ace94ff1 Prototyping threaded present 2015-12-04 10:28:16 -08:00
Brad Hefta-Gaub
d9a1563396 Merge pull request #6152 from sethalves/parents 
Parents
 2015-12-04 10:26:57 -08:00
Brad Hefta-Gaub
8b58aa706a Merge pull request #6534 from jherico/homer 
Windows 64 bit updates
 2015-12-04 10:05:45 -08:00
Clément Brisset
19a503a99f Merge pull request #6549 from samcake/hdr 
Graphics: Introducing a deferred Color buffer different from the Primary one used for final composition
 2015-12-04 09:53:15 -08:00
Brad Hefta-Gaub
f472b515c3 remove wantsColor support since its always true and required for entities 2015-12-03 21:03:32 -08:00
Brad Hefta-Gaub
81fb4476bc remove coverage map and occulusion culling, since it was always disabled 2015-12-03 20:29:23 -08:00
Brad Hefta-Gaub
5a75a17174 Revert "Cruft removal" 2015-12-03 17:40:41 -08:00
Howard Stearns
d51785a259 Merge branch 'master' of https://github.com/highfidelity/hifi into correct-target-frame-rate 2015-12-03 17:28:32 -08:00
samcake
d593b824e9 Introducing a true Primary Framebuffer and a different Deferred Framebuffer 2015-12-03 17:26:54 -08:00
Brad Hefta-Gaub
1df24dd174 Merge branch 'master' of https://github.com/highfidelity/hifi into cruftRemoval 2015-12-03 16:31:15 -08:00
samcake
902b6b8ea1 Merge pull request #6506 from jherico/maggie 
OpenGL class cleanup
 2015-12-03 13:55:29 -08:00
Brad Hefta-Gaub
1a5bc5d111 removing optional compression 2015-12-03 12:40:24 -08:00
Howard Stearns
375211e13b Use isVSynchronized in controller. 2015-12-03 11:29:13 -08:00
Brad Hefta-Gaub
849a8707d2 remove wantsColor support since its always true and required for entities 2015-12-03 11:11:15 -08:00
Brad Davis
2cea593fbd Remove RealSense & MIDI 2015-12-03 11:00:01 -08:00
Brad Hefta-Gaub
0c05ffe9ce remove coverage map and occulusion culling, since it was always disabled 2015-12-03 10:20:04 -08:00
Howard Stearns
53bfcd17e2 Use plugins data for Application frame rate/period. 2015-12-02 16:41:16 -08:00
Seth Alves
6eae98fb28 merge from upstream 2015-12-02 14:38:26 -08:00
Howard Stearns
38182bfd9d Merge pull request #6523 from hyperlogic/tony/avatar-reset-improvements 
MyAvatar::reset() improvements
 2015-12-02 11:40:46 -08:00
Seth Alves
0595ef0938 merge from upstream 2015-12-02 09:30:19 -08:00
Anthony J. Thibault
99065f10fa Avatar Warning fixes on linux 2015-12-01 18:12:01 -08:00
James B. Pollack
52d6fdac1a Merge pull request #6487 from ctrlaltdavid/20740 
Get the Leap Motion working again
 2015-12-01 15:40:48 -08:00
Brad Davis
0023c034c4 Fixing naming of GL classes 2015-11-30 18:27:03 -08:00
Seth Alves
b7ebe5b92b merge from upstream 2015-11-30 16:59:52 -08:00
Howard Stearns
6f50d91208 Merge pull request #6461 from hyperlogic/tony/remove-joint-states 
Refactor of Rig and MyAvatar animation JavaScript interface
 2015-11-30 16:28:15 -08:00
Anthony J. Thibault
31cecdc174 Menu: removed Enable Avatar Threading option. 
To re-enable, you can set ENABLE_AVATAR_UPDATE_THREADING to true on line 2552 of Application.cpp.

Also, removed other unused strings.
 2015-11-30 15:45:23 -08:00
Clément Brisset
e168966b87 Merge pull request #6409 from birarda/injector-hybrid 
more efficient threading of networked AudioInjector objects
 2015-11-30 15:36:41 -08:00
Seth Alves
5c327edd5a keep AvatarHashMap::findAvatar from creating bogus avatar entries. remove some more stray consts 2015-11-30 14:08:07 -08:00
Anthony J. Thibault
11bfed4185 Merge branch 'master' into tony/remove-joint-states 2015-11-30 11:21:44 -08:00
Ryan Huffman
1b0413f8e3 Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message 2015-11-30 10:23:40 -08:00
Ryan Huffman
99dd9646bc Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message 2015-11-30 10:20:13 -08:00
Seth Alves
081174fe69 Merge branch 'master' of github.com:highfidelity/hifi into parents 2015-11-30 10:18:01 -08:00
Andrew Meadows
49a6f63663 remove whitespace and fix warning (unused var) 2015-11-30 10:00:05 -08:00
Seth Alves
cf39cac7fc attempt to make SpatiallyNestable data access thread-safe 2015-11-29 12:50:33 -08:00
Seth Alves
ca75802b9c unmangle merge 2015-11-26 06:43:28 -08:00
Anthony J. Thibault
23def8d173 Merge branch 'master' into tony/remove-joint-states 2015-11-25 13:55:23 -08:00
Andrew Meadows
bc20b72645 Merge pull request #6453 from howard-stearns/avatar-render-controller2 
Survive Flash Mobs Without Making Everyone Sick
 2015-11-25 09:52:28 -08:00
Anthony J. Thibault
f120e10ff4 Merge branch 'master' into tony/remove-joint-states 2015-11-24 15:00:05 -08:00
David Rowe
5ecbaa5b93 Fix InputController (Leap Motion) not being updated 2015-11-25 09:43:55 +13:00
Andrew Meadows
5135c9dded whitespace cleanup 2015-11-24 10:20:19 -08:00
Ryan Huffman
dac491ef41 Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message 2015-11-24 09:59:22 -08:00
Stephen Birarda
ab7cbc0b76 Merge branch 'master' of https://github.com/highfidelity/hifi into injector-hybrid 2015-11-24 10:45:00 -06:00
David Rowe
d73e3a5490 Fix avatar pitch rate depending on FPS 2015-11-24 09:48:37 +13:00
David Rowe
f5d66bbf2e Fix avatar rotation rate depending on FPS 2015-11-24 09:42:12 +13:00
Anthony J. Thibault
821264a031 Merge branch 'master' of github.com:highfidelity/hifi into tony/remove-joint-states 2015-11-22 16:15:03 -08:00
Seth Alves
f013f95e9b merge from upstream 2015-11-21 08:43:00 -08:00
Anthony J. Thibault
007a3c5134 Fix one frame lag in AnimDebugDraw 2015-11-20 19:00:51 -08:00
Stephen Birarda
9ddebc8d13 resolve conflicts on merge with upstream/master 2015-11-20 15:29:44 -08:00
howard-stearns
1ddcc62db9 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-render-controller2 2015-11-20 14:05:40 -08:00
howard-stearns
6c784256cb final(?) cleanup 2015-11-20 13:51:12 -08:00
howard-stearns
a366598598 snapshot. It works. 2015-11-20 11:48:44 -08:00
Howard Stearns
0f6a37f0f7 remainder->fmod! 2015-11-20 09:49:14 -08:00
Howard Stearns
431a8c9584 cleanup 2015-11-19 17:12:50 -08:00
Ryan Huffman
07d21514c5 Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message 2015-11-19 10:47:37 -08:00
Howard Stearns
7d30cd0159 checkpoint: it works! 2015-11-19 09:18:40 -08:00
samcake
74beeefe06 Merge pull request #6420 from jherico/dargo 
Make recording and playback work in interface, playback in agent
 2015-11-18 17:52:09 -08:00
Ryan Huffman
2a416ebc61 Merge branch 'master' of https://github.com/highfidelity/hifi into received-message 2015-11-18 16:52:23 -08:00
Stephen Birarda
cb708859fb resolve conflicts on merge with upstream master 2015-11-18 15:34:56 -08:00
howard-stearns
42a1ee353e checkpoint 2015-11-18 14:09:33 -08:00
Brad Davis
5b8047ded4 Make recording and playback work in interface, playback in agent 2015-11-18 14:04:45 -08:00
Brad Hefta-Gaub
35677d3a48 Merge pull request #6418 from birarda/test-ds-settings-fail 
move keepalive pings transparently to NL
 2015-11-18 11:12:16 -08:00
Stephen Birarda
0e3d3451d7 make keep alive pings the responsibility of NL 2015-11-18 10:24:10 -08:00
Brad Davis
2636e43fab Merge pull request #6413 from samcake/controllers 
Recording: Moving the Recording js interface to the Script engine
 2015-11-18 10:22:55 -08:00
Anthony J. Thibault
b481d7c73d Merge branch 'master' into tony/remove-joint-states 2015-11-18 09:38:21 -08:00
Howard Stearns
fee13d4375 Rebuild on a new branch after original stopped building. 2015-11-17 20:06:25 -08:00
Brad Hefta-Gaub
a1e10a9f04 Merge pull request #6309 from thoys/20724 
CR for Job #20724 - Camera entity mode
 2015-11-17 20:05:22 -08:00
samcake
368f19b4e2 Merging with todays upstream and checking 2015-11-17 18:58:10 -08:00
samcake
d2f3b48637 Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-11-17 17:36:38 -08:00
Stephen Birarda
5dc48dc9dc resolve conflicts on merge with upstream/master 2015-11-17 17:04:12 -08:00
Stephen Birarda
935c0cc137 handle AudioInjectorManager cleanup in Application 2015-11-17 16:39:23 -08:00
Brad Hefta-Gaub
32bf81ef0d move MessagesClient to agent 2015-11-17 12:59:12 -08:00
Sam Gateau
5b92929833 Moving the REcordingScriptingInterface into the script-engine and wiiring up in the assignment-client 2015-11-17 09:32:22 -08:00
Brad Hefta-Gaub
1e0b66a68f more work 2015-11-16 19:23:39 -08:00
Brad Hefta-Gaub
12f206e2f0 more work on messages 2015-11-16 17:00:03 -08:00
Stephen Birarda
aa77c4894c add an AudioInjectorManager for more efficient threading 2015-11-16 16:04:10 -08:00
Brad Davis
cb26fc67fc Move recording interface back to float/seconds 2015-11-16 14:44:22 -08:00
Seth Alves
36af315e5d Merge pull request #6383 from birarda/goodbye-packet 
send a hopeful disconnect packet from ACs and Interface
 2015-11-16 11:28:48 -08:00
Anthony J. Thibault
55adedcec8 Merge branch 'master' into tony/remove-joint-states 2015-11-16 11:22:44 -08:00
Stephen Birarda
ea38c4cc49 don't allow domain check-ins while shutting down 2015-11-12 18:04:15 -08:00
Stephen Birarda
d932ba74fd remove the avatar kill packet from Interface 2015-11-12 17:58:12 -08:00
Stephen Birarda
6b2987eef8 handle domain server node removal in NodeList 2015-11-12 17:47:51 -08:00
Anthony J. Thibault
11440f92f4 Removed rig animations 
* Deleted AnimationHandle class
* Removed enableAnimGraph and anableRigAnimations from Menu.
* Removed *some* references to old IK system.
  But it is still used when computing collision bounding volumes
 2015-11-11 15:32:57 -08:00
Seth Alves
b9ca509f07 Merge branch 'master' of github.com:highfidelity/hifi into render-debug-fixup 2015-11-10 09:50:12 -08:00
Anthony J. Thibault
eacc2cae0c WIP checkpoint 2015-11-09 18:36:23 -08:00
Thijs Wenker
a58bd4ff05 Merge branch 'master' of https://github.com/worklist/hifi into 20724 2015-11-09 22:37:44 +01:00
Seth Alves
f3d26e163d turn _drawItemStatus into a bitfield, split out bounding boxes and network/physics-sim-ownership. hook Display-Simulation-Ownership menu item to this system 2015-11-07 07:19:27 -08:00
Brad Davis
7c433f47c0 Breaking up input devices and input plugins classes. 2015-11-06 15:20:00 -08:00
AlessandroSigna
fdd4a55057 Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-11-06 12:47:04 -08:00
AlessandroSigna
6d3a79af83 changed the behaviour of Standard.LY input 2015-11-06 12:46:08 -08:00
Atlante45
c53c0ec53f Fix double delete on shutdown 2015-11-06 11:13:10 -08:00
Thijs Wenker
de98a17ada - rename CameraEntityItem to AnchorEntityItem 2015-11-06 01:58:08 +01:00
Anthony J. Thibault
d9f4b0218e Merge branch 'master' into tony/mac-fixes 2015-11-05 08:26:44 -08:00
samcake
00797b4dea Merge pull request #6314 from jherico/homer 
Fixing step yaw to move by consistent amounts, be 'tappable'
 2015-11-04 23:33:45 -08:00
Brad Davis
20d1035821 Fixing step yaw to move by consistent amounts, be 'tappable' 2015-11-04 15:54:50 -08:00
Thijs Wenker
42cbccc725 fix stretchy HMD view on entity camera 2015-11-04 21:39:22 +01:00
Thijs Wenker
ee218faf5e Merge branch '20724' of github.com:thoys/hifi into 20724 2015-11-04 21:21:57 +01:00
Anthony J. Thibault
69f1cfbcb9 Fixes for Mac build and crash on startup 
For some reason the qt code gen is getting confused by the #if 0
in 3DConnextionClient.h, so I added a stub implementation.

In Application.cpp the change of moving idle into paintGL had a sideeffect
of calling OffscreenGlCanvas before it was initialized.  To work around this
I added a guard to prevent calling idle before all the gl windows/widgets have
been initialized.
 2015-11-04 12:04:34 -08:00
EdgarPironti
2a84cadd5d Merge branch 'master' of https://github.com/highfidelity/hifi 2015-11-03 18:22:29 -08:00
Thijs Wenker
d7279e4c88 Support for Camera Entities. 
- New entity type: camera, with just the basic properties of an entity (position, rotation, name etc.).
- New CameraMode: CameraEntity
- Example script using the new cameraEntity
- Updated edit.js to use the CameraEntities (with button to preview the camera)
 2015-11-04 02:51:23 +01:00
Seth Alves
ffb0317a50 Merge branch 'master' of github.com:highfidelity/hifi into parents 2015-11-03 16:53:00 -08:00
Seth Alves
60824a1fb0 back out some off-brand changes. add parentChanged call 2015-11-03 16:07:28 -08:00
Anthony J. Thibault
31f361d49c Moved fps timing to beginning of paintGL 
This should improve accuracy.

However the fps displayed can still sometimes be slightly greater then the
vsync, this is either due to timer accuracy problems or QTimer delay within
OpenGLDisplayPlugin.
 2015-11-03 15:51:18 -08:00
Anthony J. Thibault
c139b62217 fps calculation now based on moving average 
fps stat is now calcualted the same way as simRate and avatarRate are calculated,
based on a moving average that is sampled once a second.
Also, Removed unused constants and renamed Application::checkFPS to Application::ping
 2015-11-03 11:19:49 -08:00
EdgarPironti
603405ad61 Do not merge - Spacemouse 2015-11-02 23:29:15 -08:00
Anthony J. Thibault
0c12bb5a4e Remove idleTimer and call idle directly from paintGL. 2015-11-02 18:47:18 -08:00
Seth Alves
3ac0fef1ea merge from upstream 2015-11-01 15:22:57 -08:00
Brad Hefta-Gaub
9c23f2551d Merge pull request #6207 from jherico/pluginSupport 
Support for runtime plugins (DLLs)
 2015-11-01 14:57:13 -08:00
Brad Davis
cfb2fd1523 Support for runtime plugins (DLLs) 2015-11-01 11:12:12 -08:00
Brad Hefta-Gaub
e899229cde tweaks to how VrMenu is shown 2015-11-01 09:55:30 -08:00
Brad Hefta-Gaub
05dea847be add Actions.CycleCamera and wire up secondary thumb buttons to Actions.CycleCamera and Actions.ContextMenu 2015-10-31 15:47:40 -07:00
samcake
f72146c35d FIxing the mac build 2015-10-29 14:17:52 -07:00
samcake
d73eafddd1 COmfort mode working with the COntroller system observing the menu state 2015-10-29 13:48:16 -07:00
samcake
e902e5e97a Introduce the concept of loading the default Mapping 2015-10-29 13:05:29 -07:00
Brad Davis
c4e82a85d9 Remove DeviceProxy in favor of InputDevice 2015-10-29 09:32:56 -07:00
Brad Davis
570b4a32da Merge pull request #6206 from samcake/controllers 
Controllers : Add a new kind onf controller to expose ReadOnly state from the application
 2015-10-28 13:42:15 -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
samcake
bbc6d9f5e7 Fixing typo and review comments 2015-10-28 12:52:21 -07:00
samcake
b37a6f689a Fixing typo and review comments 2015-10-28 12:51:22 -07:00
samcake
fc15c7cd98 Adding the ApplicationStateDevice to the APplication class and add one entry ythere 2015-10-28 12:15:14 -07:00
Brad Hefta-Gaub
731fab6ffc Merge pull request #6196 from jherico/gl 
Move GL utilities to their own library
 2015-10-28 12:10:52 -07:00
samcake
57aa89d14f Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-28 09:24:24 -07:00
samcake
92ca658aae Trying to get a state controller to work 2015-10-28 09:23:20 -07:00
samcake
6ec87086bc Adding the state controller 2015-10-27 16:57:06 -07:00
Brad Hefta-Gaub
19743c1f39 gak, build busters and more CR feedback 2015-10-27 16:16:03 -07:00
Brad Hefta-Gaub
133d48ebee CR feedback 2015-10-27 15:53:48 -07:00
Brad Davis
5cbb2562cd Move GL utilities out to their own library 2015-10-27 15:53:42 -07:00
Brad Hefta-Gaub
5a42991e0c first pass at cleaning up MyAvatars use of PalmData 2015-10-27 13:51:42 -07:00
Andrew Meadows
a1f1e50431 split CharacterController btw phys and interface 2015-10-27 13:15:38 -07:00
samcake
87cf3b237b Supporting a InHMD action and using it to enable COmfort mode 2015-10-27 09:59:22 -07:00
Brad Davis
e8be92cab8 Adding input action event 2015-10-23 13:36:06 -07:00
Seth Alves
264b658132 hook up entities and avatars to SpatialParentFinder 2015-10-22 11:05:48 -07:00
Brad Davis
afcec347ff Wiring yaw action to avatar 2015-10-21 21:35:19 -07:00
Brad Davis
044a28212d Wiring step yaw to the avatar 2015-10-21 20:44:38 -07:00
Brad Davis
a124d3b433 Moving to InputEndpoint, fixing build problem 2015-10-20 22:00:16 -07:00
samcake
da55011c2a Trying to merge 2015-10-20 16:38:41 -07:00
Seth Alves
bc99ef778c change how render engine is told about model position changes 2015-10-20 12:04:29 -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
a8e707ced2 Correcting update order to fix mouse 2015-10-18 22:46:14 -07:00
Seth Alves
a78f2a9577 have avatar make use of SpatiallyNestable 2015-10-18 09:48:46 -07:00
Brad Davis
57be59935d Move controller test to app 2015-10-17 19:13:38 -07:00
samcake
f0034844e7 Actions working from the Controller layer 2015-10-16 12:24:12 -07:00
Ryan Huffman
7682ab00e3 Add ReceivedMessage and receive progress 2015-10-15 14:09:53 -07:00
Brad Davis
80c962a4cc Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-15 12:27:53 -07:00
Andrew Meadows
2ae62de84e Merge pull request #6026 from birarda/qt-polling-env 
set bearer poll timeout env for wlan scan in Qt 5.5
 2015-10-15 09:58:32 -07:00
Brad Davis
0063f9ae1d Merging old and new controller interfaces 2015-10-14 15:16:54 -07:00
Anthony J. Thibault
3e7a6fd490 Change to boom offset for 3rd person HMD camera. 
Previously the boom offset was computed in HMD sensor space instead of
world space, so it did not play well with the vive, or the oculus
if you weren't facing the camera directly.

Now it is computed in world space, and is always behind the character's
position/orientation.  This can cause the boom to swing if the character
rotation changes but now the avatar rotation in HMD uses comfort mode.
It's not that disorienting.
 2015-10-14 14:43:59 -07:00
Andrew Meadows
073b019458 Merge pull request #6072 from howard-stearns/skip-some-reload-recenter-on-startup 
Don't reload/recenter some avatar data on startup
 2015-10-13 17:08:00 -07:00
Howard Stearns
93e908a592 Don't reload/recenter some avatar data on startup, when we don't necessarilly have all the required data initialized. 2015-10-13 12:15:13 -07:00
James B. Pollack
8d9bcbd793 Merge pull request #6067 from hyperlogic/tony/remove-middle-mouse-overlay-toggle 
Remove overlay hiding from middle mouse button.
 2015-10-13 10:14:15 -07:00
Brad Hefta-Gaub
8e8ba15aaa Merge pull request #6065 from sethalves/reorder-sims 
grab changes
 2015-10-13 08:35:38 -07:00
Anthony J. Thibault
6a8ff676ed Remove overlay hiding from middle mouse button. 
Because it conflicts with edit.js camera panning.
You can still toggle the overlay via the O key.
 2015-10-12 17:33:27 -07:00
Seth Alves
ed9907ce66 do avatar simulation before physics simulation so that physics actions can update based on avatar 2015-10-12 16:23:12 -07:00
Atlante45
cfba5752ce Change checkbox text 2015-10-12 15:03:37 -07:00
Atlante45
51acf07c15 Factor couple methods in AssetUtils 2015-10-12 15:03:37 -07:00
Atlante45
eea89ba010 CR - Rename method 2015-10-12 14:26:28 -07:00
Atlante45
7b41efcf86 All file types eligible for upload to asset server 2015-10-12 13:35:21 -07:00
Atlante45
ae83dfe041 Move auto-resize to update 2015-10-09 12:23:19 -07:00
Atlante45
e056743621 Check for upload rights 2015-10-09 12:23:19 -07:00
Atlante45
2229f942df Spawn fbx dropped in front of avatar 2015-10-09 12:23:19 -07:00
Atlante45
a1c154e7be Fix compile error 2015-10-09 12:23:19 -07:00
Atlante45
b666acdb26 Add fbx upload on drop 2015-10-09 12:23:19 -07:00
Atlante45
2d12b2ba9a Spacing 2015-10-09 12:23:19 -07:00
Atlante45
327154b0c0 Make _acceptedExtensions static const 2015-10-09 12:23:19 -07:00
Stephen Birarda
7987595dcd set the bearer poll timeout for wlan scan in Qt 5.5 2015-10-08 11:32:10 -07:00
Brad Hefta-Gaub
e1b69a1704 Merge pull request #6022 from jherico/lisa 
Fix mouse events for entity scripts
 2015-10-07 20:43:41 -07:00
Brad Davis
50592a87a6 Fix mouse events for entity scripts 2015-10-07 19:44:08 -07:00
Andrew Meadows
ef58238c66 Merge pull request #6017 from ZappoMan/animationGroupSettings 
fix a bunch of warnings
 2015-10-07 15:50:20 -07:00
Brad Hefta-Gaub
c6d50af085 Merge pull request #5999 from AndrewMeadows/save-sixense-settings 
Save hydra calibration settings
 2015-10-07 15:27:06 -07:00
Brad Hefta-Gaub
bfd014203e fix a bunch of warnings 2015-10-07 14:48:42 -07:00
Andrew Meadows
0680be0422 save sixense settings and some UI cleanup 2015-10-07 14:19:15 -07:00
Andrew Meadows
039d9a6a98 Merge pull request #6010 from ZappoMan/disableHandMouseByDefault 
Disable hand mouse by default
 2015-10-07 14:15:58 -07:00
Brad Hefta-Gaub
05fd62ac51 Merge pull request #6009 from jherico/homer 
Enabling programmatic access to the IPD scale
 2015-10-07 01:43:10 -07:00
Brad Davis
eff5a4c395 Picking fixes in the HMD 2015-10-06 22:56:48 -07:00
Brad Davis
028935f831 Removing deprecated function usage 2015-10-06 20:36:55 -07:00
Brad Hefta-Gaub
6e5847bb1c make Hand Input Mouse off by default 2015-10-06 19:58:25 -07:00
Brad Davis
19fb4e92a6 Enabling programmatic access to the IPD scale 
Conflicts:
	interface/src/Application.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/scripting/HMDScriptingInterface.cpp
	interface/src/scripting/HMDScriptingInterface.h
 2015-10-06 19:08:17 -07:00
Atlante45
ed13c02075 Fix rebase 2015-10-06 13:57:51 -07:00
Atlante45
7b25c9d417 More header cleanup 2015-10-06 13:57:50 -07:00
Atlante45
b63df98b8b More unused 2015-10-06 13:57:49 -07:00
Atlante45
17edd38cb9 Remove unused variables 2015-10-06 13:57:48 -07:00
Atlante45
39e0d0e1dc Put timers on the stack 2015-10-06 13:56:26 -07:00
Atlante45
e9b7125894 Misc cleanup 2015-10-06 13:56:26 -07:00
Atlante45
5e9425d9eb Fix view frustum preference 2015-10-06 13:56:25 -07:00
Atlante45
60ebd3a544 Remove unused members (Mostly mouse stuff) 2015-10-06 13:56:25 -07:00
Atlante45
35e2f8cd89 Removed _myAvatar from Application 2015-10-06 13:56:25 -07:00
Atlante45
2fc80e58b6 Fix warning 2015-10-06 13:56:24 -07:00
Atlante45
9827c90851 Rebase fixes 2015-10-06 13:56:24 -07:00
Atlante45
8c653c70fb Remove fps throttle from Application 2015-10-06 13:56:23 -07:00
Atlante45
4ccc2bbcd0 Enclose entire functions in ifdef 2015-10-06 13:56:23 -07:00
Atlante45
dde11c5cd1 More unused 2015-10-06 13:56:23 -07:00
Atlante45
34bba28775 More header cleanup 2015-10-06 13:56:22 -07:00
Atlante45
311edabe51 More header cleanup 2015-10-06 13:56:21 -07:00
Atlante45
765608d0ff More unused 2015-10-06 13:56:21 -07:00
Atlante45
7da55747f5 Simplify friends window 2015-10-06 13:56:21 -07:00
Atlante45
77a7814854 Move sendPingPackets 2015-10-06 13:56:20 -07:00
Atlante45
e74df484cc Remove unused methods 2015-10-06 13:56:20 -07:00
Atlante45
a5f31dba5f Fix startup timer 2015-10-06 13:56:20 -07:00
Atlante45
0aab013a0e Remove unused members 2015-10-06 13:56:20 -07:00
Atlante45
92e974929c Move tray icon to MainWindow 2015-10-06 13:56:19 -07:00
Atlante45
0f18db886c Remove 4 Application static methods 
- Replace by lambda
- Cleaned up global scope
 2015-10-06 13:56:19 -07:00
Atlante45
cf3b33a96b Replace Application::getInstance() with qApp 2015-10-06 13:56:19 -07:00
Brad Davis
8090bc8e8d Revert "Enabling programmatic access to the IPD scale" 2015-10-06 10:16:42 -07:00
Brad Davis
725ed26ac2 Enabling programmatic access to the IPD scale 2015-10-04 16:55:49 -07:00
Howard Stearns
fdba55e56e Merge pull request #5973 from ctrlaltdavid/20698 
Fix Reload Content menu item not reloading FST files
 2015-10-02 16:43:11 -07:00
Brad Davis
aa8979570c Working on 2D overlay mouse interaction 2015-10-02 00:35:37 -07:00
David Rowe
2fbb436bc5 Fix Reload Content menu item 2015-10-01 12:42:23 -07:00
Seth Alves
89ab1f626f Merge pull request #5921 from huffman/import-export-fix 
Import/Export entities fix
 2015-09-28 16:21:18 -07:00
Ryan Huffman
dde1c8b42f Fix use of EntityTree in import/export operations 
The EntityTree needs to be references by a shared_ptr somewhere.
The EntityTree does not start with a root element by default, which some
operations rely on to work as expected.
 2015-09-28 15:05:48 -07:00
Anthony J. Thibault
e32eb38c3b Fix for Oculus timewarp judder introduced by 20d784ba39 
Moved myAvatar->updateFromHMDSensorMatrix from Application::update
back into Application::paintGL, so it occurs between
displayPlugin->preRender() and displayPlugin->display().

We should render with the most up-to-date camera position as possible,
and sample it at the same frequency as the display rate.
 2015-09-28 14:38:03 -07:00
Howard Stearns
a820682816 Merge pull request #5901 from hyperlogic/tony/gangsta-lean 
Threshold based walking/leaning while in HMD.
 2015-09-25 15:51:39 -07:00
Thijs Wenker
9ed1397a63 Merge branch 'master' of https://github.com/worklist/hifi into 20672 2015-09-25 21:09:38 +02:00
Anthony J. Thibault
fc9b270951 Merge branch 'master' into tony/gangsta-lean 2015-09-25 11:36:58 -07:00
Anthony J. Thibault
20d784ba39 Threshold based walking while in HMD. 
This is a blend of the previous 'sitting' and 'standing' HMD modes.
Basically, when you move your head within a small range (20cm) your
avatar will lean appropriately, however when you cross that threshold
your body will move underneath you, re-centering your head above the body.

While this occurs the avatar should play the appropriate walking animations.
 2015-09-24 17:54:32 -07:00
Brad Hefta-Gaub
85b2322acc more work on batch optimzation 2015-09-24 17:11:14 -07:00
Thijs Wenker
6d4e4af0a5 ability to see Stats in JavaScript + example script which outputs the stats to the console/logviewer 2015-09-24 22:02:22 +02:00
Brad Hefta-Gaub
d14820d3ef Merge pull request #5880 from thoys/20668 
Worklist job #20668 - JS: Add option to listen audio from camera
 2015-09-23 20:40:32 -07:00
samcake
46e9c463fc Merge pull request #5885 from ZappoMan/batchOptimizations 
Batch optimizations
 2015-09-23 19:30:51 -07:00
Brad Hefta-Gaub
9a0e5b9870 address Sam's concerns 2015-09-23 17:37:48 -07:00
ZappoMan
65a079cb53 fix mac build 2015-09-23 16:48:34 -07:00
Brad Hefta-Gaub
ef25876c9a implement vector caching for gpu::Batch 2015-09-23 14:46:47 -07:00
Anthony J. Thibault
90a551214e Fix for AnimDebugDraw crash on shutdown. 2015-09-23 11:09:43 -07:00
David Rowe
eda12fd3af Don't look straight ahead in fullscreen mirror 2015-09-22 16:15:54 -07:00
Andrew Meadows
3af1329be2 Merge pull request #5825 from thoys/20655 
CR for Job #20655 - Add ability to close one script from another script
 2015-09-22 14:52:39 -07:00
Philip Rosedale
c09ac51d75 Merge pull request #5871 from ctrlaltdavid/20688 
DO NOT MERGE - QA for 20688 - Fix 3rd person HMD view
 2015-09-22 10:17:28 -07:00
Thijs Wenker
90b89cbb45 Merge branch 'master' of https://github.com/worklist/hifi into 20655 2015-09-22 18:44:25 +02:00
Thijs Wenker
dfb9034b4e - delete new AudioListenerMode menu on script ending 
- style fix (function naming)
 2015-09-22 15:45:57 +02:00
Thijs Wenker
617f048883 Added JS interface to change audio listening position / orientation in Interface 
- MyAvatar.audioListenerMode  change using:   MyAvatar.FROM_HEAD    , MyAvatar.FROM_CAMERA , MyAvatar.CUSTOM
- MyAvatar.customListenPosition   and  MyAvatar.customListenOrientation are for manual listening positions
 2015-09-22 13:40:33 +02:00
David Rowe
30dc07b621 Code tidying 2015-09-21 21:22:36 -07:00
David Rowe
0f85c28098 Fix HMD 3rd person view 2015-09-21 21:08:13 -07:00
samcake
910038cf82 Merging 2015-09-21 17:47:23 -07:00
samcake
a485d3d6de Fixing the rendering of ProceduralSkybox 2015-09-21 15:21:48 -07:00
David Rowe
46524632fe Fix eyeball directions in fullscreen HMD view 2015-09-21 14:18:33 -07:00
David Rowe
7ffde27224 Fix HMD fullscreen mirror view 2015-09-21 14:04:32 -07:00
samcake
d3b1bcb86d Redistributing the files to create the model-networking lib and separate that from the redner-utils 2015-09-21 13:21:35 -07:00
Brad Hefta-Gaub
416acb1d4a remove call to _entities.render() in displaySide() 2015-09-18 12:03:58 -07:00
Brad Hefta-Gaub
0ba1e8c945 remove renderingInWorldInterface signals 2015-09-18 09:49:57 -07:00
Brad Hefta-Gaub
7840f122dc add reload all support for entity scripts 2015-09-16 16:46:46 -07:00
Atlante45
9678e70444 Asset caching 2015-09-16 15:17:15 +02:00
Atlante45
eabee9857a Enum coding standard 2015-09-16 15:17:14 +02:00
Thijs Wenker
9992f4b5c5 Made stopping scripts by hash (path/url) more tolerable and fixed stopping script functionality in ScriptDiscoveryService: 
made stopScript(string) to stop script by url or path and stopScriptName(string) to stop by filename
 2015-09-16 01:16:58 +02:00
Howard Stearns
848bb4fccb Merge pull request #5813 from hyperlogic/tony/anim-hand-state-machines 
Added point and grab support to the AnimGraph
 2015-09-15 15:47:19 -07:00
Brad Hefta-Gaub
54a45f3173 Merge branch 'master' of https://github.com/highfidelity/hifi into scriptEngineCleanup 
Conflicts:
	libraries/entities-renderer/src/EntityTreeRenderer.cpp
	libraries/script-engine/src/ScriptEngine.cpp
	libraries/script-engine/src/ScriptEngine.h
 2015-09-14 21:13:08 -07:00
Brad Hefta-Gaub
94b273a029 more work on script engine 2015-09-14 20:59:10 -07:00
Brad Hefta-Gaub
a3c0288eae more work on proper threading of ScriptEngine 2015-09-14 20:26:04 -07:00
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