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

4516 commits

This branch
This branch
All branches
Author SHA1 Message Date
atlante45
34cbe317fa Merge branch 'master' of https://github.com/worklist/hifi into the_midget_are_coming 
Conflicts:
	interface/src/Avatar.cpp
	interface/src/Webcam.cpp
 2013-07-12 17:57:20 -07:00
atlante45
280afed7f0 added scale in avatar packets eand slots to change it from the menu 2013-07-12 17:51:47 -07:00
Stephen Birarda
0a3edb2f5b Merge pull request #665 from PhilipRosedale/master 
Tweaked skeleton smoothing and arms in view in 1P
 2013-07-12 17:09:46 -07:00
Philip Rosedale
17fff564d0 Merge branch 'master' of https://github.com/worklist/hifi 2013-07-12 17:01:09 -07:00
Philip Rosedale
832e81b45f Less skeleton averaging, can see first person arms 2013-07-12 17:00:47 -07:00
ZappoMan
f9e142ef52 Merge pull request #664 from birarda/master 
print packet version mismatch to the log
 2013-07-12 16:15:31 -07:00
Stephen Birarda
0235993366 reset default packet version to 0 2013-07-12 16:00:44 -07:00
Stephen Birarda
3147ac3ac4 print packet version mismatch to Log 2013-07-12 15:54:12 -07:00
atlante45
78645964c9 Merge branch 'master' of https://github.com/worklist/hifi into the_midget_are_coming 2013-07-12 14:54:05 -07:00
atlante45
35c00c739c resizing avatar now handle the camera 2013-07-12 14:53:51 -07:00
Stephen Birarda
ec48c6bf28 Merge pull request #663 from ZappoMan/occlusion_culling 
tweaks to low res moving, made monochrome off by default
 2013-07-12 14:27:47 -07:00
ZappoMan
85b1ce3051 tweaks to low res moving, made monochrome off by default 2013-07-12 14:11:35 -07:00
atlante45
16647e3591 Resolve conflict 2013-07-12 13:27:46 -07:00
Stephen Birarda
5044139374 Merge pull request #662 from birarda/master 
revert linking of STK to interface
 2013-07-12 13:16:30 -07:00
ZappoMan
006929e45b Merge pull request #660 from PhilipRosedale/master 
Add speed brakes for better flying/walking
 2013-07-12 13:15:22 -07:00
ZappoMan
934fa2e158 Merge pull request #645 from Ventrella/particles 
version 1 of particle system
 2013-07-12 13:14:37 -07:00
Stephen Birarda
93b122bc76 Revert "link STK to interface" 
This reverts commit d55387f727.
 2013-07-12 13:12:52 -07:00
Jeffrey Ventrella
c348c5ec35 Merge remote-tracking branch 'upstream/master' into particles 2013-07-12 12:12:25 -07:00
Jeffrey Ventrella
106d7c225a turned on particle system viewing for pull request 2013-07-12 12:11:51 -07:00
Stephen Birarda
1c72362ed1 Merge pull request #661 from birarda/master 
link STK to interface for sound generation
 2013-07-12 11:18:52 -07:00
Stephen Birarda
d55387f727 link STK to interface 2013-07-12 11:18:15 -07:00
Philip Rosedale
e756fdbee6 Add speed brakes for better flying/walking 2013-07-12 08:28:50 -07:00
ZappoMan
a182c01b76 Merge pull request #659 from PhilipRosedale/master 
Improvements to Avatar movement and jittering
 2013-07-11 23:02:37 -07:00
Philip Rosedale
4e9530f946 Body slowly turns to follow touch look 2013-07-11 22:31:31 -07:00
Philip Rosedale
4e89c679b9 Oculus will work with touch look (hopefully) 2013-07-11 21:51:13 -07:00
Philip Rosedale
d2dd41ba0f make thrust be in direction of head/view 2013-07-11 21:46:13 -07:00
Philip Rosedale
6609a850eb Gyros and touch look now work at same time 2013-07-11 21:34:42 -07:00
Philip Rosedale
670de73384 Merge branch 'master' of https://github.com/worklist/hifi 2013-07-11 19:52:39 -07:00
Philip Rosedale
4b95f2bae5 Better thrust values and no jittering when standing 2013-07-11 19:10:34 -07:00
Atlante45
08b0afd466 Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming 2013-07-11 18:17:06 -07:00
Atlante45
d84963040e avatar resized + physic adapted 2013-07-11 18:16:55 -07:00
Stephen Birarda
bc008624df Merge pull request #658 from birarda/master 
fix audio silence thanks to receive bail
 2013-07-11 17:56:26 -07:00
Stephen Birarda
76dc01e84e fix audio silence on receive bail 2013-07-11 17:55:59 -07:00
Atlante45
12bbec66af Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming 2013-07-11 17:22:36 -07:00
Stephen Birarda
7c60fd4327 Merge pull request #657 from machinelevel/dev4 
Some Leap finger fixes, but also temporarily disable Leap data sending, ...
 2013-07-11 17:11:38 -07:00
Stephen Birarda
be59035ede Merge pull request #656 from ZappoMan/bug_fixes 
fix hungergames circle bug, and improve performance of isLeafOrLOD logic
 2013-07-11 16:15:20 -07:00
ZappoMan
323644d877 CR feedback 2013-07-11 16:09:08 -07:00
Eric Johnston
58b50067ad Some Leap finger fixes, but also temporarily disable Leap data sending, due to a crash. 
Will resolve the crash before re-enabling.
 2013-07-11 16:06:31 -07:00
Philip Rosedale
678b30f494 Merge branch 'master' of https://github.com/worklist/hifi 2013-07-11 15:53:19 -07:00
Philip Rosedale
79b2703e1c Improve avatar movement, added Physics.cpp for routines to help with physics calculations 2013-07-11 15:53:07 -07:00
ZappoMan
8774cb7ca0 fix hungergames circle bug, and improve performance of isLeafOrLOD logic 2013-07-11 15:48:17 -07:00
Atlante45
7f0ab0289e Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming 2013-07-11 14:10:40 -07:00
Andrzej Kapolka
c3242598f5 Merge pull request #655 from ZappoMan/occlusion_culling 
Make Delta Sending Default, Added option for "Low Res" mode while moving
 2013-07-11 14:08:22 -07:00
ZappoMan
f878d549c0 Merge pull request #652 from ey6es/master 
Improved compass fusion for gyros.
 2013-07-11 13:55:40 -07:00
ZappoMan
c26e39764a Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-07-11 13:50:33 -07:00
Atlante45
aaa9038e4c Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming 2013-07-11 13:48:03 -07:00
ZappoMan
7175186e54 Merge pull request #654 from birarda/master 
fix environment packet sending
 2013-07-11 13:43:59 -07:00
Stephen Birarda
4cf0b7ea66 switch back to statics for domain server check in, fix environment packets 2013-07-11 13:40:29 -07:00
Stephen Birarda
e96ed2bcbd fix environment packet header length 2013-07-11 13:35:39 -07:00
Atlante45
beefd57b54 Merge branch 'master' of git://github.com/worklist/hifi into the_midget_are_coming 2013-07-11 13:25:42 -07:00