Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
33231 commits 29 branches 0 tags 1.1 GiB
Commit graph

33231 commits

This branch
This branch
All branches
Author SHA1 Message Date
Anthony J. Thibault
605da499c8 Updated english translation file 
Generated using the following command:

    ~/code/hifi > lupdate interface -ts interface/i18n/interface_en.ts
    Scanning directory 'interface'...
    Updating 'interface/i18n/interface_en.ts'...
        Found 146 source text(s) (130 new and 16 already existing)
        Kept 28 obsolete entries

NOTE: this translation file is far from complete, many menu strings from Menu.h do not show up in this list.
 2015-10-15 11:15:06 -07:00
Andrew Meadows
2ae62de84e Merge pull request #6026 from birarda/qt-polling-env 
set bearer poll timeout env for wlan scan in Qt 5.5
 2015-10-15 09:58:32 -07:00
Howard Stearns
2b32b23299 Merge pull request #6052 from thoys/JS_Rotation_FIX 
Fix avatar joint rotations / translations to be set by script
 2015-10-15 07:09:02 -07:00
Thijs Wenker
c99573ea64 Fixed support for calling setJointMumblers with joint name. Walk.js runs smooth now! 2015-10-15 15:35:35 +02:00
Thijs Wenker
8111432088 Merge branch 'master' of https://github.com/worklist/hifi into JS_Rotation_FIX 2015-10-15 14:50:20 +02:00
Clément Brisset
efd106e68c Merge pull request #6075 from birarda/default-asset-server 
add a migrator to move assets to ATP
 2015-10-14 17:02:10 -07:00
Andrew Meadows
982476d02b Merge pull request #6076 from hyperlogic/tony/turn-hips-while-moving 
Rotate the avatar to align with the HMD while moving
 2015-10-14 15:09:39 -07:00
samcake
4554d65230 Merge pull request #6077 from ZappoMan/monoOculusPreview 
basic mono preview for the oculus display plugin
 2015-10-14 15:07:46 -07:00
Anthony J. Thibault
3e7a6fd490 Change to boom offset for 3rd person HMD camera. 
Previously the boom offset was computed in HMD sensor space instead of
world space, so it did not play well with the vive, or the oculus
if you weren't facing the camera directly.

Now it is computed in world space, and is always behind the character's
position/orientation.  This can cause the boom to swing if the character
rotation changes but now the avatar rotation in HMD uses comfort mode.
It's not that disorienting.
 2015-10-14 14:43:59 -07:00
Anthony J. Thibault
1c1221597d Merge branch 'master' into tony/turn-hips-while-moving 2015-10-13 18:38:27 -07:00
Brad Hefta-Gaub
c4af4c7b10 basic mono preview for the oculus display plugin 2015-10-13 17:45:29 -07:00
Anthony J. Thibault
e484a904a2 Rotate the avatar to align with the HMD while moving 
MyAvatar: refactored updateFromHMDSensorMatrix() a bit by splitting it into several methods, because
it was getting quite large and becoming hard to follow.

* beginStraighteningLean() - can be called when we would like to trigger a re-centering action.
* shouldBeginStraighteningLean() - contains some of the logic to decide if we should begin a re-centering action.
  for now it encapulates the capsule check.
* processStraighteningLean() - performs the actual re-centering calculation.

New code was added to MyAvatar::updateFromHMDSensorMatrix() to trigger re-centering when the avatar speed rises
over a threshold.

Secondly the Rig::computeMotionAnimationState() state machine for animGraph added a state change hysteresis
of 100ms.  This hysteresis should help smooth over two issues.

1) When the delta position is 0, because the physics timestep was not evaluated.
2) During re-centering due to desired motion, the avatar velocity can fluctuate causing undesired animation state fluctuation.
 2015-10-13 17:36:00 -07:00
Andrew Meadows
073b019458 Merge pull request #6072 from howard-stearns/skip-some-reload-recenter-on-startup 
Don't reload/recenter some avatar data on startup
 2015-10-13 17:08:00 -07:00
Stephen Birarda
d84994d8e0 fix casing for ubuntu include failure 2015-10-13 17:04:45 -07:00
Stephen Birarda
2caa7f6d64 change getUrl to getATPUrl, use in ATPAssetMigrator 2015-10-13 16:56:20 -07:00
Stephen Birarda
574089530a make sure request is not nullptr before using it 2015-10-13 16:49:12 -07:00
Andrew Meadows
a331edcee9 Merge pull request #6073 from ZappoMan/comfortModeHack 
implement comfort mode hack
 2015-10-13 16:47:45 -07:00
Stephen Birarda
d22c602041 use categorized logging in ATPAssetMigrator 2015-10-13 16:44:13 -07:00
Stephen Birarda
cc93767077 remove some extra spaces 2015-10-13 16:38:00 -07:00
Stephen Birarda
76bfc6218a add back block removed in merge 2015-10-13 16:36:10 -07:00
Brad Hefta-Gaub
8a2e23cae4 CR feedback 2015-10-13 16:20:52 -07:00
Stephen Birarda
1450305390 fix ATP url scheme constant 2015-10-13 16:13:47 -07:00
Stephen Birarda
fc82ea8541 resolve conflicts on merge with upstream/master 2015-10-13 16:12:54 -07:00
Stephen Birarda
c328941b9d Merge pull request #6074 from huffman/fix-empty-hash 
Fix crash when atp url is empty
 2015-10-13 16:02:28 -07:00
Stephen Birarda
549043f255 add an option to bulk upload assets in ATPAssetMigrator 2015-10-13 15:20:37 -07:00
Ryan Huffman
c468cabe7e Fix crash when atp url is empty 2015-10-13 15:12:01 -07:00
Brad Hefta-Gaub
ad96d76921 implement comfort mode hack 2015-10-13 15:06:11 -07:00
James B. Pollack
5f36972cfc Merge pull request #6071 from imgntn/invert_solids 
[Scripts] Toybox Updates
 2015-10-13 13:48:31 -07:00
Howard Stearns
93e908a592 Don't reload/recenter some avatar data on startup, when we don't necessarilly have all the required data initialized. 2015-10-13 12:15:13 -07:00
Stephen Birarda
65976f7891 add saving of entity file to ATPAssetMigrator 2015-10-13 10:51:57 -07:00
James B. Pollack
c84d2fc36a fix target script url 2015-10-13 10:44:43 -07:00
Stephen Birarda
cf74cfb50e add an ATPAssetMigrator for bulk ATP migration 2015-10-13 10:38:52 -07:00
James B. Pollack
309cde7f28 invert solidity of most toybox objects while held 2015-10-13 10:31:36 -07:00
James B. Pollack
0f2ad8dd49 Merge branch 'wall_targets_2' into invert_solids 2015-10-13 10:15:48 -07:00
James B. Pollack
8d9bcbd793 Merge pull request #6067 from hyperlogic/tony/remove-middle-mouse-overlay-toggle 
Remove overlay hiding from middle mouse button.
 2015-10-13 10:14:15 -07:00
Andrew Meadows
ef3775c44d Merge pull request #6059 from Atlante45/warning 
Fix warning
 2015-10-13 08:39:42 -07:00
Brad Hefta-Gaub
8e8ba15aaa Merge pull request #6065 from sethalves/reorder-sims 
grab changes
 2015-10-13 08:35:38 -07:00
Andrew Meadows
25685f97eb Merge pull request #6062 from howard-stearns/fix-startup-position-failure 
fix-startup-position-failure
 2015-10-13 08:34:33 -07:00
Anthony J. Thibault
6a8ff676ed Remove overlay hiding from middle mouse button. 
Because it conflicts with edit.js camera panning.
You can still toggle the overlay via the O key.
 2015-10-12 17:33:27 -07:00
Eric Levin
12548df0a3 Merge pull request #6060 from imgntn/lighting_explorer 
[Scripts] Fix Edit.js bug that would lock Entity camera in orbit or pan mode
 2015-10-12 17:30:27 -07:00
Clément Brisset
3e65c3bc35 Merge pull request #6064 from birarda/default-asset-server 
turn on the asset server by default
 2015-10-12 17:21:33 -07:00
Howard Stearns
e8b074c85c Merge pull request #6031 from AndrewMeadows/ik-moves-hips 
IK moves hips
 2015-10-12 17:03:33 -07:00
James B. Pollack
0f998e81af add min reset distance 2015-10-12 17:03:32 -07:00
James B. Pollack
fc8a4f4f2d cleanup 2015-10-12 17:00:49 -07:00
James B. Pollack
02620c4b0d make targets ungrabbable 2015-10-12 16:59:42 -07:00
Seth Alves
f0ce698d78 switch back to springy grab 2015-10-12 16:57:20 -07:00
Stephen Birarda
60f5a06308 turn on the asset-server by default 2015-10-12 16:44:51 -07:00
Stephen Birarda
8240dff03f Merge pull request #6061 from Atlante45/asset-drop 
Asset drop
 2015-10-12 16:37:50 -07:00
James B. Pollack
bc4200d8d7 push last positions to array 2015-10-12 16:35:06 -07:00
James B. Pollack
47471e837f reset targets once they have stopped moving 2015-10-12 16:31:36 -07:00