James B. Pollack
|
78d06ed32a
|
Merge pull request #6952 from howard-stearns/avatar-preferences-chooser
avatar preferences chooser modal web
|
2016-01-28 16:01:53 -08:00 |
|
Zach Pomerantz
|
02d530ccc8
|
Merge pull request #6971 from samcake/hdr
Fixing the default value for the TOneMapping curve
|
2016-01-28 14:09:41 -08:00 |
|
Ryan Huffman
|
15db8040d8
|
Merge pull request #6961 from birarda/resampling-error
fix a couple of resampling errors in Sound downSample
|
2016-01-28 13:22:00 -08:00 |
|
Ryan Huffman
|
d39ab952f7
|
Merge pull request #6973 from birarda/injector-dos
add some debug for AudioInjector DOS case
|
2016-01-28 13:14:54 -08:00 |
|
samcake
|
5863e340af
|
Cleaner...
|
2016-01-28 12:46:18 -08:00 |
|
samcake
|
ef451d40df
|
Cleaner...
|
2016-01-28 12:39:52 -08:00 |
|
Brad Hefta-Gaub
|
49bbf42995
|
Merge pull request #6960 from sethalves/fix-adjust-edit-packet-for-clock-skew
don't adjust a time of '0 usecs since epoch' with clock skew in edit packets
|
2016-01-28 12:31:27 -08:00 |
|
Brad Hefta-Gaub
|
da709f3f56
|
Merge pull request #6968 from imgntn/nodebugheap
Document the _NO_DEBUG_HEAP trick
|
2016-01-28 12:29:25 -08:00 |
|
Howard Stearns
|
33226796ff
|
Merge pull request #6964 from ericrius1/editHref
Validate href entity property (hifi:// only)
|
2016-01-28 12:29:18 -08:00 |
|
Stephen Birarda
|
79c6ed9739
|
add some debug for AudioInjector DOS case
|
2016-01-28 12:22:36 -08:00 |
|
samcake
|
62d5a45829
|
Cleaner init
|
2016-01-28 12:20:09 -08:00 |
|
samcake
|
bf3a09cd00
|
Fixing the default value for the TOneMapping curve and cleaning the code into the ToneMappingEffect file
|
2016-01-28 12:14:20 -08:00 |
|
Andrew Meadows
|
3e35a5fc2d
|
Merge pull request #6937 from ctrlaltdavid/20790
Make entity properties be undefined after entity is unloaded
|
2016-01-28 11:59:01 -08:00 |
|
James B. Pollack
|
9cb768bcbd
|
document no debug heap trick
|
2016-01-28 11:42:51 -08:00 |
|
Howard Stearns
|
bff3362f94
|
Merge pull request #6953 from jherico/qml
More small fixes
|
2016-01-28 11:22:40 -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 |
|
Brad Davis
|
04e6a5360a
|
Renaming preference dialog variable
|
2016-01-28 10:29:21 -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 |
|
Brad Davis
|
18d6a09dc9
|
Better preferences dialog initial state
|
2016-01-28 09:20:31 -08:00 |
|
Brad Davis
|
d9651c6d4b
|
Allow user browser to work with marketplace
|
2016-01-28 09:20:29 -08:00 |
|
Stephen Birarda
|
0a386cdde8
|
remove trimFrames call from Sound
|
2016-01-27 16:10:18 -08:00 |
|
ericrius1
|
cd5e81de36
|
Validating href for edit.js
|
2016-01-27 16:02:02 -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 |
|
Stephen Birarda
|
dc716461e3
|
fix for a couple of resampling edge cases
|
2016-01-27 14:33:03 -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 |
|
Seth Alves
|
f2ea73d646
|
don't adjust a time of '0 usecs since epoch' with clock skew in edit packets
|
2016-01-27 14:12:03 -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 |
|