Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 03:13:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
3393 commits 71 branches 56 tags 1.2 GiB
Commit graph

3393 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
ceb15d407d removed assert 2013-06-03 22:08:19 -07:00
ZappoMan
eef0636655 some cleanup 2013-06-03 21:53:06 -07:00
ZappoMan
510dfc7353 Merge branch 'master' of https://github.com/worklist/hifi into avatardata_optimization 2013-06-03 21:43:38 -07:00
birarda
c7921c4be9 Merge pull request #479 from Ventrella/master 
preparing avatar balls for extended touch capabilities
 2013-06-03 17:57:48 -07:00
Jeffrey Ventrella
cee2244364 fixed formatting things 2013-06-03 17:55:48 -07:00
Jeffrey Ventrella
da09dd3259 test 2013-06-03 17:16:52 -07:00
Jeffrey Ventrella
3ff11d0eb8 test 2013-06-03 16:42:27 -07:00
Jeffrey Ventrella
b73eb66492 temp test 2013-06-03 16:31:39 -07:00
Jeffrey Ventrella
26bbb9917b more work on avatar touch 2013-06-03 16:23:55 -07:00
Jeffrey Ventrella
e96503de0d Merge remote-tracking branch 'upstream/master' 2013-06-03 12:26:51 -07:00
Jeffrey Ventrella
6479a41206 more ball prep 2013-06-03 12:26:20 -07:00
birarda
d1f491d3ce Merge pull request #480 from birarda/master 
simple fix for AgentList getInstance crash
 2013-06-03 12:13:45 -07:00
Stephen Birarda
0fedf354e0 don't attempt to send microphone audio if AgentList is NULL 2013-06-03 12:10:18 -07:00
Jeffrey Ventrella
00dce6b59e fix 2013-06-03 12:01:01 -07:00
Jeffrey Ventrella
8d031b5c2d preparation for extending the avatar ball array to accommodate more touch capabilities 2013-06-03 11:53:00 -07:00
Jeffrey Ventrella
cf67f28b57 merge 2013-06-03 08:10:41 -07:00
Jeffrey Ventrella
6a14ae1eb9 Merge remote-tracking branch 'upstream/master' 2013-06-03 08:10:19 -07:00
Jeffrey Ventrella
9e046b74e6 working on avatar touch 2013-06-03 08:09:27 -07:00
Philip Rosedale
f840103ef2 Merge pull request #477 from Geenz/19351 
#19351  Atmosphere shaders should be handled per-pixel instead of per-vertex.
 2013-06-02 20:01:02 -07:00
Geenz
de76851207 Remove unnecessary normalize. 2013-05-31 20:35:26 -04:00
Jeffrey Ventrella
1786c9f9e1 Merge pull request #475 from Ventrella/master 
this pull request is mostly about the skeleton code
 2013-05-31 17:35:10 -07:00
Jeffrey Ventrella
de49d7fc6c more fixes 2013-05-31 17:32:30 -07:00
Geenz
d98b28d4ab So apparently, this was a scale problem the entire time. 2013-05-31 20:30:42 -04:00
Jeffrey Ventrella
d92471860d cleanup 2013-05-31 16:58:58 -07:00
Jeffrey Ventrella
4f49f1769e separated springy balls from skeleton 2013-05-31 16:54:56 -07:00
Jeffrey Ventrella
1061b3eb4d cleanup 2013-05-31 15:05:05 -07:00
Jeffrey Ventrella
303643e921 cleanup 2013-05-31 15:01:08 -07:00
Jeffrey Ventrella
e33c11bb48 Merge remote-tracking branch 'upstream/master' 2013-05-31 14:52:46 -07:00
Jeffrey Ventrella
f1fc3fe704 merge 2013-05-31 14:52:24 -07:00
Andrzej Kapolka
8f377349ef Merge pull request #474 from PhilipRosedale/master 
Smooth gravity fields when flying
 2013-05-31 14:52:00 -07:00
Jeffrey Ventrella
3ce051bff7 merge 2013-05-31 14:11:46 -07:00
Philip Rosedale
2a9a3139b2 Added smooth gravity field so we can fly to planets and land on them, static friction to stop drifting, thrust tweaks. 2013-05-31 14:02:20 -07:00
Jeffrey Ventrella
fdfc639c23 merge 2013-05-31 13:52:22 -07:00
Jeffrey Ventrella
108ce62d1a committing latest skeleton-separation changes (more to come as Andrzej and I work on it more) 2013-05-31 11:51:03 -07:00
Andrzej Kapolka
f5e7d6e3fe Merge pull request #473 from ey6es/master 
Fix for compile error that Clement encountered.
 2013-05-31 10:44:40 -07:00
Andrzej Kapolka
98759c3ba1 Include <unistd.h> to address a build error experienced by Clement. 2013-05-31 10:27:25 -07:00
Andrzej Kapolka
bd56cde802 Merge pull request #472 from ey6es/master 
Fix for segmentation fault in readSettingsFile.
 2013-05-30 17:13:35 -07:00
Andrzej Kapolka
224e5d666d Fix for segmentation fault when the settings file doesn't exist. 2013-05-30 17:12:18 -07:00
Andrzej Kapolka
430b571c06 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-30 16:51:31 -07:00
Andrzej Kapolka
cb1e1cc3dd Not going down that path. 2013-05-30 16:51:08 -07:00
ZappoMan
bc5af6e399 Merge pull request #438 from Geenz/19308 
#19308 - Store menu settings in the avatar data file
 2013-05-30 16:51:02 -07:00
Geenz
ed904b58eb Fixed spacing issues per the coding standard. 2013-05-30 19:50:01 -04:00
Geenz
fefa74135c Moved to function overloads instead of unique function names. 2013-05-30 19:47:25 -04:00
ZappoMan
4583f38352 Merge pull request #471 from PhilipRosedale/master 
Detect and stop moving on transmitter signal lost
 2013-05-30 16:46:58 -07:00
Andrzej Kapolka
ffb3cf53aa Added "Gyro Eye Offset" menu option to drive the eye offset from the gyros. 2013-05-30 16:34:59 -07:00
Andrzej Kapolka
6f552b4a00 Playing around with using the gyro acceleration to drive the eye offset. 2013-05-30 16:26:15 -07:00
Philip Rosedale
38e611eb7f Merge branch 'master' of https://github.com/worklist/hifi 2013-05-30 16:19:11 -07:00
Philip Rosedale
f009177aa7 Added check for lost transmitter 2013-05-30 16:19:07 -07:00
Andrzej Kapolka
97343edfca Merge pull request #470 from ey6es/master 
Removed Orientation class, removed duplicate code in avatar-mixer.
 2013-05-30 15:53:20 -07:00
Andrzej Kapolka
86ae9dbe7c Merged. 2013-05-30 15:51:31 -07:00