Stephen Birarda
|
311f1ac0e3
|
fix for overflow on time of next frame
|
2016-01-28 15:38:33 -08:00 |
|
Stephen Birarda
|
79c6ed9739
|
add some debug for AudioInjector DOS case
|
2016-01-28 12:22:36 -08:00 |
|
Anthony Thibault
|
85843cff39
|
Merge pull request #6955 from AndrewMeadows/stable-judasboots
apply "hips offset" to root of state graph
|
2016-01-28 11:13:11 -08:00 |
|
samcake
|
54b9c1ac0d
|
Merge pull request #6962 from zzmp/feat/task-io
Reduce code duplication for render::Job::Model
|
2016-01-28 09:31:26 -08:00 |
|
Andrew Meadows
|
7b5c221ceb
|
Merge pull request #6956 from hyperlogic/tony/velocity-fix
MyAvatar: copy body velocity + hmd follow velocity onto avatar
|
2016-01-27 14:59:46 -08:00 |
|
Seth Alves
|
8286a037b0
|
Merge pull request #6941 from imgntn/dicelocation
Update dice location in toybox
|
2016-01-27 14:49:21 -08:00 |
|
Andrew Meadows
|
1b45f5cc0c
|
tweaks to neck and spine constraints
|
2016-01-27 14:45:09 -08:00 |
|
Andrew Meadows
|
f67a20ee68
|
apply _hipsOffset in hips local-frame
|
2016-01-27 14:45:08 -08:00 |
|
Andrew Meadows
|
00715f1906
|
apply "hips offset" to root of state graph
(Somemtimes the hips are not the root.
I'm looking at YOU blender!)
|
2016-01-27 14:45:06 -08:00 |
|
Anthony Thibault
|
3cdd88e06c
|
Merge pull request #6951 from ZappoMan/fixAnimationRestart
fix for animations stopping after domain restart
|
2016-01-27 14:31:27 -08:00 |
|
Stephen Birarda
|
f3903022f2
|
Merge pull request #6958 from huffman/injector-timing-fixes
Fix injector looping issues when using audio that isn't a multiple of the sample size
|
2016-01-27 14:29:30 -08:00 |
|
samcake
|
f4e0352f61
|
Merge pull request #6930 from zzmp/feat/bubble-render-settings
Bubble up render settings from CPP to JS/QML
|
2016-01-27 14:20:51 -08:00 |
|
Ryan Huffman
|
2ec201b85e
|
Fix conversion warning
|
2016-01-27 14:13:23 -08:00 |
|
Ryan Huffman
|
7e5eec55da
|
Fix non-looped injected audio possibly looping
|
2016-01-27 13:47:32 -08:00 |
|
Ryan Huffman
|
4de8e7a3c8
|
Add audio resizing in injector
|
2016-01-27 13:47:09 -08:00 |
|
James B. Pollack
|
86b2a67f72
|
Merge pull request #6891 from sethalves/avatar-updates-query-cube
Avatar updates query cube
|
2016-01-27 13:04:03 -08:00 |
|
Howard Stearns
|
f00ec8de5d
|
Merge pull request #6947 from huffman/fix-entity--mkdir
Update entity server to always make resource directory if it does not…
|
2016-01-27 13:03:00 -08:00 |
|
Brad Hefta-Gaub
|
5ea4cb6900
|
Merge pull request #6949 from birarda/installer-sixense
pull missing Sixense DLLs from external project
|
2016-01-27 12:17:59 -08:00 |
|
Stephen Birarda
|
6385309c9d
|
Merge pull request #6939 from huffman/injector-timing-fixes
Injector timing fixes
|
2016-01-27 11:34:26 -08:00 |
|
Anthony J. Thibault
|
c771c925c8
|
MyAvatar: copy body velocity + hmd follow velocity onto avatar
This was inadvertently removed in a previous PR.
https://github.com/highfidelity/hifi/pull/6895
Also, renamed Velocity stat to Speed.
|
2016-01-27 11:20:32 -08:00 |
|
Seth Alves
|
18a1f0884e
|
Merge pull request #6884 from ericrius1/junkyardReset
Junkyard reset script
|
2016-01-27 11:19:02 -08:00 |
|
Ryan Huffman
|
8764eda479
|
Merge branch 'master' of https://github.com/highfidelity/hifi into injector-timing-fixes
|
2016-01-27 11:03:52 -08:00 |
|
Howard Stearns
|
0d257b82fa
|
Merge pull request #6934 from hyperlogic/tony/anim-pre-post-rot-support
Avatar Developer Menu: added animation debug options
|
2016-01-27 10:39:25 -08:00 |
|
Ryan Huffman
|
607f23618d
|
Fix compiler warning for float->int conversion
|
2016-01-27 10:36:44 -08:00 |
|
Ryan Huffman
|
a3b2dd2295
|
Add proper loop handling in injector
|
2016-01-27 10:14:05 -08:00 |
|
Brad Hefta-Gaub
|
dc6662d115
|
Merge pull request #6943 from jherico/attachments
Attachment dialog in overlay
|
2016-01-26 22:51:40 -08:00 |
|
Brad Davis
|
f53aaa1d64
|
Removing old attachment dialog, updating menu code
|
2016-01-26 21:55:42 -08:00 |
|
Brad Davis
|
2956557c5f
|
Adding overlay compatible combo-box
|
2016-01-26 21:55:41 -08:00 |
|
Brad Davis
|
664100b9b1
|
Attachment dialog
|
2016-01-26 21:55:40 -08:00 |
|
Brad Hefta-Gaub
|
881a94cd19
|
Merge pull request #6950 from jherico/qml
Small QML fixes
|
2016-01-26 21:30:46 -08:00 |
|
Zach Pomerantz
|
49c1285837
|
Add suffix Mode to DebugMode enum to avoid collision
|
2016-01-26 19:11:59 -08:00 |
|
Zach Pomerantz
|
e770d7b679
|
Add PhysicsShowOwned back to Menu
|
2016-01-26 18:56:52 -08:00 |
|
Brad Davis
|
0a6be80578
|
Added some disabled modal focus protection code
|
2016-01-26 18:50:55 -08:00 |
|
Brad Hefta-Gaub
|
f178fc789c
|
fix for animations stopping after domain restart
|
2016-01-26 18:44:34 -08:00 |
|
Brad Davis
|
fbee221966
|
Fix tool window breaking when visible while edit.js reloads
|
2016-01-26 18:15:41 -08:00 |
|
Zach Pomerantz
|
4354eae129
|
Fix type, gaussion->gaussian
|
2016-01-26 18:09:18 -08:00 |
|
Zach Pomerantz
|
61f337b490
|
Hold Varying constant over task ctor
|
2016-01-26 17:43:41 -08:00 |
|
Zach Pomerantz
|
5d157b059f
|
Collapse all Job/Task Models to one, including TaskIO
|
2016-01-26 17:40:32 -08:00 |
|
Brad Davis
|
9a8d56da77
|
Center new windows without a defined position
|
2016-01-26 17:25:36 -08:00 |
|
Brad Davis
|
fee920723a
|
Cleaning up test project
|
2016-01-26 17:25:20 -08:00 |
|
Anthony Thibault
|
0fdfb69cae
|
Merge pull request #6938 from AndrewMeadows/reduce-hip-swing
reduce hips swing driven by head orientation when wearing HMD
|
2016-01-26 17:00:31 -08:00 |
|
Brad Davis
|
940b095013
|
Removing menu logspam
|
2016-01-26 16:59:37 -08:00 |
|
Brad Davis
|
5f38c5265c
|
Fixing potential crash in dialog popups
|
2016-01-26 16:59:19 -08:00 |
|
Brad Davis
|
cea57a111b
|
Desktop cleanup
|
2016-01-26 16:56:33 -08:00 |
|
Brad Davis
|
8dc066fc00
|
Fix the recursive launching of load script from URL
|
2016-01-26 16:49:23 -08:00 |
|
Ryan Huffman
|
2717c027e8
|
Merge pull request #6932 from birarda/console
various installer fixes and improvements
|
2016-01-26 16:39:31 -08:00 |
|
Stephen Birarda
|
8ba0e3bc6e
|
give dev shortcuts a specific name too
|
2016-01-26 16:21:18 -08:00 |
|
Zach Pomerantz
|
5009e8702e
|
Cleanup new render settings
|
2016-01-26 15:58:50 -08:00 |
|
Stephen Birarda
|
e6a8fd192c
|
use the VS2011 DLLs bundled with sixense for installer
|
2016-01-26 15:54:08 -08:00 |
|
James B. Pollack
|
d8dbb717d5
|
Update junkyardResetEntityScript.js
|
2016-01-26 14:06:17 -08:00 |
|