Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-19 12:04:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
69654 commits 69 branches 56 tags 1.2 GiB
Commit graph

6090 commits

Author SHA1 Message Date
David Back
8f1ad8e367
Merge pull request #13538 from dback2/editHandleMacFix 
Edit handle undefined event fix
 2018-07-09 12:08:18 -07:00
John Conklin II
79b2858220
Merge pull request #13543 from ctrlaltdavid/M16392 
Create snap-to-grid and translation fixes
 2018-07-09 11:39:26 -07:00
David Back
d4f43a56f2
Merge pull request #13556 from dback2/deselectInput 
Change deselecting entities to Ctrl + D and prevent W/A/S/D/E/Q movements with Ctrl
 2018-07-09 10:40:33 -07:00
David Back
17220b9360
Merge pull request #13549 from dback2/parentChildCopy 
Re-parent entities after duplicating and duplicate children with parents
 2018-07-09 10:06:18 -07:00
David Back
3bcc727d47 check controller triggered in checkControllerMove 2018-07-06 18:57:32 -07:00
David Back
f33fae30ed Merge branch 'editHandleMacFix' of github.com:dback2/hifi into editHandleMacFix 2018-07-06 18:56:09 -07:00
David Back
d04c2eaf73 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleMacFix 2018-07-06 18:01:16 -07:00
David Back
f815ad1ddd tabs 2018-07-06 17:02:41 -07:00
David Back
c271e1aae4 fix triggering at non-web overlays 2018-07-06 17:02:29 -07:00
David Back
a546d8b279 tabs 2018-07-06 15:48:53 -07:00
David Back
33e170315c recurse on children of children 2018-07-06 15:39:18 -07:00
David Back
a415d1eb37 Merge branch 'master' of https://github.com/highfidelity/hifi into parentChildCopy 2018-07-06 14:32:17 -07:00
John Conklin II
6e13b0e141
Merge pull request #13453 from gcalero/web_overlay_android 
Support web3d overlays in android
 2018-07-06 13:02:56 -07:00
John Conklin II
7aaf17a3c8
Merge pull request #13496 from thoys/feat/interactive-window 
InteractiveWindow scripting API
 2018-07-06 10:58:12 -07:00
David Back
169d40c3c1 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleMacFix 2018-07-06 10:55:04 -07:00
David Rowe
1a18d3305e Code review 2018-07-06 17:03:30 +12:00
David Back
4763ccf1ec Merge branch 'master' of https://github.com/highfidelity/hifi into deselectInput 2018-07-05 14:53:21 -07:00
David Back
2bcc96269e comments, fix doubles in list, fix re-parenting to 0 2018-07-05 13:10:56 -07:00
John Conklin II
dfa0b96a93
Merge pull request #13546 from sethalves/fix-display-controller-buttons 
keep buttons from drifing away from in-world display of controllers
 2018-07-05 13:09:07 -07:00
David Back
fbe670d8c0 also copy unselected children 2018-07-05 12:43:37 -07:00
David Back
1cc79f0e7c renaming 2018-07-05 12:07:13 -07:00
David Back
25d55b9cc5 tabs 2018-07-05 11:59:05 -07:00
David Back
40fec8a318 reparent after duplication 2018-07-05 11:58:45 -07:00
Seth Alves
73071df857 when displaying the in-world controller model, make buttons and joysticks be children of the base controller model, rather than children of the avatar 2018-07-05 10:07:49 -07:00
David Back
2e70853ffc
Merge branch 'master' into editHandleMacFix 2018-07-05 09:51:56 -07:00
Zach Fox
01c4b57d11
Merge pull request #13539 from zfox23/MS16413_snapPrintFall 
Implement MS16413: Improve angularVelocity of printed Snaps
 2018-07-05 09:50:06 -07:00
David Rowe
a642324a11 Fix oscillating positions as translate when snapping to grid 2018-07-05 11:58:48 +12:00
David Rowe
9709599c1a Fix translation handle not following mouse at some view angles 2018-07-05 11:47:34 +12:00
David Rowe
94c097fc39 Fix entity y value jumping when translate with grid snapping enabled 2018-07-05 11:42:37 +12:00
David Rowe
b00d07b029 ESLint 2018-07-05 10:50:08 +12:00
Thijs Wenker
3a32472b0b added test / more docs 2018-07-04 02:49:20 +02:00
Thijs Wenker
446b82abd6
Merge pull request #13410 from dback2/editHandleToggleFix 
Fix toggling edit handles between local/world space
 2018-07-04 00:23:21 +02:00
David Back
986864fc53 ctrl D for deselect 2018-07-03 15:09:11 -07:00
Zach Fox
6efb895708 Implement MS16413: Improve angularVelocity of printed Snaps 2018-07-03 13:43:04 -07:00
David Back
afbe64ec11 missing bracket 2018-07-03 13:32:11 -07:00
David Back
2af0f05cb4 tabs 2018-07-03 12:40:19 -07:00
David Back
ed4d0f2577 early-out if event undefined 2018-07-03 12:39:41 -07:00
Seth Alves
62ec693280
Merge pull request #13526 from wayne-chen/fixStillOnlySnap-case-15860 
fixing still only snap in snap app
 2018-07-03 11:36:25 -07:00
Wayne Chen
2bbc5b6137 remove ray pick print statement - it bloats the debug window 2018-07-03 09:11:57 -07:00
Wayne Chen
aefa52b4c9 fixing still only snap in snap app 2018-07-02 17:00:31 -07:00
John Conklin II
94ab0c71b2
Merge pull request #13040 from 1P-Cusack/BugFix_EntityListException_20180427 
[BugFix] EntityList UncaughtException in that.sendUpdate
 2018-07-02 12:35:20 -07:00
John Conklin II
d9a3676c7c
Merge pull request #13493 from alexiamandeville/sittingUpdate 
Resolving issue where VR input for movement stops emotes
 2018-07-02 12:30:50 -07:00
David Back
e1de226aae change toggle input to t 2018-07-02 11:11:02 -07:00
David Back
122b385dd3 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleToggleFix 2018-07-02 10:57:47 -07:00
David Back
fd4a8fdd83 fix color NaN check 2018-06-29 15:33:55 -07:00
Gabriel Calero
a6d093d8c9 Merge remote-tracking branch 'upstream/master' into web_overlay_android 2018-06-29 15:09:32 -03:00
David Back
328bf37f64 Merge branch 'master' of https://github.com/highfidelity/hifi into particleExplorerOptionalPropFix 2018-06-29 10:34:17 -07:00
David Back
6f0ac32344 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleToggleFix 2018-06-28 17:32:18 -07:00
David Back
7b9341954f Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleToggleFix 2018-06-28 12:10:42 -07:00
Zach Fox
2d27de12bd Fix MS14743: Change SNAP prints such that they don't fall through the floor 2018-06-28 12:06:31 -07:00