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

1911 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
0f71627923 fixed local mode 2013-05-01 21:22:41 -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
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
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
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
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
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
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
Philip Rosedale
8e06602e9a Added Avatar method to allow received UDP transmitter data to drive the avatar head rotation, cleaned up gyro code. 2013-04-30 13:40:16 -07:00
Andrzej Kapolka
675c0cb74e Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/main.cpp
 2013-04-30 12:37:24 -07:00
ZappoMan
04b29182a8 Merge pull request #170 from ZappoMan/view_frustum_work 
fixed build buster
 2013-04-30 11:57:51 -07:00
ZappoMan
47326230a1 fixed build buster 2013-04-30 11:57:06 -07:00
birarda
8153b2af95 Merge pull request #161 from ZappoMan/view_frustum_work 
First cut at new Voxel Sending strategy
 2013-04-30 11:48:55 -07:00
ZappoMan
f8523e135d cr cleanup 2013-04-30 11:44:59 -07:00
ZappoMan
08c7c486d9 cr cleanup 2013-04-30 11:40:12 -07:00
ZappoMan
2a746ec111 cr cleanup 2013-04-30 11:34:14 -07:00
ZappoMan
7fddd63a61 cr cleanup 2013-04-30 11:29:13 -07:00
ZappoMan
747cfc04be cr cleanup 2013-04-30 11:21:50 -07:00
ZappoMan
91ca787e2f removed MarkerNode 2013-04-30 11:14:36 -07:00
ZappoMan
dae3881821 removed MarkerNode 2013-04-30 11:13:41 -07:00
ZappoMan
447de68fb5 cr cleanup, remove loadBitstreamBuffer() 2013-04-30 11:06:30 -07:00
Andrzej Kapolka
39a70ce9e7 Rather than Xs, use a "solid block" pseudo-character to draw a bar. Tweaked 
the colors to indicate the pressed key again.
 2013-04-30 11:06:23 -07:00
ZappoMan
7d801e99d1 cr cleanup 2013-04-30 10:55:04 -07:00
ZappoMan
2ec2824e8f cr cleanup 2013-04-30 10:46:48 -07:00
ZappoMan
a6b486aa89 cr cleanup 2013-04-30 10:39:45 -07:00
ZappoMan
59ce921645 cr cleanup 2013-04-30 10:38:30 -07:00
ZappoMan
778d3715ce cr cleanup 2013-04-30 10:37:02 -07:00