Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-07 07:19:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
58555 commits 70 branches 57 tags 1.2 GiB
Commit graph

3758 commits

Author SHA1 Message Date
David Rowe
cc0b95c70a Lint 2017-08-21 17:32:40 +12:00
David Rowe
fcf4831a3b Center Tools menu and options UI 2017-08-21 17:26:03 +12:00
David Rowe
0064c51610 Add "Finish" buttons for scale, clone, and delete tools 2017-08-21 16:24:55 +12:00
David Rowe
ca3eadb82f Don't display menu buttons when tool options panel open, and vice versa 2017-08-21 16:04:34 +12:00
David Rowe
e34e8ff2c0 Fix color circle and slider changes not being applied when coloring 2017-08-21 13:24:07 +12:00
David Rowe
cddb054066 Merge branch 'master' into vr-edit-h 
# Conflicts:
#	libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
#	scripts/system/controllers/handControllerGrab.js
 2017-08-20 18:41:29 +12:00
David Rowe
9434ef44c3 Delay physics kick in order to avoid some erratic behavior 2017-08-20 14:15:34 +12:00
Howard Stearns
188cbee781 Merge pull request #11212 from howard-stearns/asynchronous-commerce-2 
Asynchronous Ledger Interactions with Server
 2017-08-18 15:40:24 -07:00
anshuman64
a7090c7e07 Merge pull request #11211 from vladest/edit_clonable_lost 
Adopt cloneable settings to new styling
 2017-08-18 15:37:37 -07:00
Elisa Lupin-Jimenez
44f1f340e1 Merge pull request #11147 from elisa-lj11/blocks 
Adding Blocks Tablet App to Marketplace
 2017-08-18 15:06:18 -07:00
Sam Gondelman
cbf2bb3a61 Merge pull request #10980 from SamGondelman/sharks 
Reduce laser pointer lag
 2017-08-18 13:14:38 -07:00
vladest
d29d4b5016 Adopt clonable settings to new styling 2017-08-18 21:44:44 +02:00
SamGondelman
c9f4958925 handControllerGrab fix, maybe, hopefully 2017-08-18 10:39:40 -07:00
howard-stearns
6e34ab45d6 Merge branch 'master' of https://github.com/highfidelity/hifi into asynchronous-commerce-2 2017-08-18 10:03:33 -07:00
howard-stearns
3d401129fb checkpoint 2017-08-18 10:03:00 -07:00
David Rowe
c3f96b6727 Fix damping property name 2017-08-18 13:27:38 +12:00
David Rowe
5dd74d71fb Activate the color picker 2017-08-18 09:55:09 +12:00
Elisa Lupin-Jimenez
2b44608ece Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-08-17 10:18:40 -07:00
Elisa Lupin-Jimenez
4b1498f727 moved blocksApp.js to unpublished scripts, added icon 2017-08-17 10:18:29 -07:00
David Rowe
32113e84e4 Move color circle crosshairs witih laser 2017-08-17 14:45:47 +12:00
David Rowe
069102f68b Initial color circle UI elements 2017-08-17 13:59:56 +12:00
Chris Collins
9c9bcd80b8 Merge pull request #11191 from SamGondelman/logging 
Miscellaneous logging fixes
 2017-08-16 15:46:32 -07:00
David Rowe
35d06c0244 Make space for color circle 2017-08-17 10:12:28 +12:00
druiz17
8eabf46a30 Merge pull request #11165 from 1P-Cusack/FogBugz/Case_6491_Part1 
[Case 6491] Part 1 of entitySelectionTool clean up
 2017-08-16 13:05:27 -07:00
LaShonda Hopper
cc2ff565ac [Case 6491] Ran lint on entitySelectionTool.js (details below). 
Prior Issue Count: 35
Current Issue Count: 3

Resolved:
* 17 used out of scope issues.
* 11 already defined issues.
* 2 missing semicolon issues.
* 1 implicit comparison against null issue.
* 1 readability warning.

Remaining Issues as of this commit:
* scripts/system/libraries/entitySelectionTool.js: line 17, col 1, Read only.
** HIFI_PUBLIC_BUCKET assignment
* scripts/system/libraries/entitySelectionTool.js: line 19, col 1, Read only.
** SPACE_WORLD assignment
* scripts/system/libraries/entitySelectionTool.js: line 30, col 1, Read only.
** SelectionManager assignment

One notable item was a chunk of code from makeStretchTool's onMove
function which wasn't in scope of the vars being utilized.

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-08-16 15:21:30 -04:00
SamGondelman
86cc938a47 Merge remote-tracking branch 'upstream/master' into sharks 2017-08-16 09:54:12 -07:00
David Rowe
f1fe3be1f4 Merge branch 'master' into vr-edit-a 2017-08-17 00:13:08 +12:00
David Rowe
90c2036be7 Fix physics options labels being displayed when options pane opens 2017-08-17 00:08:09 +12:00
David Rowe
2287e16ea7 Set physics values per picklist items 2017-08-17 00:04:14 +12:00
David Rowe
2c2f866c82 Close picklist if click elsewhere 2017-08-16 21:33:34 +12:00
David Rowe
f9de451b30 Make picklist label display "CUSTOM" when slider value is changed 2017-08-16 21:11:10 +12:00
David Rowe
30e9b8ea45 Update picklist label when item is picked 2017-08-16 20:56:08 +12:00
David Rowe
bfaae7c220 Add picklist options 2017-08-16 20:22:24 +12:00
David Rowe
c705bb7fad Add picklist button 2017-08-16 14:55:44 +12:00
David Rowe
cca862b6ba Apply physics to just the root entity 2017-08-16 13:47:14 +12:00
David Rowe
b1938bafea Apply slider values to entities 2017-08-16 13:40:06 +12:00
Zach Fox
b7282cc776 Lots of fixes 2017-08-15 13:46:20 -07:00
Zach Fox
bddce9328b V1 2017-08-15 11:08:03 -07:00
Elisa Lupin-Jimenez
072f3dfb03 removed commented out code, removed blocks from default scripts 2017-08-15 10:25:14 -07:00
Elisa Lupin-Jimenez
3d7995da34 Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-08-15 10:01:24 -07:00
David Rowe
cb53ad43e0 Tidying 2017-08-15 18:16:21 +12:00
David Rowe
8d01c02c29 Tidy clearing color swatches 2017-08-15 17:54:21 +12:00
David Rowe
8cf18c1b03 Tidy applying color swatches 2017-08-15 17:47:59 +12:00
David Rowe
3a1fc1f11c Remember Physics slider values 2017-08-15 17:44:42 +12:00
SamGondelman
1c27335193 a couple logging fixes 2017-08-14 17:34:32 -07:00
David Rowe
504857a1b8 Set up Physics sliders 2017-08-15 10:23:36 +12:00
David Rowe
441ba15708 Fix swatch colors 2017-08-14 17:23:02 +12:00
David Rowe
71993972a2 Improve ungrouping behavior 2017-08-13 14:04:01 +12:00
David Rowe
bc00bcd02c For development testing, apply physics to the entity intersected 2017-08-12 16:59:28 +12:00
David Rowe
a5407398e7 Fix Group tool highlights not being cleared when switch to other tools 2017-08-12 16:21:55 +12:00