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

33471 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
64c5cde2d2 further unmangle branch split 2015-10-15 10:33:58 -07:00
Seth Alves
a78728c96b further unmangle branch split 2015-10-15 10:29:25 -07:00
Seth Alves
e571cb7ca4 more lock adjustments 2015-10-15 10:22:25 -07:00
Seth Alves
8195145dc7 further unmangle branch split 2015-10-15 10:13:00 -07:00
ericrius1
55c68e0509 Merge branch 'master' into whiteboard 2015-10-15 10:08:32 -07:00
James B. Pollack
d8c979b9d4 add lifetime to lights created by flashlight 2015-10-15 10:07:21 -07:00
Seth Alves
d833fb08d7 further unmangle branch split 2015-10-15 10:03:32 -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
Andrew Meadows
fa17b77d70 move DIRTY_FLAGS out of EntityItem namespace 2015-10-15 09:34:09 -07:00
Seth Alves
c96f7562f2 Merge branch 'master' of github.com:highfidelity/hifi into groundwork-for-hold-action-changes 2015-10-15 09:28:57 -07:00
Seth Alves
7ef5fc9613 remove line that leaked over from other branch 2015-10-15 09:19:47 -07:00
Seth Alves
9f40c7bf8c fix up AvatarActionHold 2015-10-15 09:13:06 -07:00
Seth Alves
5ebefadda1 remove some debugging 2015-10-15 09:07:35 -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
James B. Pollack
c8b6fed0e0 Update ToolWindow.cpp 2015-10-14 21:18:17 -07:00
James B. Pollack
84973c590d Update ToolWindow.h 2015-10-14 21:17:19 -07:00
James B. Pollack
c18aeef6b3 remove redundant call 2015-10-14 17:29:38 -07:00
James B. Pollack
a1e2292e62 remove title bar from docked tool widgets 2015-10-14 17:27:45 -07:00
ericrius1
87439a049e Made color indicator thinner 2015-10-14 17:22:46 -07: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
ericrius1
5082ac4583 Added color status bar 2015-10-14 16:46:23 -07:00
ericrius1
4c709cba35 Fixed color indicator position 2015-10-14 16:17:57 -07:00
ericrius1
cfca0fe8c0 Adding a color indicator to whiteboard 2015-10-14 15:58:18 -07:00
James B. Pollack
536351e9d5 move set tab position to constructor 2015-10-14 15:10:04 -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
Seth Alves
21519c6418 debugging 2015-10-14 14:13:08 -07:00
Seth Alves
5ce39b74fd debugging 2015-10-14 13:58:19 -07:00
James B. Pollack
d45f48c8cd fixbug 2015-10-14 13:55:04 -07:00
Seth Alves
9a2aa9a337 locking 2015-10-14 13:40:20 -07:00
James B. Pollack
815b263954 convert tabs to spaces 2015-10-14 13:26:19 -07:00
Eric Levin
0b92bc11f6 fixed spacing 2015-10-14 13:26:10 -07:00
ericrius1
eb7b720945 got rid of whitespace 2015-10-14 13:24:22 -07:00
Thijs Wenker
7df5ba01e6 JSConsole: 
executeCommand works async now
 2015-10-14 22:21:51 +02:00
Seth Alves
9937b6a3ef quiet some debugging 2015-10-14 13:12:11 -07:00
Seth Alves
d72152da87 more locking 2015-10-14 13:01:56 -07:00
Seth Alves
07a4dc3a7f more lock fixing 2015-10-14 12:49:06 -07:00
Thijs Wenker
9d2ae661e1 removed some XML from start-script button which possible caused an error before 2015-10-14 21:10:52 +02:00
ericrius1
db5f7cac8d Fixed name of whiteboard entity script URL 2015-10-14 12:03:10 -07:00
Thijs Wenker
c585647f10 ScriptEditor Improvements: 
- fixed run icon
 2015-10-14 21:00:50 +02:00
ericrius1
c63ef10c67 got rid of query string 2015-10-14 11:50:35 -07:00
ericrius1
0991be3255 got rid of printing statements 2015-10-14 11:44:47 -07:00
ericrius1
22615dae07 Don't delete board on script close 2015-10-14 11:43:05 -07:00
Seth Alves
fa2bf2b2d9 tighten up locking in actions 2015-10-14 11:43:03 -07:00
ericrius1
6cd9bf407f Reverted handControllerGrab 2015-10-14 11:40:06 -07:00
Thijs Wenker
96b6067d88 ScriptEditor Improvements: 
- Script restart works proper again
- Fixed on and off icon switch
- Replaced regular script output box with fully functional JSConsole!
 2015-10-14 20:37:47 +02:00
James Pollack
7a8db803eb move toolwindow tabs to the top 2015-10-14 19:35:37 +01:00