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

14610 commits

Author SHA1 Message Date
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
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
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
Philip Rosedale
a98efbc660 Merge pull request #6997 from jagwire/WorkingEnergy 
Working energy usage for entity manipulation.
 2016-02-05 17:17:45 -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
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
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
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
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
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
Seth Alves
1e69c12e87 move grab position to front of palm 2016-02-01 18:47:26 -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
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
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
5b2e739ef3 Fixing warning 2016-01-28 16:39:40 -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
Brad Davis
aa03241dd9 Make all load script dialogs QML and respect previous script location 2016-01-28 15:53:04 -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
David Rowe
af3d842e60 Warn user if OpenGL version is too low (< 4.1) 2016-01-28 15:25:00 +13: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
664100b9b1 Attachment dialog 2016-01-26 21:55:40 -08:00