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

27602 commits

This branch
This branch
All branches
Author SHA1 Message Date
Anthony J. Thibault
834b75f4c4 work in progress room scale tracking work. 
sensor to world matrix stored in MyAvatar
override setPosition and setOrientation to move sensor to world matrix.
 2015-07-06 18:25:42 -07:00
Sam Gondelman
f69b755166 merge with hifi/plugins 2015-07-06 17:41:45 -07:00
Sam Gondelman
8fbbb26b15 vertical hand offset (temporary) 2015-07-06 17:04:28 -07:00
Sam Gondelman
33e4893c17 correct hand rotation, buttons and axes work 2015-07-06 16:30:56 -07:00
Brad Davis
95000eec3c Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/src/ui/overlays/LocalModelsOverlay.cpp
 2015-07-06 16:22:03 -07:00
Brad Hefta-Gaub
96fecd093d Merge pull request #5237 from samcake/yellow 
Introducing the Status to the render::Scene & Engine, a per item information that can be displayed in 3D for debug
 2015-07-06 15:41:58 -07:00
samcake
a8ddc71946 Merge pull request #5262 from bwent/cookies 
Added checkbox functionality, double-click to reset panel
 2015-07-06 15:09:16 -07:00
Sam Gateau
fe633cd545 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-06 15:04:02 -07:00
bwent
8b4398cd5a Update cookies.js 2015-07-06 15:03:21 -07:00
bwent
2bdd2b8c2c Update cookies.js 2015-07-06 15:02:51 -07:00
Sam Gateau
4d48b98364 For a fistfull of magic numbers 2015-07-06 14:22:09 -07:00
bwent
5d91f1be83 Removed header comments 2015-07-06 13:26:16 -07:00
Sam Gateau
95f5b14d45 CLenaing the interface of Item::Status to be more explicit and removing magic numbers 2015-07-06 12:47:35 -07:00
Sam Gateau
e63be58251 CLenaing the interface of Item::Status to be more explicit 2015-07-06 12:23:57 -07:00
bwent
93fbfcbff7 Added checkbox functionality, double-click to reset panel 2015-07-06 12:09:08 -07:00
Brad Davis
21562c0766 Merge pull request #5258 from ericrius1/nakedGLStripping 
Removing naked GL calls from overlay code
 2015-07-06 10:25:50 -07:00
Sam Gateau
2bbffff22f Fixing typos 2015-07-06 10:22:25 -07:00
Clément Brisset
c5a043f2e1 Merge pull request #5253 from ZappoMan/inBoundStats 
add edit update stats
 2015-07-04 21:11:48 -07:00
ZappoMan
c4a5160b89 CR feedback 2015-07-04 19:13:35 -07:00
ZappoMan
74733452da some tweaks to make stats dialog more readable 2015-07-04 11:25:27 -07:00
ZappoMan
40cdd8646e add packets per second to octree processing stats 2015-07-03 15:53:53 -07:00
ZappoMan
2aa345dfc6 Merge branch 'master' of https://github.com/highfidelity/hifi into inBoundStats 2015-07-03 15:04:59 -07:00
Eric Levin
3d06b011aa adding batch to renderHUD 2015-07-03 13:27:00 -07:00
samcake
c6a613eaa9 Merge pull request #5260 from ZappoMan/deadCodeRemovalMachine 
remove dead code
 2015-07-03 11:53:21 -07:00
ZappoMan
29a7584ee6 remove dead code 2015-07-03 11:29:59 -07:00
Eric Levin
9d3995ae25 Merge branch 'nakedGLStripping' of https://github.com/ericrius1/hifi into nakedGLStripping 2015-07-03 09:42:19 -07:00
Brad Davis
ba7c3a2c27 Attempting to get UI and navigation keys/mouse working 2015-07-03 07:10:33 -07:00
Brad Davis
b529901b1a Attempting to protect against infinite recursion 2015-07-03 07:09:57 -07:00
Brad Davis
e459d0cb83 Fixing the 0.6 Oculus plugin 2015-07-03 07:08:48 -07:00
Brad Davis
2a1776303d Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/avatar/SkeletonModel.cpp
	interface/src/devices/OculusManager.cpp
	interface/src/devices/TV3DManager.cpp
 2015-07-03 06:17:35 -07:00
Brad Davis
ed5835ff05 Trying to get mac display plugins working: 2015-07-02 22:29:22 -07:00
Sam Gateau
e3c06a30a1 removing dead code 2015-07-02 19:29:09 -07:00
ZappoMan
e1530b3ce9 added a FIXME STUTTER note 2015-07-02 18:15:24 -07:00
samcake
f9562bedd9 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-02 18:14:45 -07:00
Bradley Austin Davis
6b85db268c Working on mac oculus support 2015-07-02 18:14:38 -07:00
Bradley Austin Davis
0034a14fc1 Working on mac functionality 2015-07-02 18:14:12 -07:00
Sam Gateau
76ca093e05 something working ? 2015-07-02 18:12:03 -07:00
Stephen Birarda
812b18c74e Merge pull request #5205 from SeijiEmery/unit-tests 
Unit tests
 2015-07-02 20:58:09 -04:00
Sam Gondelman
3f6fbd058c merge with standing-mode, hands relative to neck 2015-07-02 17:44:19 -07:00
Seiji Emery
16e7af1848 Reverted macro naming convention 2015-07-02 17:41:38 -07:00
samcake
0c55130548 maybe i have solved the passing of the status 2015-07-02 17:31:29 -07:00
Seiji Emery
1fc1c7c794 PR Fixes 2015-07-02 17:29:08 -07:00
ZappoMan
a54cf67064 add stats for processing time per packet 2015-07-02 17:28:53 -07:00
Seiji Emery
28543c0bf2 PR Fixes 2015-07-02 17:27:00 -07:00
Seiji Emery
7ba03418fc PR Fixes 2015-07-02 17:24:03 -07:00
ZappoMan
8916dd2056 add stats for elements and entities per second 2015-07-02 17:00:35 -07:00
ZappoMan
0c0b8dbbc1 add stats for elements and entities per incoming packet 2015-07-02 16:19:13 -07:00
Sam Gateau
dcd61fd417 improvment ? 2015-07-02 16:13:54 -07:00
Sam Gateau
79be37f78f improvment ? 2015-07-02 16:00:56 -07:00
Sam Gateau
bf052162bb improvment ? 2015-07-02 15:53:02 -07:00