Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 03:13:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
29959 commits 71 branches 56 tags 1.2 GiB
Commit graph

29959 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
fe8fef4242 Merge pull request #5570 from jherico/homer 
WebEntity keyboard input with mouse hover
 2015-08-14 17:32:47 -07:00
Brad Davis
dc2ddd0303 switch statement spacing 2015-08-14 17:12:00 -07:00
Brad Davis
db95657455 PR comments 2015-08-14 16:40:53 -07:00
Brad Davis
208e41efd1 WebEntity keyboard input with mouse hover 2015-08-14 16:18:38 -07:00
Brad Hefta-Gaub
ea685f4587 Merge pull request #5563 from huffman/fix-image3d-rotation 
Fix rotation of image3d overlays
 2015-08-14 11:14:18 -07:00
Brad Hefta-Gaub
31a49a551a Merge pull request #5556 from jherico/bart 
QML framerate improvments
 2015-08-14 11:11:14 -07:00
Philip Rosedale
74f695cc9c Merge pull request #5567 from howard-stearns/fix-gaze 
fix-gaze debugging aid
 2015-08-14 08:03:35 -07:00
Howard Stearns
6b27f854b2 Eyelid position is on sender side and should use lookAt spot, not the receiver side. 2015-08-14 07:51:04 -07:00
Howard Stearns
1133e053d1 Developer->Avatar->Fix Gaze menu option to not move the eyes around while we're debugging. 2015-08-14 07:33:36 -07:00
Howard Stearns
9308e9df4f Merge pull request #5458 from ctrlaltdavid/20639 
CR for 20639 - Add SMI Rift eye tracker support
 2015-08-13 10:06:15 -07:00
Ryan Huffman
0daa9d4871 Remove extra rotation in image3d 2015-08-13 09:38:21 -07:00
Seth Alves
8cbb0c2ac3 Merge pull request #5560 from howard-stearns/no-version-constants 
No symbolic names for non-entity contants.
 2015-08-12 16:57:00 -07:00
Howard Stearns
daae750d68 No symbolic names for non-entity contants. 2015-08-12 16:40:00 -07:00
Ryan Huffman
1000033f53 Merge pull request #5559 from SeijiEmery/js-widgets 
Js widgets
 2015-08-12 16:39:11 -07:00
David Rowe
c0439f123b Merge branch 'master' into 20639 2015-08-12 16:34:53 -07:00
Seiji Emery
fdacb894a5 tabs to spaces 2015-08-12 16:28:06 -07:00
Seiji Emery
81588f7db0 renamed Icon to Image 2015-08-12 16:26:47 -07:00
Brad Davis
0fa3044231 QML framerate improvments 2015-08-12 16:24:34 -07:00
Seth Alves
2dbbc5c184 Merge pull request #5553 from howard-stearns/remove-obsolete-avatar-mixer-data 
Warning: protocol change - Remove obsolete AvatarMixer wire data
 2015-08-12 16:01:42 -07:00
Seiji Emery
778100e075 Merge branch 'master' of https://github.com/highfidelity/hifi into js-widgets 2015-08-12 15:57:04 -07:00
Seiji Emery
c175fe9e04 moved example code to widgets-example.js 2015-08-12 15:48:21 -07:00
Seiji Emery
10ca3f7a8f fixes 2015-08-12 15:39:34 -07:00
David Rowe
6a0a08eafb Consolidate identical code paths 2015-08-12 15:25:34 -07:00
David Rowe
7298fa7e2c Log successful start of eye tracker streaming 2015-08-12 15:22:24 -07:00
David Rowe
9fe1aaf182 Disable saving / loading eye tracker calibrations so can use old SDK 2015-08-12 15:21:06 -07:00
Brad Hefta-Gaub
acf9933925 Merge pull request #5557 from jherico/marge 
Fixing crash in vive controllers
 2015-08-12 12:45:57 -07:00
Brad Davis
0ff283d09e Fixing crash in vive controllers 2015-08-12 12:24:53 -07:00
Howard Stearns
2fbcede9b2 Merge pull request #5554 from ZappoMan/aaboxOptimization 
cache calculation of aabox and aacubes
 2015-08-12 12:09:33 -07:00
Seiji Emery
293f146cfc added debug ui, fixed non-targetable ui boxes/labels 2015-08-12 10:44:46 -07:00
Seiji Emery
f45afe050b Added drag actions 2015-08-12 00:19:11 -07:00
Seiji Emery
986a821c91 cleanup 2015-08-11 22:00:53 -07:00
Seiji Emery
f247f0390c Cleanup + refactoring 2015-08-11 21:56:00 -07:00
David Rowe
8f376247f0 Fix calculation of corrected look-at position in HMD view 2015-08-11 20:25:02 -07:00
Seiji Emery
8c47c7b989 Added attachment 2015-08-11 20:12:21 -07:00
David Rowe
0f56285283 Fix HMD look-at positions and lines 2015-08-11 18:54:55 -07:00
ZappoMan
0990229c64 cache calculation of aabox and aacubes 2015-08-11 18:05:22 -07:00
Howard Stearns
a5d8125aa7 Remove obsolete AvatarMixer wire data. (Was duplicated in joint states that are also sent.) 2015-08-11 17:53:49 -07:00
Seiji Emery
bb205294b9 uiwidgets.js 2015-08-11 16:33:30 -07:00
David Rowe
c060af0de5 Merge branch 'master' into 20639 2015-08-11 14:55:17 -07:00
Seth Alves
6ce4820b9f Merge pull request #5552 from jherico/homer 
Fixing bad success macro for the Oculus SDK on windows
 2015-08-11 14:21:10 -07:00
Brad Davis
3595f6a8a0 Fixing bad success macro for the Oculus SDK on windows 2015-08-11 14:06:35 -07:00
David Rowe
3e8d0ad712 Fix to use new HMD methods 2015-08-11 13:40:08 -07:00
David Rowe
e6473fc8b9 Merge branch 'master' into 20639 
Conflicts:
	interface/CMakeLists.txt
	interface/src/Application.cpp
	interface/src/Menu.h
	tests/ui/src/main.cpp
 2015-08-11 12:34:28 -07:00
samcake
0a8a43f8bd Merge pull request #5539 from jherico/homer 
Breaking up transfers and draw calls
 2015-08-11 12:12:48 -07:00
Brad Davis
f539e95e53 Fixing includes 2015-08-11 12:02:40 -07:00
Bradley Austin Davis
e94cff594d Working on breaking up transfers and draws 2015-08-11 12:02:39 -07:00
Brad Hefta-Gaub
b726769f15 Merge pull request #5402 from highfidelity/plugins 
New plugins architecture
 2015-08-11 11:11:27 -07:00
Seth Alves
cbe38d5fa5 Merge pull request #5533 from ctrlaltdavid/20637 
CR for 20637 - Add WebWindow setPosition() method
 2015-08-11 11:03:14 -07:00
Brad Hefta-Gaub
35d6528d08 Merge pull request #5550 from jherico/marge 
PLUGINS - Cleaning up HMD tools
 2015-08-11 10:46:59 -07:00
David Rowe
84feaeb703 Merge branch 'master' into 20639 2015-08-11 10:33:17 -07:00