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

30099 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
bwent
2dbba322fd bug fixes, ride through system 2015-08-13 18:13:08 -07:00
Howard Stearns
f00d3c037d whitespace 2015-08-13 17:36:03 -07:00
bwent
8c47bcc141 implement new UI 2015-08-13 16:00:55 -07:00
Howard Stearns
0f6c0a3117 Merge branch 'master' of https://github.com/highfidelity/hifi into recapitate 2015-08-13 15:56:13 -07:00
Howard Stearns
63608d8012 Undo avatar choice if the whole preferences dialog is cancelled. 2015-08-13 15:55:43 -07:00
Howard Stearns
722c024f61 Remove obsolete code. 2015-08-13 15:08:26 -07:00
Howard Stearns
7d4c96cc29 avartar => avatar 2015-08-13 14:53:12 -07:00
Howard Stearns
74dc6a3dc5 updateMotionBehavior => updateMotionBehaviorFromMenu 2015-08-13 14:43:39 -07:00
Howard Stearns
a8a064990f apperance => appearance 2015-08-13 14:42:37 -07:00
Howard Stearns
2756a00638 Get default avatar url from resources. 2015-08-13 14:23:34 -07:00
Howard Stearns
4dae01a69c Provide a consistent avatar default for the empty string. 2015-08-13 12:54:16 -07:00
Howard Stearns
62941c0914 Remove dead code. 2015-08-13 12:39:30 -07:00
Howard Stearns
ea834609c2 Kill the AvatarAppearanceDialog and rewire necessary parts of PreferencesDialog. 2015-08-13 10:33:31 -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
Zander Otavka
b84b8b6119 Restructure overlayManager.js to be more readable. 2015-08-12 23:30:07 -07:00
Zander Otavka
dc68e12963 Improve documentation for overlay changes. 2015-08-12 22:04:06 -07:00
bwent
c585f24e27 Refining UI, introduce tween functionality for zooming into planets 2015-08-12 20:28:32 -07:00
bwent
e61ba997e5 Fix trail functionality with new classes 2015-08-12 20:28:32 -07:00
bwent
861c9f0ca0 more refactoring 2015-08-12 20:28:32 -07:00
bwent
e27335fc5e Refactoring to use Planet class, set up framework for UI 2015-08-12 20:28:32 -07:00
Andrew Meadows
f64ab8e6b0 add QCOMPARE_QUATS macro for easier tests 2015-08-12 17:52:54 -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
Andrew Meadows
f4e77b8200 remove another dupe unit-test util 2015-08-12 14:15:49 -07:00
Andrew Meadows
6dfbf7f70a coalesce scattered dupes of unit-test utilities 2015-08-12 14:13:28 -07:00
Andrew Meadows
cae77cfd76 move GLMTestUtils.h where all tests can find it 2015-08-12 13:51:40 -07:00
Andrew Meadows
ba5346aee7 move GlmTestUtils.h to GLMTestUtils.h 2015-08-12 13:37:59 -07:00
Andrew Meadows
488f6aa7d8 fix bug in ElbowConstraint::apply() 2015-08-12 13:34:23 -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