Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-19 19:40:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
41398 commits 72 branches 59 tags 1.2 GiB
Commit graph

296 commits

Author SHA1 Message Date
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
ericrius1
191e6090e7 Moves zone props to top of entity props panel 2016-01-28 11:36:23 -08:00
ericrius1
cd5e81de36 Validating href for edit.js 2016-01-27 16:02:02 -08:00
Brad Davis
ae6cba85e8 More atmosphere removal 2016-01-21 15:15:16 -08:00
Andrew Meadows
7fb145e819 namechange ignoreForCollisions --> collisionless 2016-01-19 09:06:17 -08:00
Seth Alves
9428da61cf fix property name typo 2016-01-18 14:31:55 -08:00
Andrew Meadows
c1a1cbf718 fix typo 2016-01-16 15:55:10 -08:00
Andrew Meadows
84282d0114 final repairs after rebase 2016-01-15 15:28:26 -08:00
Andrew Meadows
29a52bf0ba namechange collisionsWillMove --> dynamic 2016-01-15 15:23:52 -08:00
Brad Davis
b6272b7824 Migrate tool window to overlay/QML 2016-01-13 15:40:37 -08:00
Brad Davis
6098c4a1d6 Revert "Revert "Migrate QML based web views to Qt WebEngine"" 
This reverts commit 1f3adeb666.
 2015-12-18 17:18:46 -08:00
Brad Davis
1f3adeb666 Revert "Migrate QML based web views to Qt WebEngine" 2015-12-18 17:09:38 -08:00
Brad Davis
fa5bab08b1 Support web content inside QML 2015-12-16 16:25:38 -08:00
Anthony J. Thibault
e9f529bf12 Entities: Removed Start Automatically property from Animation Group 
There is an issue when startAutomatically was set to true and animationPlaying was set to false.
This would cause clients to play the animation when they connected to the entity server, even though the server was not.
 2015-12-09 17:59:56 -08:00
Seth Alves
f0fb9966ad expose parent-joint-index to edit.js 2015-12-06 12:34:41 -08:00
Seth Alves
9548b0e138 get parent-id field working 2015-11-29 13:38:27 -08:00
Seth Alves
bbc9d5d131 add missing single-quote 2015-11-29 13:04:45 -08:00
Seth Alves
36e293608a more adding parentID to edit.js 2015-11-26 05:31:52 -08:00
Thijs Wenker
d60661ff8a preview camera button in edit.js script 2015-11-04 03:24:32 +01:00
Atlante45
8b46ed7dff Check keyLight is defined 2015-10-29 16:42:48 -07:00
Atlante45
904326cd1c edit.js fix 2015-10-29 14:11:27 -07:00
samcake
630cdb8a9d Modify the html presentiong the zone enity properties to match the internal new representation 2015-10-28 17:29:06 -07:00
samcake
a5b95d7307 Fixing the entity properties view with the new properties group 2015-10-28 16:46:56 -07:00
Andrew Meadows
d02fe784a9 css and cfg filetypes are text in .gitattributes 2015-10-20 13:58:44 -07:00
James B. Pollack
31cc451fd4 css cleanup 2015-10-16 16:42:29 -07:00
James B. Pollack
c6fcaf158b add color to more props 2015-10-16 16:15:20 -07:00
James B. Pollack
aa6aaf912e add color bars below position inputs 2015-10-16 16:07:20 -07:00
Brad Hefta-Gaub
f141026990 CR feedback 2015-10-08 11:48:48 -07:00
Brad Hefta-Gaub
a8d1622481 CR feedback 2015-10-08 11:47:54 -07:00
Brad Hefta-Gaub
bb10d8a7d5 more work on rationalizing particle properties 2015-10-07 20:08:30 -07:00
Brad Hefta-Gaub
02a24712ca fix isEmitting property for particle effects, cleaned up some particle property editing in edit.js 2015-10-07 19:52:29 -07:00
Brad Hefta-Gaub
7a85e5b7a7 rename frameIndex to currentFrame 2015-10-07 13:02:58 -07:00
Brad Hefta-Gaub
6eeb64b032 CR feedback 2015-10-07 11:23:24 -07:00
Brad Hefta-Gaub
8c8e83dc8e more debugging on animation.running 2015-10-05 14:17:12 -07:00
Brad Hefta-Gaub
accdd8c86a add animation properties to edit properties 2015-10-02 19:15:24 -07:00
Brad Hefta-Gaub
02536a5ab9 remove animationSettings from particles, add isEmitting 2015-10-02 14:17:01 -07:00
Brad Hefta-Gaub
efda121619 fix a bunch of warnings on windows 2015-09-22 16:40:17 -07:00
David Rowe
52f6fe1d04 Clear entity list when you change domains 2015-09-21 09:59:00 -07:00
Brad Hefta-Gaub
7b4e69a92d Merge pull request #5698 from Nex-Pro/20657 
CR for Job #20657 - Entities list trouble past 100 entities
 2015-09-04 20:06:33 -07:00
Brad Davis
c8069ba73c Working on magballs polish 2015-09-03 20:09:54 -07:00
Nex Pro
b2e5cc7c4e Fixed list problems when list contains more than 200 entries. And some style fixes. 2015-08-28 02:29:01 +01:00
David Rowe
005851a74a Increase default entity search radius to 100m 2015-08-27 12:13:04 -07:00
David Rowe
a553022adf Update entities list as search radius value is changed 2015-08-27 11:11:05 -07:00
David Rowe
d628a88f52 Fix some invalid HTML 2015-08-27 11:10:20 -07:00
David Rowe
1880b263d4 Add entity search radius field to entities list 2015-08-27 11:09:55 -07:00
Brad Davis
380b0cb23c Removing tabs from our javascript and C++ 2015-08-24 15:26:46 -07:00
Seth Alves
79a7755cdb add SURFACE_EDGED_MARCHING_CUBES polyvox surface extraction style 2015-08-15 12:18:36 -07:00
Seth Alves
8d2aacb46d send X texture to renderer 2015-07-30 15:36:07 -07:00
Seth Alves
52ee9526ce add 3 new texture-url properties for polyvox 2015-07-30 13:20:19 -07:00
Brad Hefta-Gaub
ee641335fa Merge pull request #5421 from thoys/20552 
CR for Job #20552 - Add the ability to modify the parameters of planky from a popup dialog
 2015-07-28 09:57:22 -07:00
Kevin M. Thomas
a6af80fa5c Merge branch 'master' of https://github.com/highfidelity/hifi into 20622 2015-07-24 15:03:15 -04:00
Thijs Wenker
5d74858500 edit.js - entityList - delete key deletes entities, hold shift to select a group of entities, moved appending single entity to selection to ctrl key 2015-07-21 17:01:54 +02:00
Kevin M. Thomas
d76d380512 Added jsstreamplayer. 2015-07-20 14:19:16 -04:00
Thijs Wenker
6926ae9aa3 small planky improvements 2015-07-14 20:27:51 +02:00
Thijs Wenker
95948851f1 save, clear and reset button 2015-07-14 04:36:29 +02:00
Thijs Wenker
c8453bec67 planky: fix layer setting, restraints on values 2015-07-14 03:50:06 +02:00
Thijs Wenker
222234cf1d wild planky changes on value change 2015-07-14 03:40:58 +02:00
Thijs Wenker
1f453e07e3 connection between planky script and web-window 
-load settings
-include toolbar
 2015-07-14 02:18:17 +02:00
Thijs Wenker
da6986f759 Planky refactorings and basic planky settings 2015-07-07 21:06:12 +02:00