ZappoMan
|
2bcad6ab2b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
Conflicts:
assignment-client/src/Agent.cpp
examples/editModels.js
|
2014-08-28 21:19:56 -07:00 |
|
ZappoMan
|
de968ba4f6
|
fix the issue with moving entities not being simulated makes motion smoother
|
2014-08-28 16:44:52 -07:00 |
|
ZappoMan
|
c83cb6386a
|
updated to do list
|
2014-08-28 14:32:13 -07:00 |
|
ZappoMan
|
eab9f391ee
|
fix getProperties() for age
|
2014-08-28 14:02:05 -07:00 |
|
ZappoMan
|
76c77d6994
|
first cut at properly working lifetime
|
2014-08-28 13:46:54 -07:00 |
|
Clément Brisset
|
1b5a6cf671
|
Merge pull request #3325 from chansensturm/audio-filter
left/right channels of head shadow filter now have independent gain calculations
|
2014-08-28 11:51:09 -07:00 |
|
Craig Hansen-Sturm
|
3e3090f1ea
|
coding standard
|
2014-08-28 11:12:17 -07:00 |
|
Atlante45
|
9df68dc2f1
|
CR
|
2014-08-28 10:58:07 -07:00 |
|
Atlante45
|
691ace7cc6
|
Looping option
|
2014-08-27 19:05:39 -07:00 |
|
Craig Hansen-Sturm
|
0881959750
|
left/right channels of head shadow filter now have independent gain + implemented all-pass filter
|
2014-08-27 17:30:11 -07:00 |
|
ZappoMan
|
2f90df04ee
|
correct cleanup of Models/geometry and all EntityItems for various cases
|
2014-08-27 15:45:45 -07:00 |
|
ZappoMan
|
ed6363ca02
|
fixed bug in processing of entity erase messages
|
2014-08-27 14:21:06 -07:00 |
|
ZappoMan
|
5c2b674a0d
|
verify delete behavior actually frees memory associated with EntityItems
|
2014-08-27 12:07:11 -07:00 |
|
ZappoMan
|
30e00bbd69
|
final pass on entities import/export/overlays working as well as production
|
2014-08-27 11:34:50 -07:00 |
|
Brad Hefta-Gaub
|
e8c3125985
|
Merge pull request #3323 from chansensturm/wangyix-qt_stats_for_audiomixer
Merge of Yixin's PR #3281 to head
|
2014-08-27 11:14:52 -07:00 |
|
Craig Hansen-Sturm
|
e941e58626
|
merge HEAD with PR-3281
|
2014-08-26 18:25:40 -07:00 |
|
Atlante45
|
465b076998
|
Removed debug + ignore frame 0
|
2014-08-26 18:19:26 -07:00 |
|
Atlante45
|
056cd0a4d1
|
extra line
|
2014-08-26 18:06:10 -07:00 |
|
Atlante45
|
41461cd322
|
Added option to playback from current location
|
2014-08-26 17:23:50 -07:00 |
|
ZappoMan
|
fb25314248
|
mark one more item off to do
|
2014-08-26 17:13:38 -07:00 |
|
ZappoMan
|
b14158385c
|
first cut at getting pastEntities() working
|
2014-08-26 16:47:32 -07:00 |
|
ZappoMan
|
4895ee32f7
|
test and fix issues with exportEntities()
|
2014-08-26 15:59:49 -07:00 |
|
Atlante45
|
dda02b5dcf
|
Fake faceshift connection while playing back
|
2014-08-26 15:54:16 -07:00 |
|
Atlante45
|
3826ed0d69
|
Added setFinalPitch/Yaw/Roll to HeadData
|
2014-08-26 15:36:08 -07:00 |
|
Atlante45
|
9e686b4096
|
Moved lean and head rotation inside Player class
|
2014-08-26 14:36:46 -07:00 |
|
Atlante45
|
90d8626615
|
Fix for audio on ACs
|
2014-08-26 14:35:35 -07:00 |
|
Atlante45
|
b92ae53753
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-08-26 14:34:39 -07:00 |
|
ZappoMan
|
53db93c7d7
|
updated to do list
|
2014-08-26 13:25:19 -07:00 |
|
ZappoMan
|
8d947662c8
|
fix conversion from old format to new format of entity IDs
|
2014-08-26 13:21:49 -07:00 |
|
Brad Hefta-Gaub
|
9b35dc784d
|
Merge pull request #3320 from chansensturm/master
added high-shelf and low-shelf filters, positional audio now uses high-shelf filter
|
2014-08-26 13:13:10 -07:00 |
|
ZappoMan
|
edf7866c08
|
to do edits
|
2014-08-26 12:25:08 -07:00 |
|
ZappoMan
|
3e5af5e815
|
removed some debug
|
2014-08-26 10:45:40 -07:00 |
|
ZappoMan
|
ef8feec91a
|
fix referentials corruption and removed some debugging
|
2014-08-26 10:42:46 -07:00 |
|
ZappoMan
|
74585bc593
|
fix bug in referentials
|
2014-08-26 10:14:28 -07:00 |
|
Atlante45
|
cf14af0766
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-08-25 18:54:41 -07:00 |
|
Craig Hansen-Sturm
|
2abaa387d2
|
Merge remote-tracking branch 'upstream/master'
|
2014-08-25 18:18:01 -07:00 |
|
Craig Hansen-Sturm
|
950862839e
|
added high-shelf and low-shelf filters, positional audio now uses high-shelf filter, significant reformatting/renaming of AudioFilter.h for coding standard
|
2014-08-25 18:17:32 -07:00 |
|
Andrzej Kapolka
|
e29a4e7683
|
Merge pull request #3312 from AndrewMeadows/ragdoll
use dispatchTable for shape-vs-shape collision queries
|
2014-08-25 15:43:48 -07:00 |
|
Andrew Meadows
|
7a5c4fdb16
|
remove commented out #includes
|
2014-08-25 15:25:46 -07:00 |
|
ZappoMan
|
4e38cb7c68
|
more debugging of referentials
|
2014-08-25 15:12:29 -07:00 |
|
ZappoMan
|
d6873f7b6c
|
added some debugging for referentials
|
2014-08-25 14:48:08 -07:00 |
|
ZappoMan
|
1764839223
|
get basics of referentials working
|
2014-08-25 14:07:01 -07:00 |
|
Craig Hansen-Sturm
|
4f346bfe62
|
addresses more coding-standard spacing issues
|
2014-08-25 13:07:52 -07:00 |
|
ZappoMan
|
314e299ba5
|
get sit points working
|
2014-08-25 13:03:38 -07:00 |
|
Atlante45
|
88c8e5124e
|
Merge branch 'master' of github.com:Atlante45/hifi
|
2014-08-25 12:47:01 -07:00 |
|
ZappoMan
|
1663ff86d7
|
removed dead code
|
2014-08-25 12:45:09 -07:00 |
|
Craig Hansen-Sturm
|
bf6d34b6f3
|
windows/linux build break + addresses zappoman review comments
|
2014-08-25 11:43:49 -07:00 |
|
ZappoMan
|
700b945d71
|
disabled some debugging
|
2014-08-25 11:35:28 -07:00 |
|
ZappoMan
|
d0ceca1935
|
moved EntityTree operator related classes to own files to match coding standard
|
2014-08-25 11:29:11 -07:00 |
|
ZappoMan
|
58759d344f
|
cleanup in prep for PR
|
2014-08-25 10:56:43 -07:00 |
|