Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-15 13:56:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
40089 commits 25 branches 0 tags 1.1 GiB
Commit graph

16063 commits

Author SHA1 Message Date
Brad Hefta-Gaub
edb241807a Merge pull request #7137 from imgntn/webengine-fun 
Enable HTML5 userMedia APIs in QTWebengine view
 2016-02-19 14:27:27 -08:00
Brad Hefta-Gaub
7219a925d2 remove getTrueMouse() 2016-02-19 14:17:28 -08:00
Howard Stearns
00f3d6e382 Remove LODPreference enum. 2016-02-19 14:05:21 -08:00
Howard Stearns
9f7feed544 Remove LOD PID controller. 2016-02-19 14:00:22 -08:00
Zach Pomerantz
0b4e82405f Snap grid overlay to major worldlines 2016-02-19 13:57:33 -08:00
Zach Pomerantz
fd6aa9a78b Add layering to renderGrid, draw edit grid not layered 2016-02-19 13:57:32 -08:00
James B. Pollack
56f8282607 dont need this code here 2016-02-19 13:54:31 -08:00
James B. Pollack
7ec09c49f3 feature request is in another pull 2016-02-19 13:53:22 -08:00
James B. Pollack
afb6f1fe84 no clipboard 2016-02-19 13:50:30 -08:00
James B. Pollack
66e8f070e4 popup windows 2016-02-19 13:48:54 -08:00
Brad Hefta-Gaub
d9aa5d8857 cleanup dead code 2016-02-19 13:25:53 -08:00
Brad Hefta-Gaub
7be5811f34 tweak to UI size, clean up screen to overlay 2016-02-19 13:22:37 -08:00
Howard Stearns
30b4eace95 Remove LOD PID-related preferences and the related toggling of preferences. 2016-02-19 11:52:07 -08:00
Zach Pomerantz
9daefbdb94 Fix grid antialiasing 2016-02-19 11:39:11 -08:00
Zach Pomerantz
07a5c7bd16 Update grid shader for major/minor lines 2016-02-19 11:22:01 -08:00
Andrew Meadows
c53e583bf4 Merge pull request #7129 from hyperlogic/tony/no-hands-in-body 
Prevent avatar's wrists from entering torso
 2016-02-19 10:53:12 -08:00
Seth Alves
01d3977bf1 make avatars shrink faster 2016-02-19 10:04:58 -08:00
howard-stearns
c866d17907 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-output-buffer 2016-02-19 09:46:29 -08:00
samcake
d7b3945c4a Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-02-19 09:29:23 -08:00
Brad Hefta-Gaub
d1e1067e5a allow hydra mouse to know the correct size of screen to target 2016-02-18 22:30:31 -08:00
Brad Hefta-Gaub
bc5d4cfb7f better handling of mouse capture to account for overlapping child windows 2016-02-18 20:20:30 -08:00
Brad Davis
6f364de062 Add a QML document referencing the QML multimedia types to force inclusion in the build 2016-02-18 18:39:25 -08:00
Brad Hefta-Gaub
0de5c1cf71 don't capture the mouse if you're not the active window or if a menu is popped up 2016-02-18 17:11:40 -08:00
James B. Pollack
d73728ae78 add to browser 2016-02-18 16:58:34 -08:00
James B. Pollack
4b29921e63 media! 2016-02-18 16:41:29 -08:00
Zach Pomerantz
af791e8f72 Make grid overlays unpickable 2016-02-18 15:50:18 -08:00
Zach Pomerantz
0c1353e6cc Update grid overlay to use new renderGrid, sane properties 2016-02-18 15:48:23 -08:00
Brad Hefta-Gaub
adcadedc65 slight rework of handleRealMouseMoveEvent 2016-02-18 14:40:55 -08:00
Brad Hefta-Gaub
843039f741 fix mac warnings 2016-02-18 12:04:38 -08:00
Brad Hefta-Gaub
935af6d2cc clean up debug logs 2016-02-18 12:01:03 -08:00
howard-stearns
30ae1950d2 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-output-buffer 2016-02-18 11:35:41 -08:00
Zach Pomerantz
f79fc30b83 Update audioscope to use new renderGrid 2016-02-18 11:30:53 -08:00
Brad Hefta-Gaub
0467930c57 Merge branch 'master' of https://github.com/highfidelity/hifi into hmdHacking 
Conflicts:
	examples/controllers/handControllerGrab.js
 2016-02-18 10:30:43 -08:00
Brad Hefta-Gaub
c4fc3e4057 more work on dragging in hmd 2016-02-18 10:07:37 -08:00
Brad Hefta-Gaub
279519b6d5 hmd mouse check point 2016-02-18 08:44:22 -08:00
David Rowe
54b27f3ac3 Merge branch 'master' into 20805 2016-02-18 23:35:37 +13:00
David Rowe
c07b1f9b1e Tidying 2016-02-18 23:06:26 +13:00
David Rowe
b68837277c Fix default focus 2016-02-18 22:12:43 +13:00
David Rowe
81169c59c8 Fix runtime warnings 2016-02-18 19:52:20 +13:00
Brad Hefta-Gaub
8b8b99c7e0 HMD mouse checkpoint 2016-02-17 21:19:01 -08:00
David Rowe
4df77cff31 Add scrollbars to running scripts and available scripts tables 2016-02-18 18:10:58 +13:00
David Rowe
d32f743f52 Style running scripts and available scripts tables 2016-02-18 16:35:51 +13:00
samcake
b88501784c Making progress toward the PBR material 2016-02-17 18:47:52 -08:00
Anthony J. Thibault
73ac47724a Rig: Prevent the hand IK targets from entering the body. 
Use a 2d circle/circle intersection test to keep the hands outside of the body.
 2016-02-17 16:23:18 -08:00
Anthony Thibault
e863da5a68 Merge pull request #7118 from jherico/hmd_mono 
Remove distortion on HMD previews, both mono and stereo
 2016-02-17 15:39:48 -08:00
Seth Alves
784dc2b538 Merge pull request #7124 from samcake/red 
Fixing the disappearing avatars maybe ?
 2016-02-17 12:05:04 -08:00
Brad Hefta-Gaub
38430d8d2c Merge pull request #7112 from howard-stearns/snap-turn-preference 
Snap turn preference
 2016-02-17 09:19:38 -08:00
David Rowe
b2314d33ba Style and lay out text fields 2016-02-17 20:44:09 +13:00
David Rowe
2a25509f7c Further font fixes 2016-02-17 20:38:01 +13:00
David Rowe
f568b1c67f Fix display of Raleway Bold 2016-02-17 16:19:00 +13:00
David Rowe
61d359a9b5 Style Button controls 2016-02-17 16:12:11 +13:00
David Rowe
1164e3e303 Set up window pane's content width so that can right-align 2016-02-17 15:35:35 +13:00
Howard Stearns
6d70584b5a Change name and use only when in HMD. 2016-02-16 18:09:56 -08:00
Howard Stearns
983a0ccb9b Change internal preference names so that old users pick up the new default values, and change name in dialog. 2016-02-16 18:00:39 -08:00
samcake
640bf81339 Forcing an update from teh avatar manager to the avatar renderItems when beeing updated 2016-02-16 17:19:31 -08:00
Brad Hefta-Gaub
a25581c656 clean up reticle scripting to be exposed through Reticle object (implemented int ApplicationCompositor) 2016-02-16 12:11:58 -08:00
David Rowe
30498760b0 Set up and use font size values 2016-02-16 21:06:06 +13:00
samcake
0ad7bacf02 Changing diffuse to albedo and breaking everything... 2016-02-15 21:50:10 -08:00
Brad Davis
56fc9ea301 Remove distortion on HMD previews, both mono and stereo 2016-02-15 21:46:29 -08:00
David Rowe
386a247f78 Put Running Scripts content into sections 2016-02-16 17:48:21 +13:00
David Rowe
3c1561cc06 Revise scrollbar handling to make better for content 2016-02-16 16:03:23 +13:00
David Rowe
d46f85c5dd Allow noninteger font sizes 2016-02-16 14:50:28 +13:00
David Rowe
535b183f76 Fix focus shadow vertical position 2016-02-16 13:44:36 +13:00
Brad Hefta-Gaub
0d873c7732 consolidate all calls to QCursor::pos() and QCursor.setPosition() to use common ControllerScriptingInterface 2016-02-15 16:11:25 -08:00
David Rowe
0442fcf89c Add shadow at bottom of content 2016-02-16 12:20:01 +13:00
Zach Pomerantz
0d29f59e39 Remove drawOnHUD from 3d overlays 2016-02-15 14:04:02 -08:00
David Rowe
615b2e6052 Fix up some colors 2016-02-16 11:01:53 +13:00
David Rowe
6a22078d2c Add focus shadow 2016-02-16 10:47:45 +13:00
howard-stearns
4150d318d3 "Leave it on by default" (and change name of route variable to SnapTurn). 2016-02-15 13:39:53 -08:00
howard-stearns
20406a5a14 Remove comfortMode menu item, but add a Settings for snapTurn within MyAvatar. 2016-02-15 13:26:40 -08:00
Zach Pomerantz
8feace62b7 Conform text3d initializers to coding standard 2016-02-15 13:05:19 -08:00
Zach Pomerantz
5d1aedf707 Update scene items on overlay3d edits 2016-02-15 13:05:19 -08:00
Zach Pomerantz
452b6f4e59 Fix opacity check for Overlay ItemKey 2016-02-15 13:02:29 -08:00
Zach Pomerantz
f2b716f90a Alias text3d's backgroundAlpha to alpha 
getAlpha(), across 3d overlays, refers to the behavior
of the overlay as a whole. This conforms text3d, and
adds a new property, textAlpha, to replace the old
alpha semantic.
 2016-02-15 13:02:29 -08:00
David Rowe
4d74bb04b0 Style scrollbar 2016-02-16 09:48:09 +13:00
howard-stearns
7057d5c40c Snap Turn avatar preference. (Still tied to Developer menu item.) 2016-02-15 12:38:40 -08:00
samcake
0c0089f736 REnamed Octree.h/cpp to SpatialTree and fixing some coding guidelines 2016-02-15 11:08:12 -08:00
samcake
545f276fdf Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-15 09:29:00 -08:00
David Rowe
9a536b3b33 Specify a minimum Running Scripts window size 2016-02-15 18:02:59 +13:00
David Rowe
a5da678d6e Make Running Scripts dialog content scrollable when needed 2016-02-15 18:02:20 +13:00
David Rowe
31930e879a Style content background, size frame, and position frame elements 2016-02-14 21:01:23 +13:00
David Rowe
9479da616f Restyle dialog resizing 2016-02-13 18:24:23 +13:00
David Rowe
946807431e Fix frame icons not hovering 2016-02-13 17:31:18 +13:00
David Rowe
42a44e0f67 First pass at restyling dialog frame 
"Pin" button is implemented but disabled (as it was before).
 2016-02-13 15:15:01 +13:00
David Rowe
d6772545d5 Text font sizes are specified in points 2016-02-13 15:10:19 +13:00
Brad Davis
b5cba79f0c Merge pull request #7095 from ZappoMan/hmdHacking 
Various bug fixes in related to HMD overlay support
 2016-02-12 17:50:42 -08:00
Andrew Meadows
6baf181453 Merge pull request #7093 from hyperlogic/tony/input-poses-in-avatar-space 
Controller Pose values are relative to Avatar.
 2016-02-12 17:13:36 -08:00
Brad Hefta-Gaub
d85a8a4fb9 Merge pull request #7103 from jherico/render-rate 
Don't drop to half the vsync rate when we can't keep up
 2016-02-12 17:11:03 -08:00
Brad Davis
df225afd05 PR feedback 2016-02-12 16:25:46 -08:00
Brad Hefta-Gaub
df6437236e some CR feedback 2016-02-12 16:13:12 -08:00
Brad Davis
908e153c36 Don't drop to half the vsync rate when we can't keep up 2016-02-12 15:57:27 -08:00
samcake
9bfeb4a1d5 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-12 11:31:47 -08:00
Brad Hefta-Gaub
1160ecb335 improvements in HMD UI behavior 2016-02-12 10:51:33 -08:00
samcake
ef92a52777 Merge pull request #7051 from zzmp/feat/graphics-dialog 
Move graphics settings to a new dialog
 2016-02-12 10:46:00 -08:00
samcake
f12030c1a4 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-11 18:41:02 -08:00
Anthony J. Thibault
8bde897cee Application: removed unused myAvatar local variable. 2016-02-11 18:14:42 -08:00
Anthony J. Thibault
111ed65bf8 Controller Pose values are relative to Avatar. 
Pass a InputCalibrationData to each inputPlugin and inputDevice.
This contains the most up sensorToWorldMatrix, avatarMat and hmdSensorMatrix.
Each input plugin can use this data to transform it's poses into Avatar space
before sending it up the chain.

This fixes a bug in the handControllerGrab.js script that relied on the hand controller
rotation/positions being in the avatar frame.
 2016-02-11 17:18:01 -08:00
Seth Alves
90d81bc17b Merge pull request #7091 from jherico/overlayCrash 
Prevent overlay cleanup from crashing the app
 2016-02-11 16:26:07 -08:00
David Rowe
f29b75b517 Add fonts 2016-02-12 13:17:27 +13:00
Andrew Meadows
b6456889ef Merge pull request #7050 from Atlante45/fix/audio-stats 
Fix audio stats
 2016-02-11 15:56:45 -08:00
Brad Davis
e06bc26896 Prevent overlay cleanup from crashing the app 2016-02-11 15:17:58 -08:00
Chris Collins
c6bc91f8b2 Merge pull request #7084 from jherico/toolTabs 
Allow closed tabs to delete properly
 2016-02-11 13:20:20 -08:00
David Rowe
3d8df56baa Copy bare minimum of files as start of restyling Running Scripts dialog 
And add license headers to files.
 2016-02-12 10:13:06 +13:00
Brad Hefta-Gaub
894c75f8fc Merge pull request #7066 from zzmp/fix/circle3d-radii 
Add radius as property to circle3d
 2016-02-11 13:07:24 -08:00
Brad Hefta-Gaub
d14b9ab9b6 Merge pull request #7065 from zzmp/fix/circle3d-click 
Fix circle3d FindRayIntersection
 2016-02-11 13:07:00 -08:00
Chris Collins
ca15638463 Merge pull request #7080 from ZappoMan/fixPersistMono 
add support for persisting the mono preview mode option
 2016-02-11 13:03:49 -08:00
Chris Collins
38ba852c2e Merge pull request #7075 from Atlante45/fix/add-to-scene 
Fix "Add to scene" option while dropping model
 2016-02-11 13:02:36 -08:00
Brad Davis
2ee1f18e06 Allow closed tabs to delete properly 2016-02-11 10:27:24 -08:00
Zach Pomerantz
a7778daed2 Change graphics dialog to persisted dropdowns 2016-02-11 10:15:13 -08:00
Stephen Birarda
62e842bf2b Merge pull request #7052 from huffman/bugsplat 
BugSplat integration
 2016-02-11 10:10:44 -08:00
samcake
31230e81bb Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-11 10:05:58 -08:00
samcake
355b8ee40d THursday morning the frustum culling seems broken in one particular angle 2016-02-11 10:05:39 -08:00
Zach Pomerantz
84197e5eb2 Add persistent render engine configuration file 2016-02-11 10:00:44 -08:00
Zach Pomerantz
66e1d9668c Add ComboBox preference 2016-02-11 10:00:44 -08:00
Zach Pomerantz
5eeaa9a33e Move graphics settings to dedicated dialog 2016-02-11 10:00:44 -08:00
Ryan Huffman
d226416306 Update params to MiniDmpSender to be const 2016-02-11 09:46:31 -08:00
Zach Pomerantz
eb6ff725c4 Fix circle3d FindRayIntersection to scale by radius 2016-02-11 08:24:48 -08:00
Ryan Huffman
3355019cbe Add custom bugsplat flags 2016-02-11 08:17:20 -08:00
Brad Hefta-Gaub
d77d102384 add support for persisting the mono preview mode option 2016-02-10 22:01:17 -08:00
Atlante45
913172b490 Fix extension checking 2016-02-10 18:17:13 -08:00
Atlante45
1fe4ff5319 Make stats code more readable 2016-02-10 16:35:06 -08:00
Chris Collins
b1c6d1d256 Merge pull request #7070 from sethalves/no-sink-upon-server-restart 
don't sink through floor when server restarts
 2016-02-10 14:42:28 -08:00
Seth Alves
11d296a477 if we are told to clear the octree, disable physics until we have (re)loaded entities 2016-02-10 14:08:35 -08:00
Seth Alves
3b1db7a522 Merge pull request #7061 from AndrewMeadows/crash-fix 
Fix crash when deleting many moving dynamic objects.
 2016-02-10 13:58:03 -08:00
Zach Pomerantz
7e474dba60 Add radius as property to circle3d 2016-02-10 12:27:00 -08:00
Brad Hefta-Gaub
5120076add Merge pull request #7060 from jherico/qml 
Small QML fixes
 2016-02-10 11:39:45 -08:00
Andrew Meadows
132169395c use const reference for std:vector 2016-02-10 10:36:34 -08:00
Brad Davis
4d1c24abb7 Fix OverlayWindow loading issues 2016-02-10 10:02:20 -08:00
Brad Hefta-Gaub
9e3a13795a Merge pull request #7054 from howard-stearns/editjs-ToolWindow-initial-position 
Fix ToolWindow's initial position (e.g., as used by edit.js).
 2016-02-10 09:30:06 -08:00
howard-stearns
e2ac48fac0 Fix ToolWindow's initial position (e.g., as used by edit.js). 2016-02-09 14:49:50 -08:00
Seth Alves
43592fd699 Merge pull request #7048 from hyperlogic/tony/avatar-on-moving-platform 
Better avatar animation when attached to a moving entity
 2016-02-09 14:30:02 -08:00
Anthony J. Thibault
2b10fea006 SpatiallyNestable: warn on failure. 2016-02-09 14:03:39 -08:00
Brad Hefta-Gaub
a8ec4bb844 Merge pull request #7049 from jherico/antistutter 
Anti-stutter work
 2016-02-09 12:16:15 -08:00
Ryan Huffman
27384dbe0a Clean up BugSplat initialization 2016-02-09 11:33:50 -08:00
Chris Collins
cc576dd5e3 Merge pull request #7045 from sethalves/fix-query-cube 
fix queryAACube lastEdited bug
 2016-02-09 11:23:56 -08:00
Ryan Huffman
65b82b9bba Add BugSplat to interface 2016-02-09 10:48:32 -08:00
Chris Collins
e61636e8a7 Merge pull request #7028 from zzmp/fix/overlay 
Add transparency and layering for overlays
sam is doing it
 2016-02-09 09:18:32 -08:00
Anthony Thibault
aa3cb8fb20 Merge pull request #7047 from AndrewMeadows/hide-the-razor-blades 
MyAVatar::rebuildCollisionShape() is not a slot
 2016-02-09 09:11:14 -08:00
James B. Pollack
a8395b38ac Merge pull request #7046 from jherico/keynav 
Improve keyboard navigation in file dialog and running scripts
 2016-02-09 09:09:58 -08:00
Brad Davis
6a66d74e19 Limit the number of concurrent file parsing threads 2016-02-08 23:55:03 -08:00
Anthony J. Thibault
072172b1a2 SpatiallyNestable: now with velocity support! 
Moved velocity and angularVelocity into the SpatiallyNestable base class.

Entity velocity and angularVelocity properties are now relative to their parent, similar to the way position and orientation work for entities.

MyAvatar rig animations now use SpatiallyNestable to convert velocity into local frame to drive the animation state machine.
 2016-02-08 19:43:23 -08:00
samcake
07759bb5db Merge pull request #7034 from zzmp/feat/render-to-json 
Add toJson methods to render config objects in JS
 2016-02-08 18:00:25 -08:00
Andrew Meadows
65ca25ff47 MyAVatar::rebuildCollisionShape() is not a slot 2016-02-08 17:08:40 -08:00
Seth Alves
d5f3447fbc when updating queryAACubes for children, use the lastEdited from the parent's properties 2016-02-08 16:22:41 -08:00
Brad Davis
427644cb77 Add better keyboard navigation to file dialog 2016-02-08 16:12:24 -08:00
Brad Davis
e376b781c1 Keyboard navigation in running scripts list 2016-02-08 16:12:23 -08:00
Anthony J. Thibault
97bcc54360 CharacterController: separate target velocity from parent velocity. 
Also, disable damping on the rigidBody used by the CharacterController.
 2016-02-08 16:01:36 -08:00
Seth Alves
7f2b822796 only setLastEdited on properties to be sent 2016-02-08 15:15:49 -08:00
Seth Alves
3030944ca1 set last-edited when updating a child's queryAACube 2016-02-08 15:09:11 -08:00
Anthony J. Thibault
2667fe3c24 Merge branch 'master' into tony/avatar-on-moving-platform 2016-02-08 14:32:46 -08:00
Zach Pomerantz
a7bafed61b Change ShapeKey::CULL to NO_CULL_FACE 2016-02-08 13:44:42 -08:00
Philip Rosedale
63afa8c1ed Merge pull request #7040 from hyperlogic/tony/landing-animation 
MyAvatar: added standing and run landing animations
 2016-02-08 11:38:12 -08:00
Brad Hefta-Gaub
7939f1381c Merge pull request #7036 from jherico/qml 
Fix native text rendering by forcing positions to integer values
 2016-02-08 09:45:57 -08:00
Anthony Thibault
c4f9a4805c MyAvatar: moving platform support 
* pass sum of desired and parent velocity onto avatar's character controller.
* pass local position and velocity to Rig for animation purposes.
 2016-02-07 14:07:40 -08:00
Anthony J. Thibault
d24a024726 MyAvatar: added standing and run landing animations 2016-02-05 17:53:50 -08:00
Philip Rosedale
a98efbc660 Merge pull request #6997 from jagwire/WorkingEnergy 
Working energy usage for entity manipulation.
 2016-02-05 17:17:45 -08:00
Andrew Meadows
09bdccb18c Merge pull request #7032 from hyperlogic/tony/standing-jump 
MyAvatar: Standing Takeoff and In-Air Animations
 2016-02-05 13:45:52 -08:00
Zach Pomerantz
8bf6c66327 Add (de)serializer for QObject->JSON 2016-02-05 13:03:46 -08:00
Howard Stearns
47694b90ee Fix inverted boolean that was preventing other people's avatars from mouth-animating. 2016-02-05 11:47:21 -08:00
Bradley Austin Davis
ebf0bf394a Fix native text rendering by forcing positions to integer values 2016-02-05 11:43:31 -08:00
Babiuch, Ryan Nicholas
aab98db812 Merge branch 'master' of github.com:highfidelity/hifi 2016-02-05 12:49:38 -06:00
Anthony J. Thibault
8ca8550f26 MyAvatar: Standing Takeoff and In-Air Animations 
Now there are two sets of of jump takeoff and in-air animations.
* Run - Used when the character jumps or falls with a small forward velocity.
* Standing - Used when the character jumps or falls in-place or backward.

CharacterController
* increased takeoff duration to 250 ms
* increased takeoff to fly duration to 1100 ms
* added standing jump and in-air animations
* added 250 milisecond delay between ground and hover, to prevent going into hover when walking over cracks.
* take-off to in-air transitions now use the new snapshotPrev interp type for a smoother tweening.
 2016-02-04 17:56:07 -08:00
Andrew Meadows
725f9e29a3 Merge pull request #7026 from hyperlogic/tony/fly-like-an-eagle 
MyAvatar: Use head to turn while flying in HMD mode
 2016-02-04 17:52:47 -08:00
Brad Hefta-Gaub
817245accc Merge pull request #7025 from jherico/qml 
QML Work
 2016-02-04 16:03:39 -08:00
Babiuch, Ryan Nicholas
fb5236e9b2 Merge branch 'master' of github.com:highfidelity/hifi 2016-02-04 16:50:43 -06:00
Bradley Austin Davis
dc0e038535 Add drive selection to the file dialog 2016-02-04 13:51:43 -08:00
Bradley Austin Davis
64597f9d9f Fixing save dialog issues saving new files 2016-02-04 13:32:52 -08:00
Zach Pomerantz
3fceaba2fe Remove extra qualifications to getShapeKey from overlay headers 2016-02-04 10:01:34 -08:00
Babiuch, Ryan Nicholas
dca7ff967c Conform to coding standard. 2016-02-04 08:26:56 -06:00
Babiuch, Ryan Nicholas
142ec76600 Merge branch 'master' of github.com:highfidelity/hifi 2016-02-04 08:18:47 -06:00
Zach Pomerantz
53bd595b77 Update all appropriate overlays to use plumber 2016-02-03 19:18:56 -08:00
Zach Pomerantz
8d0f82fa6a Split DrawOverlay3D to Transparent/Opaque 2016-02-03 19:18:56 -08:00
Zach Pomerantz
60f3ee5a18 Initialize Volume3dOverlay to a valid scale 2016-02-03 19:18:56 -08:00
Stephen Birarda
058bba7b55 move avatar invokables from AvatarManager to AvatarHashMap 2016-02-03 17:13:35 -08:00
Anthony J. Thibault
d2068678f4 MyAvatar: bumped up size of head, w.r.t. head cauterization. 
This is to avoid some issues where face is visible when looking straight down.
Specifically, with the Albert avatar.
 2016-02-03 16:08:11 -08:00
Anthony J. Thibault
027a2166f5 MyAvatar: Use head to turn while flying in HMD mode 2016-02-03 15:44:06 -08:00
Bradley Austin Davis
60d97c45af Support save file dialog 2016-02-03 14:51:10 -08:00
Bradley Austin Davis
8f85abfec8 Support 'naked' selection globs in file dialog 2016-02-03 14:51:07 -08:00
Bradley Austin Davis
320c4d27b5 Force Qt (rather than OS) rendering in a number of places 2016-02-03 14:51:05 -08:00
Bradley Austin Davis
0a99086617 Moving to QML based dialogs 2016-02-03 14:51:02 -08:00
Bradley Austin Davis
c1d45b0c78 Remove declarative form creation from WindowScriptingInterface 2016-02-03 14:50:59 -08:00
Andrew Meadows
63df34541d Merge pull request #6802 from huffman/agent-simulation 
Fix Agents bidding on simulation ownership
 2016-02-03 13:45:12 -08:00
Babiuch, Ryan Nicholas
d7951f4300 Merge branch 'master' of github.com:highfidelity/hifi 2016-02-03 14:52:08 -06:00
Andrew Meadows
861082964e Merge pull request #7017 from hyperlogic/tony/fly 
MyAvatar: Improved Jump / InAir / Fly behavior
 2016-02-03 12:22:30 -08:00
Brad Hefta-Gaub
839ce50bde Merge pull request #7018 from jherico/qml 
QML fixes
 2016-02-03 11:59:27 -08:00
Babiuch, Ryan Nicholas
3d727d76c2 Merge branch 'master' of github.com:highfidelity/hifi 2016-02-03 13:39:13 -06:00
Stephen Birarda
93530fca72 fix the last of the current override warnings for OS X 2016-02-03 11:08:41 -08:00
Andrew Meadows
cd56d635e1 Merge pull request #7012 from sethalves/adjust-palm-position 
base palm position on finger joint rather than an offset from hand joint
 2016-02-03 10:34:39 -08:00
Bradley Austin Davis
bc7fda0ae9 Set desirable global settings for QML web views 2016-02-02 15:19:47 -08:00
Bradley Austin Davis
f24f2749e1 Make users.js show QML window for edit friends 2016-02-02 15:19:12 -08:00
Anthony J. Thibault
6cc3b2b47f Fixed unused variable warnings on OSX and Linux 2016-02-02 15:04:28 -08:00
Bradley Austin Davis
cede14fdc6 Don't cut off title of windows without close icons 2016-02-02 14:32:04 -08:00
Anthony J. Thibault
656608e2ff Fixes for away.js 2016-02-02 12:08:52 -08:00
Bradley Austin Davis
5adf9adb0e Make mirror rectaqngle move with mirror controls 2016-02-02 12:00:17 -08:00
Anthony J. Thibault
c4e1509aa2 CharacterController: better debug support of internal state machine 
Head is no longer visible when flying fast, in first-person HMD mode.
 2016-02-02 11:26:18 -08:00
Anthony J. Thibault
2936811484 Added takeoff animation, WIP 
Character controller still has some jump/in-air bugs.
 2016-02-02 11:26:15 -08:00
Anthony J. Thibault
61c55ebf6c Updated character controller with a state enumeration 
Also, adjusted checkForSupport logic such that very slanted walls are not considered support.
 2016-02-02 11:26:15 -08:00
Anthony J. Thibault
e9fd439ffd Added inAir animations 2016-02-02 11:23:46 -08:00
Ryan Huffman
eff02d3e3a Fix Agents bidding on simulation ownership 2016-02-02 10:47:51 -08:00
Andrew Meadows
e394f64540 Merge pull request #6991 from seefo/master 
Added camera sensitivity dialog preferences
 2016-02-02 08:22:45 -08:00
James B. Pollack
8a70e53131 Merge pull request #7004 from jherico/qml 
Small QML fixes
 2016-02-01 19:08:38 -08:00
Seth Alves
1e69c12e87 move grab position to front of palm 2016-02-01 18:47:26 -08:00
Bradley Austin Davis
4860c7d4f1 Give title to tool window 2016-02-01 18:28:23 -08:00
Seth Alves
2501be16cb base palm position on finger joint rather than an offset from hand joint. double size of near-grab sphere 2016-02-01 18:11:27 -08:00
Seth Alves
8d8e3520d5 Merge pull request #7007 from samcake/hdr 
Fixing the darkening rendering bug
 2016-02-01 16:46:32 -08:00
samcake
e645f8a1f1 FIxing the rendering bug, current zone enity lighting and skybox were not applied anymore 2016-02-01 16:25:55 -08:00
Brad Davis
1d4dc636af Merge pull request #7002 from hyperlogic/tony/qml-overlay-delete-fix 
QmlOverlay: Fix for issue use after delete
 2016-02-01 16:03:58 -08:00
Brad Davis
3fcea102ed Remove unused variable 2016-02-01 16:03:47 -08:00
Anthony J. Thibault
bea5ced3eb QmlOverlay: remove unnecessary capture by value sigil from lambda 2016-02-01 15:46:49 -08:00
Anthony J. Thibault
db5e750fd7 Removed debug code 2016-02-01 15:45:57 -08:00
Bradley Austin Davis
c71a20b2f0 Move a QML window to the center of the desktop if it's completely off 2016-02-01 15:34:13 -08:00
Bradley Austin Davis
4393a754e2 File dialog polish 2016-02-01 15:34:10 -08:00
Bradley Austin Davis
9da0181b72 Don't try to be clever with coloring table rows 2016-02-01 15:34:07 -08:00
Bradley Austin Davis
093ccb483d FontAwseome button polish 2016-02-01 15:34:04 -08:00
Bradley Austin Davis
4b9e5746cd Removing some runtime warnings about null values 2016-02-01 15:34:01 -08:00
Bradley Austin Davis
7938270802 Fix modal frame decoration 2016-02-01 15:33:58 -08:00
Anthony J. Thibault
64b56207f2 QmlOverlay: Fix for issue use after delete 
Sometimes, it was possible to set the qmlElement bounds AFTER the qmlElement itself was deleted on another thread.
To fix this we use a shared_ptr to hold the qmlElement, then use a weak_ptr in the setProperties lambda, to verify that the qmlElement still exists.

The script that was previously causing this code to fail is: "users.js".
Because, it creates a textSizeOverlay then immediately deletes it.
 2016-02-01 14:20:29 -08:00
samcake
1b52d700a0 Merge pull request #6871 from Atlante45/feat/draw-call-info 
Unify normal and named draw paths
 2016-02-01 14:19:15 -08:00
Brad Hefta-Gaub
6779bc4073 Merge pull request #7000 from jherico/qml 
Snapshot UI in QML
 2016-02-01 14:00:25 -08:00
Brad Hefta-Gaub
711787a997 Merge pull request #6981 from howard-stearns/animate-iff-visible-with-step2-billboard-removal 
Animate iff visible with step2 billboard removal
 2016-02-01 13:54:25 -08:00
Brad Davis
27c38599a9 Snapshot dialogs 2016-02-01 11:07:48 -08:00
Brad Davis
eb7988e4ef Cleaning up unused code 2016-02-01 11:07:46 -08:00
Atlante45
7e8ea4dc77 Update primitive instance rendering calls 2016-02-01 18:50:01 +01:00
howard-stearns
277dbdbc37 Merge branch 'master' of https://github.com/highfidelity/hifi into better-head-joint-setup 2016-02-01 09:35:30 -08:00
Seth Alves
753fc44c12 Merge pull request #6996 from thoys/hydra-scaling-fix 
Fix for controller palm movement for scaled avatars
 2016-02-01 09:17:22 -08:00
Seth Alves
b553c8400d Merge pull request #6988 from huffman/market-import-fail 
Fix marketplace imports failing silently if edit.js not running
 2016-02-01 07:06:34 -08:00
Babiuch, Ryan Nicholas
47f7d55e2c Working energy usage for entity manipulation. 
- Working example in examples/example/ui/MyEnergyBar.js
 2016-02-01 08:32:52 -06:00
Thijs Wenker
8f6e7018bd Fix for Hydra scaling 
This PR fixes the hydra (and probably other hand controllers) while scaling.

Testing notes:
- Enable your hydra's
- Grow your avatar (x5 or x10) (With the `+` key)
- Spreading your arms in a T-pose should work without any scaling issues
- Reset your scale using the `=` key
 2016-01-31 23:39:43 +01:00
Seefo
07043d537f Fixed Ubuntu warnings 2016-01-29 21:11:44 -05:00
Seefo
0fad9b6755 Changed literals to follow coding standard 2016-01-29 20:07:45 -05:00
Seefo
56c3a37cdd Fixed indentation 2016-01-29 19:59:28 -05:00
Seefo
77050b13dc Adjusted default pitch/yaw speed 2016-01-29 19:41:34 -05:00
Seefo
33a01819e3 Fixed indentation 2016-01-29 19:36:23 -05:00
Seefo
ffa6687af3 Added setting dialogs for camera pitch and yaw 2016-01-29 19:34:57 -05:00
howard-stearns
ceed571c82 Look harder for head, log if not found, and compute what we need 
regardless.
 2016-01-29 16:02:58 -08:00
Seefo
22044db0b1 Readded center avatar in view option now that third person camera is fixed 2016-01-29 18:48:49 -05:00
Ryan Huffman
acf96a401f Fix marketplace imports failing silently if edit.js not running 2016-01-29 15:48:08 -08:00
David Rowe
e07baf916b Fixed a typo noticed in passing 2016-01-30 12:30:21 +13:00
David Rowe
a5bc1cfd19 Periodically store avatar location 2016-01-30 12:27:47 +13:00
David Rowe
d2cdbebc94 Store avatar location after a teleport 2016-01-30 12:26:50 +13:00
David Rowe
be4022983b Don't store avatar location immediately after a host change 
Because the avatar location is 0,0,0 rather than the end target.
 2016-01-30 12:25:56 +13:00
howard-stearns
9601b65269 Merge branch 'master' of https://github.com/highfidelity/hifi into animate-iff-visible 2016-01-29 11:40:13 -08:00
Brad Hefta-Gaub
721a911cf1 Merge pull request #6972 from jherico/qml 
Small QML Fixes
 2016-01-29 09:57:15 -08:00
Andrew Meadows
5bae01485e Merge pull request #6975 from hyperlogic/tony/update-standard-anims 
Update animations to use standard joint orientations
 2016-01-29 08:58:06 -08:00
Brad Hefta-Gaub
8efe15cb21 Merge pull request #6963 from jherico/qmlOverlays 
Make all 2D overlays QML-based
 2016-01-28 23:33:30 -08:00
Brad Davis
5b1971907c Move bookmarks to QML only dialogs 2016-01-28 21:20:43 -08:00
Brad Davis
c80193635b Update input dialog to support choice selection 2016-01-28 21:19:21 -08:00
Brad Davis
35211b7475 Add titles to modal dialogs, move z-order debug display to bottom of window 2016-01-28 21:18:14 -08:00
Brad Davis
afd3ddf534 Cleaning up message box 2016-01-28 21:17:05 -08:00
Brad Davis
ab56765ebd Add titles to windows 2016-01-28 17:52:22 -08:00
Brad Davis
e97850dd26 Merge pull request #6965 from ctrlaltdavid/20793 
Warn user if OpenGL version is too low (< 4.1)
 2016-01-28 20:39:56 -05:00
Brad Davis
5b2e739ef3 Fixing warning 2016-01-28 16:39:40 -08:00
Brad Davis
8c19b95ea2 Fix oversized text, invalid color handling 2016-01-28 16:36:28 -08:00
Brad Davis
72b264dcde Ensure toolbar z-order is always below windows 2016-01-28 16:03:27 -08:00
Brad Davis
06071c6493 Fixing build errors 2016-01-28 16:03:26 -08:00
Brad Davis
5b817ccc21 Make all 2D overlays QML 2016-01-28 16:03:26 -08:00
James B. Pollack
78d06ed32a Merge pull request #6952 from howard-stearns/avatar-preferences-chooser 
avatar preferences chooser modal web
 2016-01-28 16:01:53 -08:00
Brad Davis
aa03241dd9 Make all load script dialogs QML and respect previous script location 2016-01-28 15:53:04 -08:00
Brad Davis
db7e4eee8f Make Ctrl-O and 'Running Scripts->load file' follow the same code path 2016-01-28 15:52:11 -08:00
Brad Davis
1324525ecc Make file dialog compatible with QFileDialog::getOpenFile 2016-01-28 15:50:57 -08:00
Brad Davis
af1180aadb Fix combobox in modal windows 2016-01-28 15:47:42 -08:00
David Rowe
2020514974 Move OpenGLVersionChecker to gl library 2016-01-29 12:29:21 +13:00
David Rowe
b7134c75c3 Rename OpenGLInfo to OpenGLVersionChecker 2016-01-29 12:14:47 +13:00
Anthony J. Thibault
d743ea2c9b Changed urls from s3-us-west-1 to hifi-content.s3 2016-01-28 14:20:10 -08:00
Anthony J. Thibault
8710029604 Changed urls to http and updated hand poses. 2016-01-28 14:12:52 -08:00
Brad Davis
c41500f9d2 Running scripts can now show script URL 2016-01-28 12:21:44 -08:00
Brad Davis
04e6a5360a Renaming preference dialog variable 2016-01-28 10:29:21 -08:00
Brad Davis
18d6a09dc9 Better preferences dialog initial state 2016-01-28 09:20:31 -08:00
Brad Davis
d9651c6d4b Allow user browser to work with marketplace 2016-01-28 09:20:29 -08:00
David Rowe
af3d842e60 Warn user if OpenGL version is too low (< 4.1) 2016-01-28 15:25:00 +13:00
Anthony J. Thibault
4e4627d039 avatar-animation.json: Updated standard animations 2016-01-27 17:08:49 -08:00
howard-stearns
1225e50581 One round of billboard shredding. Server/wire/AvatarData have not been 
touched.
 2016-01-27 16:15:43 -08:00
Andrew Meadows
7b5c221ceb Merge pull request #6956 from hyperlogic/tony/velocity-fix 
MyAvatar: copy body velocity + hmd follow velocity onto avatar
 2016-01-27 14:59:46 -08:00
samcake
f4e0352f61 Merge pull request #6930 from zzmp/feat/bubble-render-settings 
Bubble up render settings from CPP to JS/QML
 2016-01-27 14:20:51 -08:00
howard-stearns
fa40e347ee Merge branch 'master' of https://github.com/highfidelity/hifi into animate-iff-visible 2016-01-27 13:35:02 -08:00
James B. Pollack
86b2a67f72 Merge pull request #6891 from sethalves/avatar-updates-query-cube 
Avatar updates query cube
 2016-01-27 13:04:03 -08:00
Anthony J. Thibault
c771c925c8 MyAvatar: copy body velocity + hmd follow velocity onto avatar 
This was inadvertently removed in a previous PR.

https://github.com/highfidelity/hifi/pull/6895

Also, renamed Velocity stat to Speed.
 2016-01-27 11:20:32 -08:00
Howard Stearns
0d257b82fa Merge pull request #6934 from hyperlogic/tony/anim-pre-post-rot-support 
Avatar Developer Menu: added animation debug options
 2016-01-27 10:39:25 -08:00
Brad Davis
f53aaa1d64 Removing old attachment dialog, updating menu code 2016-01-26 21:55:42 -08:00
Brad Davis
2956557c5f Adding overlay compatible combo-box 2016-01-26 21:55:41 -08:00
Brad Davis
664100b9b1 Attachment dialog 2016-01-26 21:55:40 -08:00
Howard Stearns
91b0f69312 When the avatar marketplace is chosen from avatar preferences, let it be moveable so that the user can move it aside to see their avatar. 2016-01-26 21:02:16 -08:00
Zach Pomerantz
e770d7b679 Add PhysicsShowOwned back to Menu 2016-01-26 18:56:52 -08:00
Brad Davis
0a6be80578 Added some disabled modal focus protection code 2016-01-26 18:50:55 -08:00
Brad Davis
fbee221966 Fix tool window breaking when visible while edit.js reloads 2016-01-26 18:15:41 -08:00
Brad Davis
9a8d56da77 Center new windows without a defined position 2016-01-26 17:25:36 -08:00
Brad Davis
cea57a111b Desktop cleanup 2016-01-26 16:56:33 -08:00
Brad Davis
8dc066fc00 Fix the recursive launching of load script from URL 2016-01-26 16:49:23 -08:00
Zach Pomerantz
5009e8702e Cleanup new render settings 2016-01-26 15:58:50 -08:00
Seth Alves
1cc0aa18bb Merge branch 'master' of github.com:highfidelity/hifi into avatar-updates-query-cube 2016-01-26 13:31:07 -08:00
Seth Alves
1fefe0fa0e when an avatar moves a child entity around, it has to invoke MovingEntitiesOperator to keep the local octree up-to-date 2016-01-26 13:30:55 -08:00
howard-stearns
e145cf60be cleanup init 2016-01-26 13:01:29 -08:00
Zach Pomerantz
2da2bc60db Tie shadow frustum to boom offset 2016-01-26 12:26:16 -08:00
howard-stearns
2e7f1cbb3f Align avatar animation with LOD visibility. 2016-01-26 11:59:18 -08:00
Anthony J. Thibault
3cee3cbb5a Avatar Developer Menu: added animation debug options 
This options are for for developers only and might help debug animation related issues.

* Enable Inverse Kinematics: this can be toggled to disable IK for the avatar.
* Enable Anim Pre and Post Rotations: this option can be used to use FBX pre-rotations from source avatar animations, instead of the current default, which is to use them from the source model.
  This only effects FBX files loaded by the animation system, it does not affect changing model orientations via JavaScript.
 2016-01-25 18:52:13 -08:00
Zach Pomerantz
bed325d675 Add Graphics to general settings 2016-01-25 15:17:43 -08:00
howard-stearns
cd44094efa When user is asked about disk cache, allow them to say no. 2016-01-25 14:46:11 -08:00
howard-stearns
6928984448 remaining Application message boxes, EXCEPT asset upload, which has a 
checkbox.
 2016-01-25 14:45:26 -08:00
howard-stearns
eb19f293c4 Fix askToSetAvatarUrl dialogs to use new style. 2016-01-25 14:04:06 -08:00
Brad Davis
1c97e15757 Fix overlay message dialog 2016-01-25 13:30:05 -08:00