Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 11:32:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
30095 commits 75 branches 59 tags 1.2 GiB
Commit graph

30095 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Seth Alves
fedbfe8881 fix jumbled merge 2015-08-11 11:00:04 -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
Seth Alves
804c1ecf8e quiet compiler 2015-08-11 10:46:53 -07:00
David Rowe
84feaeb703 Merge branch 'master' into 20639 2015-08-11 10:33:17 -07:00
Seth Alves
b0190f00fb merge 2015-08-11 10:27:43 -07:00
Seth Alves
b25f6df7af quiet compiler 2015-08-11 10:22:56 -07:00
Seth Alves
dab5848330 quiet compiler 2015-08-11 10:21:30 -07:00
Seth Alves
d6322903a2 quiet compiler 2015-08-11 10:12:46 -07:00
Howard Stearns
60b74af2a8 Merge pull request #5549 from ctrlaltdavid/fix-hmd-lean 
Fix avatar lean forwards and sideways per HMD movements
 2015-08-11 09:31:22 -07:00
Howard Stearns
295d655eec Merge pull request #5545 from AndrewMeadows/chlorine 
rotation constraints in preparation for inverse kinematics
 2015-08-11 09:19:16 -07:00
Andrew Meadows
8e82e48f76 remove more std::max/min favor of glm utilities 2015-08-11 08:17:54 -07:00
Andrew Meadows
23c92662ee relaxed error, more rigor for using fabsf() 2015-08-10 23:09:11 -07:00
Andrew Meadows
a38c1c82d1 use glm::clamp() instead if std::max() and min() 2015-08-10 23:08:36 -07:00
Andrew Meadows
4655bd21dd added some comments to clarify algorithm 2015-08-10 23:08:10 -07:00
Bradley Austin Davis
7694c1c0a6 Cleaning up HMD tools 2015-08-10 21:39:36 -07:00
Brad Davis
19d31938d3 Merge remote-tracking branch 'upstream/master' into plugins 2015-08-10 21:25:35 -07:00
David Rowe
2c1ba9b6b1 Fix avatar lean forwards and sideways per HMD movements 2015-08-10 21:25:18 -07:00
David Rowe
f7dc5480b7 Fix #include path for OSX/Linux 2015-08-10 20:20:51 -07:00
David Rowe
80e296edd0 Merge branch 'master' into 20639 2015-08-10 19:25:12 -07:00
David Rowe
8b326414ac Start eye tracker streaming such that don't block Interface 
Start method is called in a separate thread.
 2015-08-10 19:19:29 -07:00
Brad Hefta-Gaub
34f6699fb7 Merge pull request #5547 from jherico/marge 
PLUGINS - Retina display issues
 2015-08-10 15:39:25 -07:00
Andrew Meadows
a1d8a97675 Merge pull request #5546 from sethalves/fix-protocol-version 
missed this in the last commit -- bump protocol version
 2015-08-10 15:21:52 -07:00
Bradley Austin Davis
61ecee93b8 Fix mis-positioning of QML elements when moving from retina to non-retina display 2015-08-10 15:18:49 -07:00
Seth Alves
7403929323 missed this in the last commit -- bump protocol version 2015-08-10 15:15:54 -07:00
Andrew Meadows
80b36f9f12 fix typo 2015-08-10 15:11:00 -07:00
Seth Alves
b26d6d2b9c Merge pull request #5542 from ZappoMan/RenderableModelEntityItemOptimization 
Renderable model entity item optimizations
 2015-08-10 15:10:12 -07:00
Seth Alves
74287c3cf5 Merge pull request #5482 from ericrius1/polyLineInProgress 
Added PolyLine Entity and painting scripts to demonstrate its functionality (WARNING: protocol change) Test this please
 2015-08-10 14:57:52 -07:00
Andrew Meadows
75ab6a00aa add unit tests for RotationConstraints 2015-08-10 14:48:46 -07:00
Andrew Meadows
43bf4a85d2 add RotationConstraint and friends 2015-08-10 14:48:22 -07:00
Andrew Meadows
f9a4b82edd add swing-twist decomposition util with unit-tests 2015-08-10 14:47:15 -07:00
Andrew Meadows
4a8baafdd2 fix QCOMPARE_WITH_ABS_ERROR for floats 2015-08-10 14:45:57 -07:00
Andrew Meadows
6db47e773f removing ShapeColliderTests.* 2015-08-10 14:35:36 -07:00
ericrius1
59d5f61af4 incremented protocol number 2015-08-10 14:20:46 -07:00
Seth Alves
889e1edeaf Merge pull request #5544 from howard-stearns/restore-eye-joint-rotations 
Restore eye joint rotations
 2015-08-10 14:19:37 -07:00