Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-22 17:03:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
42588 commits 25 branches 0 tags 1.1 GiB
Commit graph

354 commits

Author SHA1 Message Date
David Rowe
4189f46156 Make input text color change to black when selected 2016-03-31 12:32:36 +13:00
David Rowe
ba43843340 Disable right-click context menu 2016-03-31 12:27:08 +13:00
David Rowe
870636832f Possible work-around for OSX font issues 2016-03-31 10:45:57 +13:00
David Rowe
3457d1c21e Entities list fixes 
- Fix report of number of entities selected if have two selected
- Don't show yellow focus highlight on row when first click it
 2016-03-31 09:16:31 +13:00
David Rowe
0a83df2281 Fix textarea selection highlight 2016-03-30 19:25:45 +13:00
David Rowe
cfc5c36f05 Fix dropdowns 2016-03-30 19:16:04 +13:00
David Rowe
0b70da1581 Improve layout of scale controls 2016-03-30 19:02:28 +13:00
David Rowe
f4b9ffe26f Reorder sections 2016-03-30 18:07:45 +13:00
David Rowe
fdf45e0134 Use "-group" classification for section expand and collapse 2016-03-30 17:34:31 +13:00
David Rowe
1c5e414c15 Reinstate original property "-section" classifications 2016-03-30 16:10:32 +13:00
David Rowe
1cb08952ae Merge branch 'master' into 20855 
Conflicts:
	interface/resources/qml/ToolWindow.qml
 2016-03-30 12:01:45 +13:00
David Rowe
d07cc82512 Color some buttons 2016-03-29 23:39:02 +13:00
David Rowe
791d3b0310 Fix styling of disabled form 2016-03-29 23:24:34 +13:00
David Rowe
252a48ed5b Miscellaneous fixes 2016-03-29 22:28:00 +13:00
David Rowe
ab37534e0d Restyle dropdowns 2016-03-29 20:14:08 +13:00
David Rowe
a2d9f088ab Typos 2016-03-29 18:47:13 +13:00
Brad Davis
ae82298e1b Working on the App JS <-> HTML JS communication 2016-03-28 10:09:22 -07:00
David Rowe
9c953aa491 Style miscellaneous number fields 2016-03-28 14:49:24 +13:00
David Rowe
11ae07a91d Style header type and ID values 2016-03-28 12:43:40 +13:00
David Rowe
2ebde880af Style pitch, yaw, roll fields 2016-03-28 12:10:32 +13:00
David Rowe
ef4d67008b Style x, y, z fields 2016-03-28 11:45:50 +13:00
David Rowe
b9ec5f39d9 Style color RGB fields 2016-03-27 22:12:10 +13:00
David Rowe
ee6f55b81b Style color pickers 2016-03-27 17:21:02 +13:00
David Rowe
653ddd2ae0 Style URL refresh buttons 2016-03-27 15:13:51 +13:00
David Rowe
04dd27d07f Restyle entity property textarea fields 2016-03-27 11:31:30 +13:00
David Rowe
ce8cc168ee Restyle entity property text fields 2016-03-26 20:45:19 +13:00
David Rowe
e23b3157a9 Restyle entity property checkboxes 2016-03-26 18:24:56 +13:00
David Rowe
3f8b89eea8 Miscellaneous fixes 2016-03-26 18:23:11 +13:00
David Rowe
b7fa9d5f8d Style entity property headings 2016-03-26 16:27:20 +13:00
David Rowe
f85b7696b3 Merge branch 'master' into 20855 2016-03-26 07:53:55 +13:00
Brad Davis
a47614c9b6 Revert "Build a better event bridge" 
This reverts commit a43fde0803.
 2016-03-25 09:48:25 -07:00
David Rowe
8185e13e18 Style checkboxes 2016-03-25 16:40:26 +13:00
David Rowe
42af3ebc4a Style the entity editor's "grid" tab 2016-03-25 14:15:03 +13:00
Brad Hefta-Gaub
fc41c5bca9 Merge pull request #7448 from Menithal/entity-properties-refresh-cache 
Added Refresh Buttons to entityProperties
 2016-03-24 17:34:46 -07:00
Menithal
24f2bdac77 Fixed Styling 2016-03-24 20:58:32 +02:00
Brad Davis
a43fde0803 Build a better event bridge 2016-03-24 11:01:06 -07:00
Menithal
12ecd592ab Added Refresh Buttons to entityProperties 
Pressing buttons next to the url bar will now allow for content to have an
automatic unix timestamp to be applied / updated to the end of the url.
Applies for all url entity Properties
 2016-03-24 01:14:48 +02:00
David Rowe
454ba50dc1 Tidying 2016-03-24 10:03:47 +13:00
David Rowe
55fd861b69 Style scrollbars 2016-03-24 09:43:08 +13:00
David Rowe
0f352b77b2 Tidying 2016-03-23 21:25:02 +13:00
David Rowe
ca90ab7597 Fix initial sort indicators 2016-03-23 21:08:25 +13:00
David Rowe
054d575ed2 Report number of entities found or selected in entities table footer 2016-03-23 20:50:08 +13:00
David Rowe
86354d0165 Table border 2016-03-23 17:34:33 +13:00
David Rowe
6684bbf404 Table header separators 2016-03-23 16:48:41 +13:00
David Rowe
c7712f2d05 Entities table styling 2016-03-23 16:16:03 +13:00
David Rowe
89d4bea73e Restyle search filter and radius in Entity List tab 2016-03-23 12:22:09 +13:00
David Rowe
b5d71d1ee1 Restyle top row of buttons in Entity List tab 2016-03-23 10:05:22 +13:00
David Rowe
53b86a0b55 Move the "no entities found" message into the entities list table 2016-03-22 20:02:57 +13:00
David Rowe
42b606c09d Merge branch 'master' into 20855 2016-03-22 18:51:07 +13:00
David Rowe
02a62766e0 Size entities list to dialog and scroll when necessary 
Also add a footer.
 2016-03-22 18:03:12 +13:00
David Rowe
3fa678a652 Style tabs and background 2016-03-19 14:52:40 +13:00
Zach Pomerantz
105b4e16a9 Add back ambientURL listener in editor 2016-03-18 16:18:41 -07:00
James B. Pollack
ce932640bd Merge pull request #7353 from huffman/fix-keylight-edit 
Fix keylight direction naming and usage in edit.js
 2016-03-18 12:35:48 -07:00
David Rowe
6a2cb393fa Make copy of style.css as starting point for restyling entities editor 2016-03-18 16:56:08 +13:00
Ryan Huffman
850fb51f72 Fix keylight direction naming and usage 2016-03-14 14:45:00 -07:00
Seth Alves
d811c4f6b5 dynamic is the same as grabbable-by-default 2016-03-14 11:39:56 -07:00
Seth Alves
1f8a55da3a dynamic is the same as grabbable-by-default 2016-03-14 11:36:44 -07:00
Seth Alves
cca4a93b2b don't full up userData with default grabbable data 2016-03-12 14:09:52 -08:00
Seth Alves
be51040420 grabbable controlls are working 2016-03-12 13:20:04 -08:00
Seth Alves
f1992af38e started to add grabbable psuedo properties to edit.js 2016-03-12 13:20:00 -08:00
James B. Pollack
aa884d9e3b spatial 2016-03-10 22:45:44 -08:00
James B. Pollack
8381b1d2fd collision shape type 2016-03-07 20:21:14 -08:00
Zach Pomerantz
32ce7c6eab Rename light surfaceRadius->falloffRadius 2016-02-25 10:02:33 -08:00
Zach Pomerantz
c2ed5e5474 Merge branch 'master' of github.com:highfidelity/hifi into fix/light-intensity 2016-02-24 16:24:09 -08:00
ericrius1
749f4478ab Fixed bug with parsing numbers for editjs 2016-02-23 09:33:37 -08:00
Zach Pomerantz
2534bb14f3 Amend entityProperties for fixed-dec light values 2016-02-22 19:27:36 -08:00
Zach Pomerantz
dacf9f7123 Rm extra " in entityProperties 2016-02-22 15:18:45 -08:00
Zach Pomerantz
77ad4039bc Merge branch 'master' of github.com:highfidelity/hifi into fix/light-intensity 2016-02-22 15:11:12 -08:00
Zach Pomerantz
868e2ec961 Use "number" in entityProperties 2016-02-22 15:07:10 -08:00
Zach Pomerantz
1506686b79 Expose light surface to entityProperties 2016-02-22 15:07:09 -08:00
Ryan Huffman
e6ccf501fa Merge pull request #7135 from zzmp/fix/grid 
Update renderGrid to use a shader, and fix grid edit tools
 2016-02-22 12:58:23 -08:00
Zach Pomerantz
c9362a4073 Set grid major div min to 1 2016-02-19 15:58:08 -08:00
Zach Pomerantz
5d78867197 Set grid height via global y-coord 2016-02-19 15:41:38 -08:00
Zach Pomerantz
d74aa4f14d Rm extra , in gridControls 2016-02-19 14:54:19 -08:00
Ryan Huffman
69a953725e Merge pull request #7132 from imgntn/edit-precision-things 
Revert step size change in edit.js
 2016-02-19 08:20:04 -08:00
Zach Pomerantz
b68213f9bf Reintroduce grid to edit.js 2016-02-18 15:48:25 -08:00
Chris Collins
e3ae2baa7b Merge pull request #7123 from ericrius1/editProps 
added collidesWith property to entities list
 2016-02-18 09:11:18 -08:00
James B. Pollack
acaa824cb5 but only position 2016-02-18 09:00:39 -08:00
James B. Pollack
e6662edcb4 revert step size change 2016-02-18 08:57:06 -08:00
ericrius1
5f5af9c6a0 fixed edit bug 2016-02-17 17:45:57 -08:00
James B. Pollack
89039747a2 Update entityProperties.html 
lowercase 'static' like other props
 2016-02-17 16:22:14 -08:00
ericrius1
19cd3ec152 checkboxes working 2016-02-17 13:12:17 -08:00
ericrius1
94fdf6b091 checkboxes working 2016-02-17 11:59:14 -08:00
ericrius1
f85916e808 checkbox keeps getting checked... 2016-02-17 10:27:53 -08:00
ericrius1
0f8f67ef0b removing dynamic. need to add others 2016-02-16 19:34:32 -08:00
James B. Pollack
f2445e81e0 Merge pull request #7110 from ericrius1/particlesInEdit2 
Particles in edit
 2016-02-16 18:33:01 -08:00
ericrius1
168fb67d67 making collidesWith a checkbox 2016-02-16 18:19:12 -08:00
ericrius1
7a3443968d added collides with property 2016-02-16 15:55:11 -08:00
ericrius1
c43500f38a added textures field to particle explorer 2016-02-16 15:36:03 -08:00
James B. Pollack
72186f916c more precision 2016-02-15 11:35:28 -08:00
James B. Pollack
c469fc6a29 hide hyperlink property for web entities 2016-02-12 14:30:21 -08:00
ericrius1
1387f5f322 Fixed bug where lack of 0 as prefix for numbers would throw an error 2016-02-01 16:44:55 -08:00
ericrius1
559fb9cbde fixed merge conflicts 2016-01-29 16:42:10 -08:00
Brad Davis
c4794dd0d5 Fix entity properties HTML 2016-01-29 13:41:43 -08:00
ericrius1
6be550a144 resolved conflicts 2016-01-28 17:08:24 -08:00
James B. Pollack
96ddb9febb Merge pull request #6970 from ericrius1/webEntityURL 
Moved source URL up to top of entity properties panel
 2016-01-28 16:02:21 -08:00
ericrius1
c30109ec29 trying to sync again 2016-01-28 13:21:48 -08:00
ericrius1
98453c085b Moved source URL up to top of entity properties panel 2016-01-28 12:08:21 -08:00
ericrius1
3fff5868e8 Fix syntax error 2016-01-28 11:57:33 -08:00
ericrius1
40c66a94be Moves text props to top of Entity Props panel 2016-01-28 11:44:50 -08:00