Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-30 09:27:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
87912 commits 29 branches 28 tags 1.2 GiB
Commit graph

87912 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philip Rosedale
47d9035def Merge branch 'master' of https://github.com/worklist/hifi 2013-05-21 20:34:55 -07:00
ZappoMan
ce6b78b772 new animation 2013-05-21 20:25:07 -07:00
ZappoMan
9d92b8041c Merge pull request #378 from ZappoMan/master 
Fix compiler warning
 2013-05-21 18:04:29 -07:00
ZappoMan
09711d86ed fix compiler warning 2013-05-21 18:03:14 -07:00
Jeffrey Ventrella
9f82b9fb43 test 2013-05-21 17:51:41 -07:00
Jeffrey Ventrella
e219cd8223 Merge remote-tracking branch 'upstream/master' 2013-05-21 17:44:45 -07:00
Jeffrey Ventrella
006fc3268e thingy 2013-05-21 17:44:24 -07:00
birarda
63fcb2eeef Merge pull request #367 from ZappoMan/voxel_animation 
Fixes "Delete" voxel behavior
 2013-05-21 17:43:36 -07:00
ZappoMan
c316899f27 CR feedback 2013-05-21 17:42:55 -07:00
Jeffrey Ventrella
6e5f036eeb test 2013-05-21 17:41:50 -07:00
Jeffrey Ventrella
25dfc7bc4b Merge remote-tracking branch 'upstream/master' 2013-05-21 17:38:36 -07:00
Jeffrey Ventrella
c32d621d5f improving lookat behavior 2013-05-21 17:38:17 -07:00
ZappoMan
166ad4f73d CR feedback 2013-05-21 17:37:21 -07:00
ZappoMan
273223cc5b Merge pull request #377 from birarda/master 
remove the old menu code and the glew implementation file
 2013-05-21 17:13:31 -07:00
Stephen Birarda
3ac20849d6 remove old menu code and glew implemenation file 2013-05-21 16:21:33 -07:00
Jeffrey Ventrella
7bb94ae8de Merge remote-tracking branch 'upstream/master' 2013-05-21 16:14:01 -07:00
Jeffrey Ventrella
0b7e0ef43d test 2013-05-21 16:13:41 -07:00
birarda
d12d20e193 Merge pull request #376 from birarda/master 
stop the animation server from being killed over and over
 2013-05-21 15:54:30 -07:00
Stephen Birarda
944e7a32e9 trivial fix for the continously dying animation server 2013-05-21 15:53:58 -07:00
Philip Rosedale
8e73abe6e6 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-21 15:47:47 -07:00
Philip Rosedale
f7e75ee57c Fixed conflict 2013-05-21 15:47:15 -07:00
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
Philip Rosedale
6ff4b88ea4 starting tweaks to head gyro motion 2013-05-21 15:46:11 -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
tosh
0ab2d4c741 Merge branch 'master' of git://github.com/worklist/hifi 2013-05-21 23:13:21 +02:00
tosh
0261f50298 merge up 2013-05-21 23:13:03 +02:00
ZappoMan
fb4424e975 don't rebroadcase PACKET_HEADER_ERASE_VOXEL messages 2013-05-21 14:07:03 -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