Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-01 16:43:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
55530 commits 25 branches 0 tags 1.1 GiB
Commit graph

158 commits

Author SHA1 Message Date
Vladyslav Stelmakhovskyi
bcee25acc7 Make sure that there is only one connection created for web events, so downloads from CLARA IO not duplicated 2017-05-28 19:54:41 +02:00
Triplelexx
c678fd67ed change default particle texture to production 2017-05-17 14:52:11 +01:00
Triplelexx
5a742002e2 change default particle values 2017-05-16 23:39:38 +01:00
Triplelexx
7edda87330 change default particle to wispy smoke 2017-05-11 01:21:42 +01:00
Triplelexx
fae51c5c46 change default particle texture to production 2017-05-06 20:12:09 +01:00
Triplelexx
0d21d7108e change default particle properties 2017-05-04 19:27:43 +01:00
Vladyslav Stelmakhovskyi
1916eafc41 Trigger rebuild 2017-04-27 16:02:47 +02:00
Vladyslav Stelmakhovskyi
0d53b82326 Renamed EDIT to CREATE 2017-04-27 09:30:00 +02:00
Zach Fox
9ace7a7488 Merge pull request #10279 from andrewd440/21174 
21174 Make the Particle Emitter Easier to Use
 2017-04-26 15:35:29 -07:00
Triplelexx
e295ab2778 change location of menu item Create Entities As Grabbable 2017-04-26 21:13:39 +01:00
Triplelexx
06b3b84145 changes from CR 2017-04-26 18:50:15 +01:00
Triplelexx
01b11022e3 add menu item to control grabbable setting on newly created entites 2017-04-26 07:26:00 +01:00
Triplelexx
d689a43678 changes from CR 2017-04-24 22:07:51 +01:00
Triplelexx
d63c4d11c7 enable grabbable property for all newly created entities 2017-04-24 21:33:08 +01:00
Andrew Lowry
aea89824c5 Switches tablet edit tab to particle explorer when particle entities are 
selected or created.
 2017-04-24 13:35:37 -04:00
Andrew Lowry
ecf3826050 Always show hand lasers when in edit mode. 2017-04-24 13:35:37 -04:00
Andrew Lowry
8479d835b2 Adds laser selection of particle systems while in edit mode in HMD. 2017-04-24 13:35:37 -04:00
David Rowe
6a23f3a59b Remove some dead code noticed in passing 2017-04-01 11:25:42 +13:00
Seth Alves
902e3d41d6 merge from upstream 2017-03-24 08:20:35 -07:00
Triplelexx
a964edee91 change all references of Quat.getFront to Quat.getForward in scripts directory 2017-03-21 22:25:30 +00:00
Seth Alves
04a334fd07 unmangle merge 2017-03-21 11:02:18 -08:00
Seth Alves
1da6349505 merge from upstream 2017-03-21 10:26:02 -07:00
Brad Hefta-Gaub
b7f48644af Merge pull request #9955 from druiz17/tablet-edit-selecting 
Fix edit.js from deselecting an object when trying to delete it
 2017-03-21 09:27:30 -07:00
Dante Ruiz
de24023a21 Fix edit.js from deselecting an object when trying to delete it 2017-03-20 20:43:32 +01:00
Ryan Huffman
df644edde4 Fix hand controller not able to select light/particle icons 2017-03-20 09:45:50 -07:00
Faye Li
6531efffbc hook up qml button to edit.js 2017-03-17 11:22:07 -07:00
Ryan Huffman
8246dbafab Update particle explorer to work outside of entity list 2017-03-13 15:15:36 -07:00
Ryan Huffman
9880d40cfb Update edit.js light icons to now use the name entityIcon 2017-03-13 14:38:56 -07:00
Ryan Huffman
b7783dcffe Update edit.js light/particle overlays to be clickable when behind something 2017-03-13 11:26:34 -07:00
Ryan Huffman
86116aaad7 Update light/particel icons to be shown by default in edit mode 2017-03-13 10:10:53 -07:00
Ryan Huffman
ce5ee42961 Update LightOverlayManager to work with particles 2017-03-13 10:10:53 -07:00
Seth Alves
d792559d9a have edit.js resend properties of selected entity to entityProperties.js once it's ready 2017-03-10 09:59:23 -08:00
Seth Alves
3b581a8dfe merge from upstream 2017-03-02 16:35:44 -08:00
Seth Alves
10cb7aab06 Merge pull request #9684 from Menithal/parent-hotkey 
WL#20856 Added Parenting Hotkeys to Edit.js Among Visual tweaks
 2017-03-02 16:30:43 -08:00
Seth Alves
f321ffdf91 don't clear EDIT_SETTING flag when creating new entities 2017-03-02 13:00:52 -08:00
Menithal
91fa871d55 Merge branch 'parent-hotkey' of mgit:Menithal/hifi into parent-hotkey 2017-03-02 21:40:45 +02:00
Menithal
9c31f66b75 Addressed CR of 9684 2017-03-02 21:39:56 +02:00
Matti Lahtinen
b1639ee3aa Removed a Stray Print json that would spam logs. 2017-02-27 23:40:06 +02:00
Seth Alves
70060eb464 in 2d mode, clicks on tablet don't get used for other things 
Conflicts:
	scripts/system/libraries/entitySelectionTool.js
 2017-02-24 11:37:04 -08:00
Seth Alves
e43c4c17f5 in 2d mode, clicks on tablet don't get used for other things 2017-02-23 21:27:25 -08:00
Seth Alves
5bff2034c3 cleanups, attempt to get particle explorer to work right 2017-02-22 12:07:18 -08:00
Menithal
d9f86612de Fixed view toggle, Added new Notifications 
- View Toggle now only toggles if no other modifiers are pressed
- More notification, and cases for notification
   - Parenting to existing parent
   - Unparenting when there is no parent
   - Unparenting single entities
 2017-02-19 20:18:11 +02:00
Menithal
2a4b493de5 Changed order on Menu 2017-02-19 18:24:56 +02:00
Menithal
f3c806e910 Revert of hotkey detection, removed menu hotkeys 
- Holding hotkeys will no longer spam parent events rapidly, detects only
  the release
 2017-02-18 18:33:00 +02:00
Menithal
0df6305f90 Revert removal of hotkey from js event 2017-02-18 18:22:01 +02:00
Menithal
dcbe3c622d Added Hotkey Listening to the webview 
Ctrl + P and Ctrl + Shift + P are now available even if the edit window
has been selected
 2017-02-18 11:51:19 +02:00
Menithal
f5d266a562 Updated 2017-02-17 23:28:28 +02:00
Menithal
afbf4bc30f Fixed Parenting/Unparenting Menu Removal and Binding 2017-02-16 10:52:42 +02:00
Menithal
d96f95a7e9 Updated edit.js and selection tool 
Last selected entity will now be yellow instead of orange
 2017-02-16 10:05:59 +02:00
Seth Alves
3d7733219c edit's open-asset-browser button works, again 2017-02-15 16:15:18 -08:00