Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-18 08:36:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
1954 commits 76 branches 59 tags 1.2 GiB
Commit graph

904 commits

Author SHA1 Message Date
Philip Rosedale
1fbc13941d Fixes per merge (Ventrella) 2013-05-03 10:16:58 -07:00
Philip Rosedale
b703d0982e Changed avatar.h to store _distanceToNearestAvatar 2013-05-03 09:55:25 -07:00
ZappoMan
2b11cad1ab Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization 2013-05-02 22:33:41 -07:00
Philip Rosedale
9716ea9550 Ground plane moved to 0->10 and lines are exactly 1 meter 2013-05-02 22:28:41 -07:00
ZappoMan
34a059db9a more optimizations of render pipeline 2013-05-02 22:26:56 -07:00
Philip Rosedale
581365f1f1 Fixes per code review. 2013-05-02 20:51:17 -07:00
Philip Rosedale
2195a140fd Merge remote-tracking branch 'upstream/master' 2013-05-02 20:36:43 -07:00
ZappoMan
771c604121 more render pipeline optimizations 2013-05-02 18:12:55 -07:00
Jeffrey Ventrella
7a52d51251 adding avatar renderer 2013-05-02 17:47:28 -07:00
Jeffrey Ventrella
c46fc5a861 (1) added avatar tilting while walking; (2) added avatar renderer; (3) tweaked body proportions; (4) 2013-05-02 17:46:10 -07:00
ZappoMan
fcce4753c9 more optimizations on render pipeline 2013-05-02 16:37:31 -07:00
ZappoMan
5a14c71225 added dirty bit support to VoxelTree, use it to determine when to call treeToArrays 2013-05-02 15:57:31 -07:00
Jeffrey Ventrella
673936e141 adjusted proportions of avatar skeleton to make it closer to average human 2013-05-02 14:05:51 -07:00
ZappoMan
8f0dd1ffa1 added render pipeline warnings menu item 2013-05-02 13:17:06 -07:00
Jeffrey Ventrella
cd334c2ade renamed avatar skeleton from "bones" to "joints" to be more consistent with standard language. Also improved skeleton some 2013-05-02 13:13:56 -07:00
ZappoMan
e2481f514c lower warning threshold to 1 millisecond for voxel render pipeline steps 2013-05-02 12:53:56 -07:00
ZappoMan
275772bb3d debugging voxel sending behavior 2013-05-02 12:26:51 -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
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
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
4f86b5570f first cut at improved render pipeline 2013-05-01 18:21:13 -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
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
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
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
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
Stephen Birarda
0f3d3fb4c7 move private member constants in Avatar.h to implementation 2013-05-01 11:04:58 -07:00
Andrzej Kapolka
13a4058068 Merge branch 'master' of https://github.com/worklist/hifi 2013-04-30 16:06:44 -07:00
Philip Rosedale
24a636486e Added Google glass support, cleaned up gyro code, ready for Oculus! 2013-04-30 16:04:55 -07:00
Philip Rosedale
55330cf14f Merge repairs. 2013-04-30 13:49:42 -07:00
Philip Rosedale
6142372219 Merge remote-tracking branch 'origin/master' 2013-04-30 13:44:49 -07:00