Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 14:43:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
57452 commits 25 branches 0 tags 1.1 GiB
Commit graph

57452 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Rowe
233655b76b Split script into multiple files 2017-07-22 11:20:17 +12:00
David Rowe
7e4e68ccf9 Fix highlight overlay sometimes being out of position 2017-07-21 14:52:24 +12:00
David Rowe
f858abcf7c Resume app from idle state 2017-07-21 14:31:15 +12:00
David Rowe
218b13b0e9 Turn off laser when grabbing or scaling with hand 2017-07-21 14:17:50 +12:00
David Rowe
1434f98dab Fix multi-selection scale handles box after toggling while grabbed 2017-07-21 13:49:26 +12:00
David Rowe
cf51c546d3 Fix direct scaling scale and position 2017-07-21 13:43:20 +12:00
David Rowe
e09113fef5 Fix handle scaling down to very small dimensions 2017-07-21 13:18:10 +12:00
David Rowe
e2cace2372 Fix laser not turning off when lose controller tracking 2017-07-20 22:29:13 +12:00
David Rowe
da97662ee1 Make hovered handles brighter 2017-07-20 22:23:48 +12:00
David Rowe
1009b67600 Fix unhandled state condition 2017-07-20 21:38:03 +12:00
David Rowe
3b966072a3 Fix grabbing a handle without hovering entity beforehand 2017-07-20 21:30:39 +12:00
David Rowe
571d10fa89 Improve editor state update code 2017-07-20 21:05:21 +12:00
David Rowe
880a711d2b Prevent invalid direct / handle scaling transition while scaling 2017-07-20 18:36:02 +12:00
David Rowe
5551bb70d4 Disable collisions and dynamic behavior while entities are being moved 2017-07-20 18:33:23 +12:00
David Rowe
c57b51235e Merge branch 'master' into vr-edit-a 
# Conflicts:
#	scripts/system/controllers/handControllerGrab.js
 2017-07-19 18:56:04 +12:00
David Rowe
2bd3f87d73 Tidying 2017-07-19 18:11:45 +12:00
David Rowe
e4123070c4 Add handle scaling of multiple entities 2017-07-19 18:10:39 +12:00
David Rowe
f1fd6264f3 Fix handle scaling entity with non-center registration point 2017-07-19 17:51:36 +12:00
David Rowe
5cb5c71966 Avoid bounding box center calcs 2017-07-19 16:33:05 +12:00
David Rowe
ce6e711f2d Fix old scale handles displaying when switch hands 2017-07-19 12:12:20 +12:00
David Rowe
0f64da23bd Improve debug 2017-07-19 12:09:52 +12:00
Brad Hefta-Gaub
044b8fc19a Merge pull request #10993 from druiz17/bug-rogue-laser 
Do not show lasers when editing in 2D mode.
 2017-07-18 16:53:11 -07:00
Brad Davis
43476afff5 Merge pull request #10995 from AndrewMeadows/fix-debug-build 
fix broken debug build
 2017-07-18 16:00:18 -07:00
Brad Davis
90048cdb4b Merge pull request #10991 from jherico/minimized_deadlock 
Ensure we continue calling idle when minimized
 2017-07-18 15:59:28 -07:00
Andrew Meadows
8dafc30bf9 fix debug build: stub pure virtual function 2017-07-18 15:57:00 -07:00
Dante Ruiz
b3ec306063 better version 2017-07-18 23:48:21 +01:00
Clément Brisset
18be917358 Merge pull request #10574 from humbletim/21180 
CR #21180 Camera control app
 2017-07-18 15:35:32 -07:00
David Kelly
4d4d9421d3 Merge pull request #10983 from davidkelly/dk/marketplaceIDHack 
Get marketplaceID into imported entities
 2017-07-18 15:25:49 -07:00
Dante Ruiz
8cbe63f296 removed search laser in edit mode for 2d mode 2017-07-18 22:45:54 +01:00
Brad Davis
1aee8f1f4d Ensure we continue calling idle when minimized 2017-07-18 13:44:58 -07:00
Chris Collins
e99683fdcf Merge pull request #10985 from jherico/audio_deadlock 
Trying to resolve QML / Audio deadlocks
 2017-07-18 12:40:03 -07:00
Brad Hefta-Gaub
0ba9d65732 Merge pull request #10989 from druiz17/bug-whitespace-script-url 
Fixed not being able to load a script url that has a white space
 2017-07-18 11:39:10 -07:00
David Kelly
c4d5d16eb3 cr feedback 2017-07-18 11:12:06 -07:00
Andrew Meadows
6e59e451c4 Merge pull request #10986 from Atlante45/fix/avatar-audio-timer 
Use timer instead of dedicated thread to tick AC scripted avatar audio
 2017-07-18 10:25:35 -07:00
Andrew Meadows
888f2f64a5 Merge pull request #10981 from druiz17/bug/delete-avatar-entity 
Fixed not being able to delete avatar entities when switching domains
 2017-07-18 10:09:34 -07:00
Dante Ruiz
bcc15dd4ae Merge branch 'master' of github.com:highfidelity/hifi into bug-whitespace-script-url 2017-07-18 17:59:56 +01:00
Dante Ruiz
976fec66f8 fixed loading script whitespace 2017-07-18 17:59:42 +01:00
Clément Brisset
bcc9cf7c60 Merge pull request #10947 from Atlante45/fix/ignore-ac-crash 
Fix Avatar/Audio Mixer crash
 2017-07-18 09:59:30 -07:00
Brad Davis
9f13533560 Ensure input and output device containers are protected by mutex 2017-07-18 08:58:17 -07:00
Dante Ruiz
7fe47e4e2f Merge branch 'master' of github.com:highfidelity/hifi into bug/delete-avatar-entity 2017-07-18 16:51:41 +01:00
Dante Ruiz
d504000604 made requested changes 2017-07-18 16:51:21 +01:00
Brad Hefta-Gaub
2dfaf7b02a Merge pull request #10862 from NeetBhagat/5783-Restarting-Interface-allows-you-to-have-Avatar-Scale-Too-Big 
Case 5783: Restarting Interface allows you to have Avatar Scale Too Big
 2017-07-18 08:51:13 -07:00
Brad Hefta-Gaub
d94365cc44 Merge pull request #10979 from zfox23/hoverOverlay_lasers 
Create/Destroy Hover Overlays using hand controller lasers
 2017-07-18 08:44:48 -07:00
Brad Hefta-Gaub
a7e328285e Merge pull request #10969 from druiz17/bug/addmodel-textbox 
allow user move the cursor with the mouse for the add model URL textbox
 2017-07-18 08:41:08 -07:00
Brad Hefta-Gaub
0d504e57a9 Merge pull request #10984 from druiz17/bug/tablet-position 
trying new tablet spawn position.
 2017-07-18 08:07:56 -07:00
Andrew Meadows
5f4df0da2b Merge pull request #10847 from AndrewMeadows/entitymap 
faster EntityItem lookup by EntityItemID
 2017-07-18 08:04:37 -07:00
David Rowe
787815e939 Merge branch 'master' into vr-edit-a 2017-07-18 20:53:48 +12:00
David Rowe
4c98cd26a4 Fix corner handle scaling 2017-07-18 20:48:16 +12:00
David Rowe
3d69e240a9 Fix entity losing previous scale when resume direct scaling 2017-07-18 20:29:41 +12:00
David Rowe
485190456d Update handles when scale 2017-07-18 20:29:02 +12:00