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

1891 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
ZappoMan
4cea0ffa10 cr cleanup 2013-04-30 10:33:13 -07:00
ZappoMan
5a90dc4487 cr cleanup 2013-04-30 10:32:55 -07:00
ZappoMan
0fd3f00054 cr cleanup 2013-04-30 10:28:34 -07:00
ZappoMan
218dd3d62b cr cleanup 2013-04-30 10:27:38 -07:00
ZappoMan
37b139621a cr cleanup 2013-04-30 10:27:32 -07:00
Andrzej Kapolka
ccdc1146a2 Removed cut and paste error from CMake file, made a couple variables in 
TextRenderer more descriptive.
 2013-04-30 10:26:47 -07:00
ZappoMan
6d378281a8 cr cleaup - third times a charm? 2013-04-30 10:24:13 -07:00
ZappoMan
3673ee36ad cr cleanup and optimization of isLeaf() 2013-04-30 10:23:35 -07:00
ZappoMan
bf3b014743 code review cleanup 2013-04-30 10:16:04 -07:00
Andrzej Kapolka
8b742e43e6 GCC fails on these constants (ISO C++ forbids initialization of member 
‘COLLISION_BALL_FORCE’), so I moved them into the CPP (they don't seem to
require external visibility anyway).
 2013-04-30 10:15:48 -07:00
ZappoMan
622a078d24 code review cleanup 2013-04-30 10:10:17 -07:00
ZappoMan
8a5633a0db got rid of compareOctalCodesDepth() and cleaned up compareOctalCodes() 2013-04-30 10:09:15 -07:00
Andrzej Kapolka
733ccd4787 Merge branch 'master' of https://github.com/worklist/hifi 2013-04-30 10:04:39 -07:00
Andrzej Kapolka
34f2a28114 Delete our glyph textures on destruction. 2013-04-30 10:04:01 -07:00
Andrzej Kapolka
a24f215f09 Moved menu, chat entry field to ui subdirectory. 2013-04-30 09:59:05 -07:00
Philip Rosedale
dc158a84ac Merge pull request #165 from Ventrella/master 
improved collisions
 2013-04-30 09:01:26 -07:00
ZappoMan
ee814d7ddc better version of boundaryDistanceForRenderLevel() 2013-04-29 19:18:38 -07:00
Andrzej Kapolka
d4fbe9091f Merge branch 'master' of https://github.com/worklist/hifi 2013-04-29 19:13:10 -07:00
Andrzej Kapolka
068d3d216e Need to commit these, too, for the font rendering change. 2013-04-29 19:12:34 -07:00
Andrzej Kapolka
a8c28a6d2a First stab at text rendering by rendering glyphs (using Qt's font rendering) 
into textures, storing the associated metrics, and drawing strings as
sequences of textured quads.
 2013-04-29 18:54:12 -07:00