birarda
31a11e8221
Merge pull request #374 from birarda/master
...
include QtGui dir with isystem flag to get rid of compiler warning in Xcode
2013-05-21 15:46:44 -07:00
Jeffrey Ventrella
af0d7b3c72
Merge pull request #375 from Ventrella/master
...
test lookat transmit
2013-05-21 15:45:34 -07:00
Jeffrey Ventrella
b881507f51
fixed mouth and added a test for transmitting look at
2013-05-21 15:43:40 -07:00
Stephen Birarda
910683c047
remove an extra space
2013-05-21 15:43:29 -07:00
Stephen Birarda
d2c2150b8f
include QtGui dir with isystem flag to remove warning
2013-05-21 15:39:57 -07:00
Philip Rosedale
03675cab9f
Merge pull request #373 from Ventrella/master
...
reversed head gyros
2013-05-21 15:31:51 -07:00
Jeffrey Ventrella
16a1dd103d
Merge remote-tracking branch 'upstream/master'
2013-05-21 15:27:37 -07:00
Jeffrey Ventrella
2781a354a8
reversed gyro for head (didn't know the headset was on backwards :)
2013-05-21 15:27:03 -07:00
ZappoMan
4f0aca4b0c
Merge pull request #372 from birarda/master
...
refactor FindGLM to not check twice, revert the previous audio change
2013-05-21 15:12:43 -07:00
Jeffrey Ventrella
e09e01b81e
Merge remote-tracking branch 'upstream/master'
2013-05-21 15:09:23 -07:00
Jeffrey Ventrella
6840ce0bbe
thingy
2013-05-21 15:09:05 -07:00
birarda
ff71161bd6
Merge pull request #371 from PhilipRosedale/master
...
Missing Transmitter files committed
2013-05-21 15:05:00 -07:00
Philip Rosedale
dc8dea727a
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-21 15:04:24 -07:00
Philip Rosedale
330c59b36b
Fixed conflicts
2013-05-21 15:04:12 -07:00
birarda
b4fd0c129a
Merge pull request #369 from Ventrella/master
...
cleaned up pitch/yaw/roll confusion in Head
2013-05-21 15:04:08 -07:00
Jeffrey Ventrella
1f82d339d0
Merge remote-tracking branch 'upstream/master'
2013-05-21 15:03:06 -07:00
Jeffrey Ventrella
c11851b75d
cleaned up formatting stuff
2013-05-21 15:02:44 -07:00
Stephen Birarda
a4bf95f93b
don't go looking for GLM twice, check the cache
2013-05-21 15:01:41 -07:00
Stephen Birarda
95cef67e33
Revert "remove unused variable in Audio"
...
This reverts commit bbdd601855
2013-05-21 15:01:08 -07:00
Philip Rosedale
f47b5a196a
Added missing transmitter files
2013-05-21 15:00:22 -07:00
birarda
ca9738a101
Merge pull request #370 from birarda/master
...
remove unused varible in Audio
2013-05-21 14:52:45 -07:00
Stephen Birarda
bbdd601855
remove unused variable in Audio
2013-05-21 14:52:05 -07:00
Jeffrey Ventrella
ef95b13723
Merge remote-tracking branch 'upstream/master'
2013-05-21 14:21:14 -07:00
Jeffrey Ventrella
d21b48ad6e
cleaned up a lot of pitch/yaw/roll confusion in Head and made new versions of eyes, eyebrows and mouth (Head still needs work)
2013-05-21 14:20:44 -07:00
birarda
8afeeaf222
Merge pull request #368 from ZappoMan/master
...
Stub implementation of Transmitter class to fix busted build
2013-05-21 14:04:29 -07:00
ZappoMan
fdba349d9b
temporary hack fix to busted build
2013-05-21 13:57:54 -07:00
ZappoMan
6f0035b297
Merge pull request #365 from PhilipRosedale/master
...
Made Transmitter it's own class, removed V1 Transmitter code (Glass and Android)
2013-05-21 13:45:15 -07:00
ZappoMan
13475f791f
Merge pull request #366 from ey6es/master
...
Added basic capsule/sphere collisions between avatar and voxels; added casted getter for Application instance; switched to glDrawRangeElements for voxel rendering.
2013-05-21 13:43:24 -07:00
Andrzej Kapolka
0377ca1adb
Compute nodes' enclosing radius in the same place.
2013-05-21 13:32:41 -07:00
Andrzej Kapolka
1118c06f5d
Only do collision checking for own avatar.
2013-05-21 13:01:01 -07:00
Andrzej Kapolka
597769a861
Added basic capsule/sphere collisions between avatar and voxels.
2013-05-21 12:58:02 -07:00
Philip Rosedale
71a875042a
Updated transmitter class to handle correct orientation of gyros
2013-05-21 11:57:14 -07:00
Philip Rosedale
340882a330
Changed 1P view to turn off head rendering when close/inside head rather than showing disembodied neck
2013-05-21 10:22:05 -07:00
Andrzej Kapolka
b15162abfd
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-21 09:49:12 -07:00
Philip Rosedale
3539ec858e
Added hand movement and body motion to transmitter. Feel much better - like dancing.
2013-05-20 23:22:28 -07:00
Philip Rosedale
0d7644d1fc
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-20 19:01:01 -07:00
Philip Rosedale
7728a54d26
Converted Transmitter to separate class, removed V1 (Google Glass, Android) support for V2 (iOS) transmitter
2013-05-20 19:00:49 -07:00
Jeffrey Ventrella
930f301296
Merge remote-tracking branch 'upstream/master'
2013-05-20 17:54:17 -07:00
Jeffrey Ventrella
9d3e76efe2
operating on head. patient under anesthesia
2013-05-20 17:53:55 -07:00
birarda
57af90ec13
Merge pull request #364 from birarda/master
...
lazily allocation of HeadData in getBroadcastData
2013-05-20 17:38:48 -07:00
Jeffrey Ventrella
6e994ed425
Merge remote-tracking branch 'upstream/master'
2013-05-20 17:33:27 -07:00
Stephen Birarda
d2b2d36fcf
lazy allocation of HeadData in getBroadcastData
2013-05-20 17:31:33 -07:00
Jeffrey Ventrella
72f8f447a1
starting a rework of Head renderer
2013-05-20 17:30:13 -07:00
Philip Rosedale
6392bb0045
Merge pull request #363 from birarda/head-changes
...
move lean sideways and lean forwards to the head data class
2013-05-20 17:25:05 -07:00
Andrzej Kapolka
1be859ede9
Use glDrawRangeElements, which indicates the range of used indices. It may or
...
may not make a difference in performance, but it won't hurt.
2013-05-20 17:14:41 -07:00
Stephen Birarda
564244ddd3
move _leanSideways and _leanForwards to HeadData
2013-05-20 17:13:40 -07:00
ZappoMan
d1554e0150
Merge pull request #361 from birarda/head-changes
...
add a HeadData class to reduce redundancy for head member variables
2013-05-20 17:08:09 -07:00
Andrzej Kapolka
fc238c0382
Merge pull request #362 from ey6es/master
...
Fix for matrix stack bug that was breaking Oculus rendering (if nothing else).
2013-05-20 16:54:49 -07:00
Andrzej Kapolka
5b0640bbbf
Whoops--fixed a matrix stack issue that was breaking Oculus rendering.
2013-05-20 16:52:40 -07:00
Stephen Birarda
28bab24e70
type squishes in AvatarData
2013-05-20 16:17:49 -07:00
