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

483 commits

Author SHA1 Message Date
Atlante45
69fb830480 Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master 2018-03-08 17:23:17 -08:00
David Back
554c37d14b removed undefined event checks in scaling 2018-03-07 19:34:08 -08:00
David Back
9681f0eb77 restore old scale math, disable avatar collisions while scaling 2018-03-07 18:20:26 -08:00
David Back
2047437893 Merge branch 'RC65' of https://github.com/highfidelity/hifi into RC65 2018-03-07 10:30:18 -08:00
Dante Ruiz
2d448d7208 tablet scale and position changes 2018-03-07 10:02:35 -08:00
David Back
47e8e26255 CR indent fixes 2018-03-06 14:05:24 -08:00
David Back
b74be92fd8 redo scale handles to fix scaling into avatar collision causing chaos 2018-03-06 12:27:51 -08:00
Elisa Lupin-Jimenez
15c1f5ba30 fixed log spam undefined error 2018-03-06 11:01:50 -08:00
Dante Ruiz
5dc336bfae remove dead code and eslint files 2018-03-02 14:23:35 -08:00
Dante Ruiz
05fb3cfd9a fixing hyper link for entities 2018-03-02 14:03:24 -08:00
Dante Ruiz
1f4aed31f1 adding hyperlink 2018-03-01 16:16:47 -08:00
Elisa Lupin-Jimenez
b8fd640ddf fixed log spam undefined error 2018-02-27 16:44:45 -08:00
Seth Alves
c534e3a6e4
Merge pull request #12356 from ctrlaltdavid/21742 
Handle tablet entities and overlays not being available
 2018-02-22 08:48:13 -08:00
Seth Alves
db195c6184
Merge pull request #12334 from ctrlaltdavid/remove-deprecated-items 
Remove some deprecated JavaScript API items
 2018-02-21 16:31:16 -08:00
John Conklin II
6148c407a5
Merge pull request #12422 from misslivirose/fix-overlay-lines 
Show outline for zones when rotating
 2018-02-20 09:30:22 -08:00
Liv Erickson
175532c444 show outline for zones when rotating 2018-02-15 15:51:54 -08:00
Sam Gondelman
15cdfef16a
Merge branch 'master' into decals 2018-02-14 17:33:01 -08:00
Dante Ruiz
e14f46101b fix tablet rotation when switching into and out of create mode 2018-02-14 13:49:43 -08:00
SamGondelman
4500ed17e7 merge from master 2018-02-13 13:58:39 -08:00
David Rowe
b1f49be790 Merge branch 'master' into 21742 
# Conflicts:
#	scripts/system/libraries/entitySelectionTool.js
 2018-02-13 10:04:32 +13:00
David Rowe
033b85a3a8 Merge branch 'master' into remove-deprecated-items 
# Conflicts:
#	scripts/system/libraries/entitySelectionTool.js
 2018-02-13 09:42:40 +13:00
SamGondelman
5337377ef5 Merge remote-tracking branch 'upstream/master' into decals 2018-02-09 14:40:20 -08:00
John Conklin II
1d0e358246
Merge pull request #12234 from dback2/newEditGrab 
New Edit Selected Entity Manipulation Handles
 2018-02-09 12:23:34 -08:00
David Rowe
adb6f66a05 Handle tablet entities and overlays not being available 2018-02-08 09:51:48 +13:00
David Back
51b55aedcf CR changes, fix colors, add minimum overlay dimensions for HMD 2018-02-06 16:07:46 -08:00
Dante Ruiz
4f0ca6a904 fix lasers going to origin 2018-02-06 13:44:59 -08:00
David Rowe
0c0734a255 Remove unused Overlays property, borderSize, and associated code 2018-02-04 14:54:14 +13:00
David Rowe
8e2a3e8c99 Remove Overlays.getOverlayObject() from JavaScript API 2018-02-04 14:15:48 +13:00
David Back
ececd1c60f fix loop index change 2018-02-02 17:14:48 -08:00
David Back
ed4cbe2679 fix fill ring rotation 2018-02-02 17:05:25 -08:00
SamGondelman
d7f4b033e8 wip finish adding material entity 2018-02-02 16:49:33 -08:00
David Back
900669d937 fix multi-selection rotation yay! 2018-02-02 16:44:59 -08:00
David Back
55f55cd78b few more updates 2018-02-01 17:59:38 -08:00
David Back
db56246cd6 more fixes, clean up, updates 2018-02-01 17:30:56 -08:00
David Back
c01790bd3e punch list updates and various fixes 2018-01-31 18:27:15 -08:00
David Back
e679b75e99 fix degree display position 2018-01-29 19:02:36 -08:00
David Back
2f0d92c3cd ctrl 22.5 snapping 2018-01-29 18:15:01 -08:00
David Back
9ee7153641 fix scale speed, fix stretch panels, fix scale cube highlight 2018-01-29 16:53:02 -08:00
David Back
c4359de859 entity edit tools wip update 2018-01-19 18:20:36 -08:00
David Back
26bf78fb5d first pass new entity selection edit tools wip 2018-01-17 18:30:31 -08:00
Dante Ruiz
125eb9ce44 add new tablet model and adjust screen offset 2018-01-09 14:31:57 -08:00
David Rowe
4b2ed44322 Reduce incidence of tablet screen being rotated w.r.t. model 2018-01-05 16:16:42 +13:00
David Rowe
936b5f3571 Laser on tablet bezel as well as screen and "x" button 2018-01-05 16:15:59 +13:00
David Rowe
6e43497e14 Merge tag 'RELEASE-7602' into 21661 
Jenkins Git plugin tagging with RELEASE-7602
 2018-01-03 16:46:10 +13:00
Zach Fox
b81cdf49ef Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-12-11 09:52:32 -08:00
Zach Fox
a99072622a Fix Create mode :| 2017-12-08 15:41:47 -08:00
Zach Fox
a81a981676 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-12-08 09:44:52 -08:00
Seth Alves
86a1bc75c9
Merge pull request #11897 from Delanir/Gizmos 
IPD Secondary Task List: edit.js arrow orientation: Yaw, Pitch, Roll tools
 2017-12-08 07:09:09 -08:00
Zach Fox
b2bafed2bb Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-12-07 11:21:24 -08:00
Daniela
ef49aa0b71 Refactor to comply with code standard. 2017-11-29 18:54:08 +00:00