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

2034 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
e2481f514c lower warning threshold to 1 millisecond for voxel render pipeline steps 2013-05-02 12:53:56 -07:00
ZappoMan
0f48ac67b8 added timing details to voxel sending behavior 2013-05-02 12:27:16 -07:00
ZappoMan
275772bb3d debugging voxel sending behavior 2013-05-02 12:26:51 -07:00
ZappoMan
174c3ee65b search into level appropriately 2013-05-02 11:31:20 -07:00
Jeffrey Ventrella
6e86cbd65a Merge pull request #180 from Ventrella/master 
fixed merge issue
 2013-05-02 11:07:35 -07:00
Jeffrey Ventrella
4eda930f4a Merge remote-tracking branch 'upstream/master' 2013-05-02 11:06:18 -07:00
Jeffrey Ventrella
35a8066bd6 fixed merge problem 2013-05-02 11:05:51 -07:00
Jeffrey Ventrella
42ce96c82e Merge pull request #177 from Ventrella/master 
I made a few minor fixes in Avatar
 2013-05-02 11:01:24 -07:00
ZappoMan
a6d2bb73ad added warnings if bitstream processing takes too long 2013-05-01 23:24:46 -07:00
ZappoMan
6a7ebb3a55 fixed LOD issue in client 2013-05-01 22:57:19 -07:00
Philip Rosedale
900caa6278 Changed idle simulate call to 16msecs (which will set avatar mixer rate at 60FPS), further small stats improvements 2013-05-01 22:40:38 -07:00
Philip Rosedale
e2cc9d792c Merge remote-tracking branch 'upstream/master' 2013-05-01 22:04:43 -07:00
Philip Rosedale
ee1e5d16fc Avatars are now slowed down when they get near other avatars, for easy fine positioning. 2013-05-01 22:03:57 -07:00
ZappoMan
3422bdaf29 Merge pull request #178 from ZappoMan/render_voxels_optimization 
fixed local mode
 2013-05-01 21:23:17 -07:00
ZappoMan
0f71627923 fixed local mode 2013-05-01 21:22:41 -07:00
Philip Rosedale
e2ce927492 Merge remote-tracking branch 'upstream/master' 2013-05-01 20:57:40 -07:00
Philip Rosedale
09a6a476d5 Slow down when near other avatars - incremental commit 2013-05-01 20:55:40 -07:00
Philip Rosedale
f78f983e2d Merge pull request #176 from ZappoMan/render_voxels_optimization 
Render voxels optimization
 2013-05-01 20:52:48 -07:00
Jeffrey Ventrella
1e6ba9cc34 (1) raised Eve's hand; (2) renamed some member variables; (3) added more functionality to hand-holding 2013-05-01 20:35:21 -07:00
ZappoMan
015fd05e62 code cleanup 2013-05-01 18:37:14 -07:00
ZappoMan
62e7c0383b cleaned up some code for distanceToCamera() 2013-05-01 18:31:05 -07:00
ZappoMan
cfcfacfbdb cleanup 2013-05-01 18:25:42 -07:00
ZappoMan
9e374cbf33 removed accidentally added file 2013-05-01 18:23:39 -07:00
Andrzej Kapolka
5b6b28664f Most of the way towards basic Oculus support. 2013-05-01 18:22:45 -07:00
ZappoMan
4f86b5570f first cut at improved render pipeline 2013-05-01 18:21:13 -07:00
ZappoMan
eab07b0032 Merge pull request #175 from Ventrella/master 
fixed orientation issues and hand holding stuff
 2013-05-01 17:13:37 -07:00
Jeffrey Ventrella
4b18a25b7f cleaned up some tabbing issues in main.cpp 2013-05-01 17:11:35 -07:00
Jeffrey Ventrella
f86a92fef0 fixed some small formatting glitches in code and added a way to make head lean affect the position of the head 2013-05-01 16:51:15 -07:00
Jeffrey Ventrella
63cee4b284 fixed comment on Eve position 2013-05-01 15:43:15 -07:00
Stephen Birarda
87f48b5bc4 add a PariableDevice struct that will hold device info in vector 2013-05-01 15:40:31 -07:00
Jeffrey Ventrella
aeb545656e (1) added a few methods to orientation; (2) fixed Eve's height; (3) added pitch and roll members to Avatar (not used yet); added avatar pull from handshake; 2013-05-01 15:38:55 -07:00
Stephen Birarda
01816ccda3 add a base config for a pairing server 2013-05-01 14:23:25 -07:00
Jeffrey Ventrella
c88a7f8f55 fixed merge 2013-05-01 13:51:59 -07:00
Jeffrey Ventrella
b388e9a760 (1) re-designed and debugged the orientation class and cleaned up quaternion code, and fixed issues in camera and main related to yaw and camera transforms (2) improved hand-holding algorithm 2013-05-01 13:00:08 -07:00
Philip Rosedale
08e1bfb712 Merge remote-tracking branch 'upstream/master' 2013-05-01 12:46:33 -07:00
birarda
67a7692f9d Merge pull request #174 from ey6es/master 
I had forgotten to include the primary fix!
 2013-05-01 12:43:23 -07:00
Andrzej Kapolka
a412f7b1cb Derp, forgot to move this in my codebase. 2013-05-01 12:41:53 -07:00
Philip Rosedale
17b22cccb4 Merge remote-tracking branch 'upstream/master' 2013-05-01 12:38:54 -07:00
Philip Rosedale
02ef1db0d0 Adding devices for Glass, Android 2013-05-01 12:38:22 -07:00
Philip Rosedale
b12e01322a Merge pull request #169 from ey6es/master 
New text rendering method.  This introduces a dependency on Qt 4.
 2013-05-01 12:30:04 -07:00
Andrzej Kapolka
11a750f6a0 Changes according to Philip's feedback: spacing around operators, removed 
unused variables, moved font family names to #defines.
 2013-05-01 12:17:57 -07:00
Andrzej Kapolka
15e46bac82 Disable kerning, expand bounds to account for antialiasing. 2013-05-01 11:59:21 -07:00
Andrzej Kapolka
668e25f9cd Fixed merge issue. 2013-05-01 11:51:19 -07:00
Andrzej Kapolka
5d457afaf9 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/Avatar.h
 2013-05-01 11:46:23 -07:00
birarda
55261ab047 Merge pull request #173 from birarda/master 
move constants for Avatar to cpp
 2013-05-01 11:05:28 -07:00
Stephen Birarda
0f3d3fb4c7 move private member constants in Avatar.h to implementation 2013-05-01 11:04:58 -07:00
birarda
4ea0795a60 Merge pull request #172 from birarda/master 
don't replay buffer for silent agent
 2013-05-01 10:58:37 -07:00
Stephen Birarda
cee73e4622 don't replay last buffer for silent agent 2013-05-01 10:57:59 -07:00
birarda
c5b8ba5e1b Merge pull request #171 from birarda/master 
have eve reference newly deployed audio file
 2013-05-01 10:19:56 -07:00
Stephen Birarda
47f61a2fc2 have eve reference the newly deployed audio file 2013-05-01 10:18:50 -07:00