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

2647 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrzej Kapolka
9033152401 Color selection for painting. 2013-05-14 13:49:24 -07:00
Philip Rosedale
a0179073ae Merge pull request #306 from ZappoMan/render_voxels_optimization 
Added "Delta" mode
 2013-05-14 12:37:23 -07:00
ZappoMan
b3f6d40935 hide debug messages unless requested 2013-05-14 12:22:26 -07:00
ZappoMan
43e190fe3c switched Want Delta menu to use new Qt menus 2013-05-14 12:19:23 -07:00
ZappoMan
a1902e3dc9 Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization 2013-05-14 12:14:53 -07:00
birarda
ff6ce63a31 Merge pull request #311 from birarda/master 
fix casing of PORTAUDIO_ROOT_DIR
 2013-05-14 12:13:23 -07:00
Stephen Birarda
306d2a4b98 casing is important for UNIX 2013-05-14 12:12:36 -07:00
ZappoMan
4e92f5d3d8 tweaks to delta sending 2013-05-14 12:11:32 -07:00
Philip Rosedale
5d6dbfbb01 Merge pull request #304 from ey6es/master 
Changed main globals to Application private members; switched from GLUT to Qt for windowing, input, menus.
 2013-05-14 12:05:43 -07:00
birarda
7902daec8a Merge pull request #310 from birarda/master 
conditional repairs in custom find modules
 2013-05-14 12:03:21 -07:00
Stephen Birarda
9a163d2a72 conditional repairs for custom modules 2013-05-14 12:02:54 -07:00
birarda
60456b2096 Merge pull request #309 from birarda/master 
hopefully fix the broken link to PortAudio on UNIX
 2013-05-14 12:00:11 -07:00
Stephen Birarda
c3bbebee58 don't allow CMake to escape UNIX in path for PortAudio 2013-05-14 11:59:17 -07:00
Andrzej Kapolka
c9b688b876 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-14 11:56:36 -07:00
birarda
6073ad3245 Merge pull request #308 from birarda/master 
fix broken reference to LODEPNG_LIBRARY
 2013-05-14 11:55:04 -07:00
Stephen Birarda
c117d62532 fix old reference to LODEPNG_LIBRARY 2013-05-14 11:54:35 -07:00
Andrzej Kapolka
c6ce992332 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-14 11:49:27 -07:00
birarda
1c2de455a0 Merge pull request #307 from birarda/master 
refactor modules so they actually bail when things are missing
 2013-05-14 11:47:28 -07:00
Stephen Birarda
241c170345 refactor find modules so they complain when things are missing 2013-05-14 11:46:19 -07:00
Andrzej Kapolka
174fdb8109 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/main.cpp
 2013-05-14 11:32:43 -07:00
Andrzej Kapolka
60e8971eb9 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/main.cpp
 2013-05-14 11:29:08 -07:00
ZappoMan
3f503e1e4d Merge pull request #305 from birarda/master 
link PortAudio as static lib instead of compiling as dependency
 2013-05-14 11:28:23 -07:00
ZappoMan
63510aa30b Merge pull request #301 from PhilipRosedale/master 
Improved stability of invensense for drift
 2013-05-14 11:27:01 -07:00
Stephen Birarda
4c9d1c19ff link PortAudio as a static library instead of compiling as dependency 2013-05-14 11:22:34 -07:00
ZappoMan
d809f5b774 Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization 2013-05-14 11:11:52 -07:00
ZappoMan
1e0a575d90 tweaks to view frustum delta code 2013-05-14 11:11:34 -07:00
ZappoMan
062c1b4c64 tweaks to view frustum delta code 2013-05-14 11:10:40 -07:00
ZappoMan
2c1518144a added setAtBit() utility 2013-05-14 11:09:53 -07:00
ZappoMan
d59a8143d7 added wantDelta, made want bools a bit mask 2013-05-14 11:08:59 -07:00
ZappoMan
a95549da2e added new menu items for view delta 2013-05-14 11:08:12 -07:00
Andrzej Kapolka
537686d541 Allow changing the edit voxel size using the mouse wheel. 2013-05-14 11:06:03 -07:00
Philip Rosedale
d386221620 Merge pull request #297 from Ventrella/master 
added code to allow mouse hover over avatar to be used for touch effects
 2013-05-14 11:04:59 -07:00
Andrzej Kapolka
a5e7fdeacd Accidentally left a debug line in. 2013-05-14 10:47:21 -07:00
Andrzej Kapolka
096421347e Missed some comments in transferring from main.cpp to Application.h; trying to 
preserve original formatting.
 2013-05-14 10:45:54 -07:00
ZappoMan
4f826e96ee Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization 2013-05-14 09:04:58 -07:00
ZappoMan
294367a417 first cut at delata view frustum encoding 2013-05-14 09:04:35 -07:00
ZappoMan
2ff8da2b46 move view frustum calculation into VoxelAgentData, added last known and current 2013-05-14 09:03:38 -07:00
ZappoMan
fa37b88fa8 first cut at delta view frustum encoding 2013-05-14 09:02:01 -07:00
ZappoMan
f63407aea5 added printDebugDetails() 2013-05-14 08:57:49 -07:00
Andrzej Kapolka
31b94203ff Disable the menu shortcuts for "regular" keys when the chat entry is showing. 2013-05-14 00:24:53 -07:00
Andrzej Kapolka
1e99389a4b Various fixes, removed the bulk of main.cpp. 2013-05-13 23:15:45 -07:00
Andrzej Kapolka
75eee4bcbd Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
 2013-05-13 21:23:00 -07:00
Andrzej Kapolka
e0388515a4 Massive migration from GLUT/globals to Qt/class members. Mostly there. 2013-05-13 21:11:54 -07:00
Philip Rosedale
ba0263a436 Fixed uninitialized audio loudness value 2013-05-13 19:26:46 -07:00
Philip Rosedale
6b85d93aee Simplified serial port init to not use baud. 2013-05-13 18:52:43 -07:00
birarda
669336a5a5 Merge pull request #303 from birarda/master 
include stdio for broken unix build
 2013-05-13 18:23:53 -07:00
Stephen Birarda
a3a91984d2 include stdio for sprintf 2013-05-13 18:22:55 -07:00
birarda
58d649de24 Merge pull request #302 from birarda/master 
include string for broken build on unix
 2013-05-13 18:20:05 -07:00
Stephen Birarda
2c66ec8520 include string for methods in PairingHandler 2013-05-13 18:19:19 -07:00
ZappoMan
46a9715dcb Merge pull request #300 from birarda/master 
add a PairingHandler to send pair requests from the Qt menu
 2013-05-13 18:17:28 -07:00