Commit graph

30441 commits

Author SHA1 Message Date
Brad Hefta-Gaub
821063f6d2 Merge pull request #5575 from SamGondelman/sam/input-plugins
Working on toybox script, squeezeHands, and default mappings
2015-08-15 10:59:04 -07:00
Brad Hefta-Gaub
e4dea13256 Merge pull request #5576 from hyperlogic/tony/ati-render-fix
Fix for ATI discrete graphics on 2015 macbook pro / mac pro.
2015-08-15 10:05:44 -07:00
Anthony J. Thibault
cd58f012a3 Fix for ATI discrete graphics on 2015 macbook pro / mac pro.
Fixed incorrect size for camera transform uniforms passed via
glBindBufferRange.   This is a legitimate bug on our side.
I guess Intel and nVidia drivers just happen to ignore this field.
This was likely causing many of the shader TransformCamera members
to be identity or un-initialized, specifically, the projection
matrix values.

This was resulting in a black screen on ATI gpus.
2015-08-15 09:42:05 -07:00
Brad Davis
82310bb499 Attempting to fix rendering issues on 2015 Macs 2015-08-14 23:57:10 -07:00
Brad Davis
9706a44ca1 Merge pull request #5571 from ZappoMan/hmdToolsRedux
remove HMD Tools as menu item, automatically hide/show it when display plugin is an hmd
2015-08-14 20:11:27 -07:00
Howard Stearns
eeeaa8050d Fix the rush jobs, so gustavo can build build for me... 2015-08-14 18:58:49 -07:00
Brad Hefta-Gaub
a0e92e71a5 Merge pull request #5562 from AlexanderOtavka/overlay-docs
Documentation for overlay changes.
2015-08-14 18:53:34 -07:00
Brad Hefta-Gaub
27f2a628a8 Merge pull request #5568 from huffman/fix-edit-click
Update edit.js mouse click code to be more lenient to micro movements
2015-08-14 18:47:48 -07:00
Brad Hefta-Gaub
f76c663bb5 Merge pull request #5558 from AndrewMeadows/chromium
coalesce scattered unit-test helper functions
2015-08-14 18:12:03 -07:00
Brad Hefta-Gaub
65b9c7bed8 Merge pull request #5522 from huffman/fix-billboard-url
Fix BillboardOverlay breaking when changing url
2015-08-14 18:10:22 -07:00
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
bwent
8609129228 fix header 2015-08-14 17:07:01 -07:00
Howard Stearns
d28c555a79 Synchronize eye joint and debugging vectors when the other avatar is looking at me. 2015-08-14 16:47:34 -07:00
Brad Davis
db95657455 PR comments 2015-08-14 16:40:53 -07:00
ZappoMan
6a802560f2 remove HMD Tools as menu item, automatically hide/show it when display plugin is an hmd 2015-08-14 16:27:50 -07:00
bwent
889d9c54a5 add newline at end of file 2015-08-14 16:24:11 -07:00
Brad Davis
208e41efd1 WebEntity keyboard input with mouse hover 2015-08-14 16:18:38 -07:00
bwent
45fe6a438c Example particle scripts 2015-08-14 16:18:07 -07:00
Ryan Huffman
fec460886b Merge branch 'master' of github.com:highfidelity/hifi into fix-billboard-url 2015-08-14 15:18:40 -07:00
bwent
7834a18bcf add untracked changes 2015-08-14 15:11:05 -07:00
bwent
7bd9e2653c more bug fixes 2015-08-14 15:09:48 -07:00
David Rowe
bb2c48e3ed Add size and position properties, methods, and events to WebWindow 2015-08-14 14:42:32 -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
bwent
68fcf4ec8a formatting 2015-08-14 11:06:44 -07:00
bwent
2c5c362957 adding rocket and refresh icons 2015-08-14 10:19:57 -07:00
Ryan Huffman
ee11b74c8b Update click move distance threshold 2015-08-14 10:13:05 -07:00
Ryan Huffman
56501490a1 Update edit.js mouse click code to be more lenient to micro movements 2015-08-14 10:09:16 -07:00
bwent
58713c0d57 more minor bug fixes 2015-08-14 09:55:05 -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
bwent
2dbba322fd bug fixes, ride through system 2015-08-13 18:13:08 -07:00
bwent
8c47bcc141 implement new UI 2015-08-13 16:00:55 -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