Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-23 01:59:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
2223 commits 25 branches 0 tags 1.1 GiB
Commit graph

2223 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrzej Kapolka
f8cbe34e07 Added basic ray intersection testing to VoxelTree. 2013-05-03 17:27:57 -07:00
ZappoMan
0656b5b14f fixed acidental local mode 2013-05-03 17:12:37 -07:00
ZappoMan
f93bc98ec7 Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization 2013-05-03 17:11:41 -07:00
ZappoMan
e3164b3976 added read/write voxel files 2013-05-03 17:09:43 -07:00
Jeffrey Ventrella
f8762c5e37 added avatar data file stuff that got lost during a merge or something 2013-05-03 16:58:52 -07:00
Jeffrey Ventrella
707d513dac Merge remote-tracking branch 'upstream/master' 2013-05-03 16:12:01 -07:00
Jeffrey Ventrella
cb8e68f300 fixed a physics bug in avatar body spring (forgot to use deltaTime) - and adjusted various physics constants accordingly. 2013-05-03 16:11:35 -07:00
birarda
33b4159a95 Merge pull request #194 from ey6es/master 
Fix for starfield rendering on OS X.
 2013-05-03 16:06:24 -07:00
Stephen Birarda
66e2771135 some cleanup in interface main 2013-05-03 15:58:55 -07:00
Andrzej Kapolka
6389f0bc13 OK, I give up. 2013-05-03 15:49:31 -07:00
Andrzej Kapolka
34a5293b13 Added newline at end of file; just trying to get this file out of the diff. 2013-05-03 15:48:34 -07:00
Andrzej Kapolka
861e78f161 Removed my temporary fix for pairing server bits. 2013-05-03 15:47:03 -07:00
Andrzej Kapolka
bc0c1cf5f9 Fixed bug with rendering stars on OS X: was using some weird extension on 
Apple rather than standard VBOs.
 2013-05-03 15:44:51 -07:00
Andrzej Kapolka
c1a3478954 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-03 15:44:14 -07:00
Stephen Birarda
24c1ea5e7f resolve conflicts on merge with upstream master 2013-05-03 15:37:22 -07:00
Jeffrey Ventrella
85ad5601d7 added avatar shadow 2013-05-03 15:22:01 -07:00
Philip Rosedale
a31098ac3c Merge pull request #193 from birarda/avatar-file 
store avatar position and yaw in a local file
 2013-05-03 15:13:45 -07:00
Stephen Birarda
bd3c902b68 remove logging of audio stats 2013-05-03 15:13:38 -07:00
ZappoMan
f4099349e8 change to encodeTreeBitstreamRecursion() to allow calling without viewFrustum 2013-05-03 15:13:00 -07:00
Stephen Birarda
31e9c18346 couple of extra line deletions in main.cpp 2013-05-03 15:09:44 -07:00
Stephen Birarda
da93b596de some deletion cleanup in main.cpp 2013-05-03 15:08:48 -07:00
Stephen Birarda
1a8564f9d9 store avatar position and yaw in file to restore on relaunch 2013-05-03 15:05:28 -07:00
ZappoMan
1366794bdc added some tree methods for primitive voxel editing 2013-05-03 15:00:03 -07:00
Andrzej Kapolka
d28356e776 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-03 14:55:13 -07:00
Stephen Birarda
90a08b4dd8 cleanup in Audio and Util 2013-05-03 14:45:47 -07:00
birarda
4f74e5a6e2 Merge pull request #192 from birarda/pairing 
include cstring for use of strlen
 2013-05-03 14:42:33 -07:00
Stephen Birarda
82db78cc67 include cstring for use of strlen 2013-05-03 14:41:56 -07:00
ZappoMan
e9d556419f got rid of some dead code 2013-05-03 14:39:00 -07:00
birarda
f5bbc981c1 Merge pull request #191 from birarda/pairing 
add missing header for sscanf and printf
 2013-05-03 13:01:41 -07:00
Stephen Birarda
2ab7bc0d8a add cstdio for sscanf and printf 2013-05-03 13:01:02 -07:00
Andrzej Kapolka
8923057d0e Compile fix, need to use integer GL uniform. 2013-05-03 13:00:48 -07:00
birarda
af44e42d74 Merge pull request #190 from birarda/pairing 
fix port on pairing server
 2013-05-03 12:35:14 -07:00
Stephen Birarda
597c8336bd change the pairing server listen port to 7247 2013-05-03 12:34:29 -07:00
ZappoMan
8e7dd4ba8f Merge pull request #187 from ey6es/master 
Fix for Oculus rendering: we need to resize the render texture when the display is resized.
 2013-05-03 12:24:54 -07:00
ZappoMan
f78c59f828 Merge pull request #189 from birarda/pairing 
basic version of the pairing server
 2013-05-03 12:24:29 -07:00
Stephen Birarda
d0444ee5b7 accept a local address and port from requestor 2013-05-03 12:22:20 -07:00
Jeffrey Ventrella
1fc74b3556 Merge pull request #188 from Ventrella/master 
I have a bunch of things to pull.
 2013-05-03 11:18:55 -07:00
Jeffrey Ventrella
8457b91fe0 cleaned up a bunch of leftover tabs and converted each to 4 spaces 2013-05-03 11:15:49 -07:00
Stephen Birarda
5f26d44fd8 Merge remote-tracking branch 'upstream/master' into pairing 2013-05-03 10:59:34 -07:00
Stephen Birarda
bd6f0d9885 couple of line deletions 2013-05-03 10:58:57 -07:00
Andrzej Kapolka
9dfc6c6590 Fix for fullscreen mode switching: when we reshape, we need to resize the 
render texture (if it exists).
 2013-05-03 10:57:51 -07:00
Jeffrey Ventrella
026ee4345c Merge remote-tracking branch 'upstream/master' 2013-05-03 10:54:07 -07:00
Jeffrey Ventrella
e0b33e56da couple of small code cleanups 2013-05-03 10:52:44 -07:00
Philip Rosedale
cff1d73496 Merge pull request #182 from ey6es/master 
Support for rendering to Oculus rift.
 2013-05-03 10:39:04 -07:00
Andrzej Kapolka
346f213e3b Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/Avatar.cpp
	interface/src/Avatar.h
	interface/src/main.cpp
 2013-05-03 10:31:40 -07:00
Philip Rosedale
f05451b4f1 Merge pull request #186 from ZappoMan/render_voxels_optimization 
Some more tweaks to test pipeline
 2013-05-03 10:27:56 -07:00
Philip Rosedale
5dfa1258de Merge pull request #181 from Ventrella/master 
renamed avatar "bones" to "joints", and improved skeleton
 2013-05-03 10:25:46 -07:00
Andrzej Kapolka
08350a5d3a Rather than a command line parameter, provide a menu option for switching 
to/from fullscreen mode.
 2013-05-03 10:22:10 -07:00
Philip Rosedale
1fbc13941d Fixes per merge (Ventrella) 2013-05-03 10:16:58 -07:00
Andrzej Kapolka
43b5e9430f Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/main.cpp
 2013-05-03 10:04:50 -07:00