Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-18 10:00:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
14596 commits 25 branches 0 tags 1.1 GiB
Commit graph

14596 commits

This branch
This branch
All branches
Author SHA1 Message Date
barnold1953
71634b4c8d Fixed windows compiler warning 2014-07-10 16:56:04 -07:00
barnold1953
18c5ebce9e Merge branch 'master' of https://github.com/highfidelity/hifi into OculusSDK 2014-07-10 16:42:36 -07:00
barnold1953
4bfd393d02 Proper scaling for oculus UI using avatar scale 2014-07-10 16:42:00 -07:00
barnold1953
8bc9214445 Added helper scaling function to Avatar. 2014-07-10 14:37:04 -07:00
barnold1953
fc21f7bbac Removed outdated and incorrect getFingerTipPosition() 2014-07-10 14:21:17 -07:00
AndrewMeadows
afa0f19995 Merge pull request #3152 from AlericInglewood/19854 
Code Review for Job #19854
 2014-07-10 12:57:05 -07:00
Brad Hefta-Gaub
fb357ae04c Merge pull request #3155 from AndrewMeadows/bispinor 
fix bad FPS for crowds of avatars
 2014-07-10 12:06:43 -07:00
barnold1953
45421ffb0e Made palm ball and disk properly use avatar scale 2014-07-10 12:06:36 -07:00
Andrew Meadows
0be70063c5 only set hasNewJointRotations true for valid rotation 2014-07-10 11:39:49 -07:00
Andrew Meadows
ad6a219a60 fix bug: remove redundant _skeleton.simulate() 2014-07-10 11:08:15 -07:00
Clément Brisset
d9acdd6f6e Merge pull request #3154 from AndrewMeadows/bispinor 
bug fix: bad logic for early exit in AvatarManager::updateOtherAvatars()
 2014-07-10 11:00:48 -07:00
Andrew Meadows
fdd9acb477 bug fix: bad logic for early exit 2014-07-10 10:55:41 -07:00
barnold1953
4d591de762 Applied low velocity filter to palm tip position 2014-07-10 10:52:15 -07:00
barnold1953
baf825789e Made Oculus UI radius not a magic number 2014-07-10 10:28:56 -07:00
Aleric Inglewood
d555017fb4 Coding style fix. 2014-07-10 19:25:00 +02:00
Aleric Inglewood
d1b9611040 Remove debug output lines. 2014-07-10 18:52:38 +02:00
Brad Hefta-Gaub
21e7833938 Merge pull request #3150 from AndrewMeadows/inertia 
rename: ParentFrame --> ConstrainedFrame
 2014-07-09 18:35:25 -07:00
Brad Hefta-Gaub
635cb380f2 Merge pull request #3151 from ctrlaltdavid/19860 
Code Review for Job #19860
 2014-07-09 18:35:01 -07:00
barnold1953
a785ceb3da Restored UI fade animation 2014-07-09 17:33:41 -07:00
barnold1953
004db004a6 Dynamically resize lasers so they always end on UI 2014-07-09 17:03:09 -07:00
Andrew Meadows
8fa7bf4fa0 rename: ParentFrame --> ConstrainedFrame 2014-07-09 16:43:46 -07:00
barnold1953
56ff74dd56 Removed ApplicationOverlay::resize() 2014-07-09 16:39:05 -07:00
barnold1953
6e92beeb1c Merge branch 'master' of https://github.com/highfidelity/hifi into OculusSDK 
Conflicts:
	interface/src/Application.cpp
	interface/src/ui/ApplicationOverlay.h
 2014-07-09 16:32:02 -07:00
barnold1953
8147f2cd91 Fixed some magnification window bugs 2014-07-09 16:30:00 -07:00
barnold1953
090f1fd852 Fixed bug with 3rd person UI ray picking 2014-07-09 16:09:06 -07:00
Andrzej Kapolka
af6704a83c Merge pull request #3134 from wdings23/light_and_haze 
Added local lights to avatar. Added haze to voxel.
 2014-07-09 16:07:20 -07:00
Stephen Birarda
33e42ae272 Merge pull request #3149 from birarda/master 
add two new concert cameras to examples
 2014-07-09 15:51:56 -07:00
Stephen Birarda
d412e21008 add two new concert cameras to examples 2014-07-09 15:51:37 -07:00
David Rowe
f2d49fa6a1 Rename focus indicators menu item and default to off 2014-07-09 15:12:29 -07:00
Brad Hefta-Gaub
1f00923146 Merge pull request #3148 from AndrewMeadows/inertia 
improved performance stats API
 2014-07-09 15:07:46 -07:00
Andrew Meadows
9ce6844e9d fix accidental broken class definition 2014-07-09 14:39:08 -07:00
Andrew Meadows
63bcee0229 fix whitespace formatting 2014-07-09 14:33:09 -07:00
Andrew Meadows
f463099d16 add "simulate" stat name to Avatar::simulate() 2014-07-09 14:31:47 -07:00
Andrew Meadows
6ffa09f9e6 modified scope of devices stats 2014-07-09 13:58:54 -07:00
TonyPeng
ef4b95c6e0 Merged from master. Get rid of redundant GL fog states. Moved local light parameters to shader uniform arrays. 2014-07-09 13:27:42 -07:00
Andrew Meadows
3d6752ad90 merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/Application.cpp
 2014-07-09 12:52:00 -07:00
barnold1953
a2225da13d Code cleanup 2014-07-09 12:11:06 -07:00
TonyPeng
56eadcb0dc Get rid of redundant GL calls for fog. Enable and disable fog during rendering stage of voxels. Moved the local light parameters to shader uniform arrays. 2014-07-09 12:05:34 -07:00
barnold1953
e64f34a257 Separated mouse and controller pointers 2014-07-09 12:03:32 -07:00
Andrew Meadows
d26585728b Improved stat accumulation and context names 2014-07-09 11:53:53 -07:00
Andrew Meadows
d214998d1a enforce coding standard: explicit casts 2014-07-09 11:53:09 -07:00
Philip Rosedale
7bcd7e03a4 Merge pull request #3147 from Barnold1953/master 
Fixed full screen mirror mode for non oculus
 2014-07-09 11:41:56 -07:00
Brad Hefta-Gaub
170aa3e659 Merge pull request #3146 from ctrlaltdavid/default_ui_on 
Default UI to "on"
 2014-07-09 11:41:45 -07:00
David Rowe
527f6b2a3f Fix User Interface menu item string 2014-07-09 11:32:38 -07:00
barnold1953
862f311306 Fixed full screen mirror mode for non oculus 2014-07-09 11:29:33 -07:00
David Rowe
603ca02ef9 Default UI to "on" 2014-07-09 11:21:16 -07:00
barnold1953
d044af1400 Made it so you can only select in a 180 degree radius with oculus 2014-07-09 11:12:02 -07:00
Aleric Inglewood
801be7edee Stop QMenuBar to steal keyboard focus when pressing Alt key in Linux. 2014-07-09 13:55:38 +02:00
Clément Brisset
3f24feeb1d Merge pull request #3143 from PhilipRosedale/master 
Add Low Velocity Filter for hand movement as menu option
 2014-07-08 23:22:46 -07:00
Clément Brisset
2003dc41df Merge pull request #3138 from ctrlaltdavid/19836 
Code Review for Job #19836
 2014-07-08 23:16:32 -07:00