Andrzej Kapolka
|
c8c3cf3664
|
Remove unused propagate option for applyRotationDelta.
|
2014-04-23 12:29:01 -07:00 |
|
Andrzej Kapolka
|
d38d3db224
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-04-23 12:25:43 -07:00 |
|
Andrzej Kapolka
|
141250d51c
|
Don't constrain elbow when rotating forearm with wrist.
|
2014-04-23 12:22:24 -07:00 |
|
AndrewMeadows
|
620c3119b4
|
Merge pull request #2714 from Atlante45/removed_gettimeofday
Removed gettimeofday
|
2014-04-23 12:22:18 -07:00 |
|
Andrzej Kapolka
|
0386dec2a6
|
Provide option to align wrists with forearms.
|
2014-04-23 12:09:54 -07:00 |
|
Andrzej Kapolka
|
09bb51261a
|
Got that backwards.
|
2014-04-23 11:55:16 -07:00 |
|
Andrzej Kapolka
|
523498ee5b
|
Revert to using weight that doesn't depend on number of free joints.
|
2014-04-23 11:52:22 -07:00 |
|
Andrzej Kapolka
|
511fc8367f
|
More work on IK.
|
2014-04-23 11:34:34 -07:00 |
|
Atlante45
|
f68d2d16a8
|
Inserted a char by mistake
|
2014-04-23 11:05:16 -07:00 |
|
Atlante45
|
ceb5208102
|
CR
|
2014-04-23 11:00:44 -07:00 |
|
Andrzej Kapolka
|
f7bc1ae62c
|
Working on integrating rotation into IK.
|
2014-04-23 10:47:24 -07:00 |
|
Atlante45
|
ae566c55f6
|
Merge branch 'master' of https://github.com/highfidelity/hifi into removed_gettimeofday
|
2014-04-23 10:38:29 -07:00 |
|
Andrzej Kapolka
|
c471a55f1f
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-04-23 09:40:51 -07:00 |
|
Philip Rosedale
|
5dc909ea00
|
Merge pull request #2716 from thoys/example-scripts_utf8_char_removal
Removed UTF-8 new-line characters, QT script errors on those lines in Windows
|
2014-04-23 07:01:33 -07:00 |
|
Thijs Wenker
|
ebc6f4e78e
|
Removed UTF-8 new line characters, QT script errors on those lines in Windows.
|
2014-04-23 14:40:06 +02:00 |
|
Philip Rosedale
|
ee929f2551
|
Merge pull request #2712 from matsukaze/master
Job #19574. Add new audio oscilloscope.
|
2014-04-22 20:22:57 -07:00 |
|
matsukaze
|
d6e4f217f5
|
Expanded variable names.
|
2014-04-22 21:57:41 -04:00 |
|
matsukaze
|
1ff3b83644
|
Changed const color data and method signatures.
Changed constant color data and method signatures from unsigned int to
array of float. Changed glColor4f to glColor4fv.
|
2014-04-22 19:42:51 -04:00 |
|
matsukaze
|
015cbce322
|
Changed constant names for improved readability.
|
2014-04-22 18:57:22 -04:00 |
|
Atlante45
|
fea0a262a6
|
Put back missing windows header
|
2014-04-22 12:35:50 -07:00 |
|
Clément Brisset
|
f64988f73d
|
Merge pull request #2711 from ZappoMan/quiet_logs
quite the error messages about failed locks
|
2014-04-22 11:51:20 -07:00 |
|
Clément Brisset
|
413518bfe7
|
Merge pull request #2713 from ZappoMan/fixheaders
fix headers
|
2014-04-22 11:50:32 -07:00 |
|
Atlante45
|
3eeb3a539d
|
Fixed lack of resolution in usecTimestampNow()
|
2014-04-22 11:48:43 -07:00 |
|
ZappoMan
|
ae443a3136
|
fix headers
|
2014-04-22 11:27:50 -07:00 |
|
AndrewMeadows
|
94fabf7875
|
Merge pull request #2709 from ZappoMan/shared_and_weak_pointers
Voxel/Particle Server Performance Improvements
|
2014-04-22 10:28:39 -07:00 |
|
Atlante45
|
ddf14b0842
|
Merge branch 'master' of https://github.com/highfidelity/hifi into removed_gettimeofday
|
2014-04-22 10:22:30 -07:00 |
|
Brad Hefta-Gaub
|
1dc4a61013
|
Merge pull request #2702 from thoys/19561
Code Review for Job #19561
|
2014-04-22 10:00:34 -07:00 |
|
matsukaze
|
99cb1da5ec
|
Reverting inadvertently committed local changes.
|
2014-04-22 07:40:31 -04:00 |
|
Thijs Wenker
|
59cc930556
|
Merge branch 'master' of https://github.com/highfidelity/hifi into 19561
|
2014-04-22 13:12:38 +02:00 |
|
Thijs Wenker
|
6c89521f1d
|
Style
|
2014-04-22 13:12:21 +02:00 |
|
matsukaze
|
6e575bc8af
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-04-22 06:54:53 -04:00 |
|
matsukaze
|
ff7a1bd60f
|
Job #19574. Add audio oscilloscope.'
|
2014-04-22 06:53:59 -04:00 |
|
ZappoMan
|
1846036659
|
quite the error messages about faild locks
|
2014-04-21 20:58:43 -07:00 |
|
AndrewMeadows
|
95ccea7df7
|
Merge pull request #2708 from Atlante45/replace_printf
Replace printf
|
2014-04-21 18:14:36 -07:00 |
|
ZappoMan
|
60b8ab0de5
|
CR feedback
|
2014-04-21 17:45:38 -07:00 |
|
ZappoMan
|
91d8e11393
|
return the bytes sent in writeDatagram() and writeUnverifiedDatagram()
|
2014-04-21 17:34:01 -07:00 |
|
Atlante45
|
fd20686f0f
|
Removed Systime.h includes
|
2014-04-21 17:23:06 -07:00 |
|
Atlante45
|
be2db49e08
|
Last touch to removing gettimeofday
|
2014-04-21 16:44:21 -07:00 |
|
ZappoMan
|
a64d3ffc32
|
more cleanup
|
2014-04-21 16:38:45 -07:00 |
|
ZappoMan
|
7d18dbdfb8
|
more cleanup
|
2014-04-21 16:35:42 -07:00 |
|
Atlante45
|
cfc778d10c
|
Fix regexp fail
|
2014-04-21 16:32:17 -07:00 |
|
ZappoMan
|
e55c488964
|
clean up some old debugging
|
2014-04-21 16:17:59 -07:00 |
|
Atlante45
|
681aab5bf0
|
Remove printf and replace them by qDebug()
|
2014-04-21 16:17:45 -07:00 |
|
ZappoMan
|
003e3ae507
|
properly unhook delete notifications
|
2014-04-21 16:01:37 -07:00 |
|
ZappoMan
|
f3aa9d3b8f
|
unhook node bag from element notifications on shutdown to speed up cleanup
|
2014-04-21 15:45:12 -07:00 |
|
ZappoMan
|
779b5a6827
|
debug
|
2014-04-21 15:32:44 -07:00 |
|
Atlante45
|
0479aaba46
|
Some gettimeofday removal fixes
|
2014-04-21 15:26:43 -07:00 |
|
Atlante45
|
f7f30e118c
|
More gettimeofday cleanup
|
2014-04-21 15:17:11 -07:00 |
|
ZappoMan
|
a473fe3aee
|
fix header
|
2014-04-21 15:14:14 -07:00 |
|
ZappoMan
|
7a8a8e2fac
|
delete tree on server shutdown
|
2014-04-21 15:14:06 -07:00 |
|