Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-29 15:42:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
2535 commits 71 branches 56 tags 1.2 GiB
Commit graph

2535 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrzej Kapolka
66a8e40712 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-10 12:09:25 -07:00
birarda
843eba8f69 Merge pull request #274 from ZappoMan/master 
Fixed menu behavior
 2013-05-10 12:09:08 -07:00
Andrzej Kapolka
8d0fdcac06 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-10 12:08:50 -07:00
ZappoMan
0888a6605f CR fixes 2013-05-10 12:08:43 -07:00
ZappoMan
bfa7c91a7a fixed menu behavior 2013-05-10 12:08:03 -07:00
Andrzej Kapolka
5a113fd546 Added a stub for a Qt application class that creates a menu (which, since it's 
unparented, will only appear on OS X) with a test item connected to a slot.
 2013-05-10 12:07:47 -07:00
ZappoMan
e84d2696f9 fixed menu behavior 2013-05-10 12:04:52 -07:00
Jeffrey Ventrella
474423e33f Merge remote-tracking branch 'upstream/master' 2013-05-10 11:27:41 -07:00
Jeffrey Ventrella
40e7603e49 removed print statements 2013-05-10 11:27:07 -07:00
birarda
2f8a0b0c09 Merge pull request #273 from PhilipRosedale/master 
Re-Added Head Mouse for Invensense
 2013-05-10 11:20:18 -07:00
Philip Rosedale
7d69eb09c2 Merge remote-tracking branch 'upstream/master' 2013-05-10 10:55:39 -07:00
Stephen Birarda
2f9c16f495 have the oculus drive the body yaw, head pitch, and head roll 2013-05-10 10:55:26 -07:00
Philip Rosedale
f8701e6c0c Re-added Head Mouse working correctly with invensense 2013-05-10 10:55:05 -07:00
ZappoMan
f9b0d7fce3 Merge pull request #272 from ey6es/master 
Improvements to voxel editing: show what you'll be adding/removing/coloring, allow adjusting the desired size.
 2013-05-10 10:49:20 -07:00
Andrzej Kapolka
501aac39da Use isColored, not getShouldRender. 2013-05-10 10:46:04 -07:00
Andrzej Kapolka
e6e5b20dee Merge branch 'master' of https://github.com/worklist/hifi 2013-05-10 10:20:04 -07:00
Stephen Birarda
cc38e4c5c4 Merge remote-tracking branch 'upstream/master' into oculus 2013-05-10 10:18:36 -07:00
birarda
64148926ce Merge pull request #271 from ZappoMan/master 
Fix VoxelSystem::deleteVoxelAt() to correctly update rendered scene
 2013-05-10 10:18:08 -07:00
Stephen Birarda
04447dfcbd drive body yaw and render pitch with oculus when connected 2013-05-10 10:17:21 -07:00
Stephen Birarda
adbca70eba expand the OculusManager to return euler angles 2013-05-10 10:16:23 -07:00
ZappoMan
3af8a1b8f4 code review fixes 2013-05-10 10:03:28 -07:00
Andrzej Kapolka
beadb6a93d Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/main.cpp
 2013-05-10 10:03:05 -07:00
Andrzej Kapolka
f6fcdd78b2 Adding/removing voxels at different sizes. 2013-05-10 09:53:53 -07:00
ZappoMan
9dc09de75e make VoxelSystem::deleteVoxelAt() work properly 2013-05-10 09:32:56 -07:00
Jeffrey Ventrella
57d0b40e81 Merge pull request #270 from Ventrella/master 
made avatars taller
 2013-05-09 23:33:53 -07:00
Jeffrey Ventrella
470349d662 made avatars taller an fixed proportions a bit 2013-05-09 23:31:45 -07:00
ZappoMan
6b5eceeae1 Merge pull request #269 from Ventrella/master 
improved camera first person mode and cleaned up some camera code
 2013-05-09 22:26:59 -07:00
ZappoMan
f0b4dde388 Merge pull request #267 from PhilipRosedale/master 
Stars meridians removed and count reduced, some log cleanup
 2013-05-09 22:25:56 -07:00
Philip Rosedale
6c140b3b2f Merge pull request #268 from ZappoMan/render_voxels_optimization 
create and delete voxels locally
 2013-05-09 22:24:43 -07:00
Philip Rosedale
8521a9e146 added one more log line 2013-05-09 22:23:15 -07:00
ZappoMan
4fe93af5cd create and delete voxels locally 2013-05-09 22:22:32 -07:00
Jeffrey Ventrella
751254ab56 set default camera mode back to third person 2013-05-09 22:22:21 -07:00
ZappoMan
bd3ea6ef65 create and delete voxels locally 2013-05-09 22:20:13 -07:00
Jeffrey Ventrella
6254a6886f cleaned up camera code and improved first person mode 2013-05-09 22:11:33 -07:00
Philip Rosedale
eefd0c36f1 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-09 22:06:57 -07:00
Philip Rosedale
527b65f6a4 Log cleanup. removed star field meridians. 2013-05-09 22:06:32 -07:00
ZappoMan
b4ceac7139 Merge pull request #266 from Ventrella/master 
made lots of changes to the hand-holding code
 2013-05-09 17:52:26 -07:00
Jeffrey Ventrella
697e0d0cbe fixed spacing issue 2013-05-09 17:51:05 -07:00
Jeffrey Ventrella
bca5436fab indentation 2013-05-09 17:36:39 -07:00
Jeffrey Ventrella
6dfa20976d Merge remote-tracking branch 'upstream/master' 2013-05-09 17:24:50 -07:00
Jeffrey Ventrella
eed56db9e5 more fixes to hand holding 2013-05-09 17:24:16 -07:00
Philip Rosedale
a56ad3ec28 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-09 17:23:41 -07:00
Philip Rosedale
cdab62c10c Merge pull request #265 from ZappoMan/render_voxels_optimization 
Optimized Voxel Rendering Performance by implementing blended VBO strategy
 2013-05-09 17:21:05 -07:00
ZappoMan
e28c246efb Merge pull request #263 from PhilipRosedale/master 
Removed old maple serial code (we are now using Invensense), added acceleration and gravity
 2013-05-09 17:20:06 -07:00
Jeffrey Ventrella
ede3cc2f3d tweak tweak 2013-05-09 17:18:26 -07:00
Jeffrey Ventrella
ab3ee1688d more work on hand holding 2013-05-09 17:14:54 -07:00
ZappoMan
2128cb8bff get rid of dead code 2013-05-09 17:10:25 -07:00
Jeffrey Ventrella
6c58dbeab2 thingy 2013-05-09 17:02:40 -07:00
ZappoMan
33fc9f5389 fixed partial VBO updates 2013-05-09 17:01:20 -07:00
Jeffrey Ventrella
9d548c43ad twiddle tweak iterate whittle 2013-05-09 16:54:01 -07:00