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

180 commits

Author SHA1 Message Date
ZappoMan
d666f9ce98 Merge branch 'master' of https://github.com/highfidelity/hifi into editToolsImprovements 
Conflicts:
	examples/editModels.js
 2014-10-02 15:17:59 -07:00
ZappoMan
bfde23349f moving libraries style JS files to libraries 2014-10-02 15:15:09 -07:00
Brad Hefta-Gaub
4e752f9bb8 Merge pull request #3520 from Adrianl3d/20082 
CR for Job #20082 - Entity properties bad readable, background is wrong sized
 2014-10-02 08:35:50 -07:00
ZappoMan
060a690f85 moved the selection display class into own file 2014-10-01 09:46:34 -07:00
ZappoMan
c3b0700601 introduce Planar3DOverlay for common features of rectangle and circle, introduced rectanglular 3D plane 2014-09-30 14:52:44 -07:00
Thijs Wenker
9ba2a9736c style 2014-09-30 22:23:40 +02:00
Thijs Wenker
eed6e2e8f6 - Edit -> Model List menu option 
- Combo items can be JS objects now, write a toString() function for each JS object to describe them
 2014-09-30 22:11:21 +02:00
ZappoMan
7fc6eecca7 added support for dashed lines for 3D Circle overlays 2014-09-30 11:27:16 -07:00
ZappoMan
16cdc2614f added circle overlays 2014-09-30 10:06:39 -07:00
Adrianl3d
2ab38ace1b Improved contrast to textOverlay and resize 
Increased background alpha, increased text color, and resize to allow
for new properties.
 2014-09-30 16:34:47 +10:00
ZappoMan
25b072cb22 first cut at new glowing pulsing select ui in editModels.js 2014-09-29 16:46:17 -07:00
ZappoMan
cbc502553b add rescale support to entity properties UI 2014-09-26 16:25:24 -07:00
ZappoMan
2d81d7c554 add support for ignore collisions and collisions will/wont move entities 2014-09-26 11:43:56 -07:00
ZappoMan
fa8c5b85ff allow you to edit mass 2014-09-25 17:00:35 -07:00
ZappoMan
f00947ada7 handle registration point in rendering of box, sphere, and model entities 2014-09-11 08:33:41 -07:00
ZappoMan
0d80c32306 editModels debug cleanup 2014-09-10 14:51:58 -07:00
ZappoMan
8023735eb3 changed rotational to angular and added angular damping 2014-09-10 14:46:27 -07:00
ZappoMan
bb52c4a1b3 store angular valocity as 3 vector 2014-09-10 11:28:45 -07:00
ZappoMan
53da483381 more work on visible, registration point, and rotational velocity 2014-09-10 09:05:46 -07:00
ZappoMan
fd59f58989 added script property to EntityProperties setting/getting and scripting 2014-09-09 20:18:01 -07:00
ZappoMan
a7fda032d1 added reset dimensions support to editModels.js 2014-09-09 17:46:31 -07:00
ZappoMan
b78b8ccbb0 first cut at replacing radius with dimensions 2014-09-09 13:33:05 -07:00
Chris Collins
a824712ee6 Changed list model icon 
Changed list-model.svg icon to be consistent with the other icons
 2014-09-08 10:55:45 -07:00
ZappoMan
e4deb59892 fix sphere colors 2014-09-04 15:00:52 -07:00
ZappoMan
5b8be780a7 add color to sphere property editor 2014-09-03 18:03:00 -07:00
AndrewMeadows
bd55da4a83 Merge pull request #3335 from ZappoMan/virtualEntities 
Model Server to Entity Server Refactoring
 2014-09-03 15:48:58 -07:00
ZappoMan
ad9ce2edd3 delete moving entities that travel outside of domain 2014-08-28 21:34:12 -07:00
ZappoMan
2bcad6ab2b Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	assignment-client/src/Agent.cpp
	examples/editModels.js
 2014-08-28 21:19:56 -07:00
David Rowe
518fa7936c Increase model uploader menu width to accommodate large fonts 2014-08-28 17:25:35 -07:00
ZappoMan
76c77d6994 first cut at properly working lifetime 2014-08-28 13:46:54 -07:00
ZappoMan
2f90df04ee correct cleanup of Models/geometry and all EntityItems for various cases 2014-08-27 15:45:45 -07:00
ZappoMan
4895ee32f7 test and fix issues with exportEntities() 2014-08-26 15:59:49 -07:00
ZappoMan
d5fa23bcdf fix bug in editModels.js related to newly named rotation property 2014-08-26 13:07:33 -07:00
ZappoMan
58759d344f cleanup in prep for PR 2014-08-25 10:56:43 -07:00
ZappoMan
ef86d86234 split out entity rendering into subclasses, improved rendering of models 2014-08-20 15:49:50 -07:00
David Rowe
1a80bd98f0 Ignore empty "embedded" textures 
Blender 2.71 exporter "embeds" external textures as empty binary blobs
 2014-08-19 10:25:18 -07:00
David Rowe
f7addad5ac Update progress background image to use copy on S3 2014-08-14 17:20:00 -07:00
David Rowe
29f4f5b21a Support FBX files with embedded textures 2014-08-14 11:18:10 -07:00
David Rowe
8c913fe8c1 Add progress dialog and ability to cancel during the model upload 2014-08-13 10:23:59 -07:00
David Rowe
fbaeeef014 Merge branch 'master' into 19840 
Resolved conflicts in editModels.js
 2014-08-11 20:59:37 -07:00
ZappoMan
779d846f1e add gravity to the editModels property 2014-08-11 13:27:19 -07:00
David Rowe
53602c2ef2 Miscellaneous tidying 2014-08-11 10:55:31 -07:00
David Rowe
0b979d2e1e Disabled SVO model uploading: server doesn't support SVO file uploads 2014-08-11 10:54:46 -07:00
David Rowe
f12973d5d0 Cater for multiple mapping values 2014-08-11 10:12:47 -07:00
ZappoMan
a96aa5f937 clean up subclass properties, properly handle new baseclass props like damping 2014-08-10 14:20:37 -07:00
David Rowe
9a21f1c355 Fix FST file reading and writing 2014-08-08 21:51:14 -07:00
David Rowe
54ea86d6be Fix texture directory display and validation 2014-08-08 20:40:15 -07:00
David Rowe
35bc1a03af Simplify model scale to be that specified in FST or 1.0 
No UI
 2014-08-08 17:35:36 -07:00
David Rowe
0f9da8e13f Make mapping writing more robust 2014-08-08 17:34:08 -07:00
David Rowe
198fa47409 Get "naked" FBX model content uploading working 
Include an automatically created FST file in the upload
 2014-08-08 16:38:27 -07:00