Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-27 21:55:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
16477 commits 71 branches 56 tags 1.2 GiB
Commit graph

161 commits

Author SHA1 Message Date
Ryan Huffman
054e832cf8 Fix misspelled variable names 2014-07-31 11:32:17 -07:00
Ryan Huffman
a670889ffb Remove TODO comment 2014-07-31 10:44:36 -07:00
Ryan Huffman
85ed18fd41 Cleanup editModels.js 2014-07-31 10:43:44 -07:00
Ryan Huffman
3e2bb0f168 Add more complete error handling for import/export models 2014-07-31 10:40:45 -07:00
ZappoMan
77e1867b11 Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	assignment-client/src/Agent.cpp
	assignment-client/src/Agent.h
	examples/editModels.js
	interface/src/Application.h
 2014-07-31 10:34:23 -07:00
Ryan Huffman
6ecc12cdea Fix export models not cancelling correctly 2014-07-31 01:11:05 -07:00
David Rowe
0c589b73c4 Tidy model data handling 2014-07-30 22:12:11 -07:00
Ryan Huffman
6a53765a47 Rename buttons in editModels.js 2014-07-30 19:06:23 -07:00
Ryan Huffman
06e6505584 Update and add localModels overlay to editModels.js import/export 2014-07-30 18:39:44 -07:00
David Rowe
f39aed37b6 Recode and rescale texture file data before uploading 
A recodeImage() method is added to the JavaScript ArrayBuffer object.
 2014-07-29 17:26:42 -07:00
David Rowe
287e3d6800 Compress model and texture file data in multipart/form-data 
A compress() method is added to the JavaScript ArrayBuffer object.
 2014-07-29 13:52:52 -07:00
ZappoMan
3667eadff0 some various fixes 2014-07-29 13:34:08 -07:00
David Rowe
5a5bbfd612 Tidying 2014-07-29 09:46:54 -07:00
David Rowe
edf96b749e Add texture files to multipart/form-data 2014-07-28 23:01:12 -07:00
David Rowe
00abf43fae Add LOD files to multipart/form-data 2014-07-28 22:10:25 -07:00
David Rowe
c7c2f31192 Fix display of scale read from model file 2014-07-28 21:59:44 -07:00
David Rowe
0bb42ba5f2 Fix call stack overflow when preparing large multipart/form-data 2014-07-28 21:55:05 -07:00
David Rowe
63d7ff0bde Tidying 2014-07-28 20:00:23 -07:00
David Rowe
f46c064e88 Speed up model reading 2014-07-28 19:58:53 -07:00
ZappoMan
805a88b73b Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	examples/editModels.js
	interface/src/entities/EntityTreeRenderer.h
	libraries/models/src/ModelsScriptingInterface.cpp
	libraries/script-engine/src/ScriptEngine.cpp
 2014-07-28 13:39:35 -07:00
Atlante45
844e5d7e47 Merge branch 'master' of https://github.com/highfidelity/hifi into add_start_stop_animation_for_scripted_avatar 
Conflicts:
	assignment-client/src/Agent.cpp
	examples/editModels.js
 2014-07-28 10:11:39 -07:00
David Rowe
61bb21cc00 Prepare multipart/form-date message with model file and attributes 2014-07-27 22:05:18 -07:00
David Rowe
f602f42189 Add Cancel button to model editing dialog 2014-07-26 09:22:44 -07:00
David Rowe
fcfaf6a9be Add Set Model Properties dialog for model uploading 2014-07-26 08:49:42 -07:00
Atlante45
b5dd9141a3 Fix the double entries in models' browsers 2014-07-25 16:12:40 -07:00
Ryan Huffman
d777e4be53 Merge branch 'master' of git://github.com/highfidelity/hifi into 19783 
Conflicts:
	interface/src/scripting/WindowScriptingInterface.cpp
	interface/src/scripting/WindowScriptingInterface.h
 2014-07-25 15:53:36 -07:00
Atlante45
f7c675f3e6 CR missing index++ 2014-07-25 11:35:25 -07:00
David Rowe
7c6f1ff414 Handle FBX file name not found in FST file more gracefully 2014-07-23 17:09:40 -07:00
David Rowe
401326ddd7 Fix FST file processing after ArrayBuffer change 2014-07-23 16:59:52 -07:00
David Rowe
6b72274d21 Read author and texture filenames from text FBX files 2014-07-23 16:05:34 -07:00
Atlante45
0d039b1cdb Fixed invokeMethod bug + removed debug 2014-07-23 14:38:37 -07:00
Atlante45
d4199e6092 Edit properties tweaks 2014-07-23 13:59:21 -07:00
David Rowe
ec8b82bf6e Read author and texture filenames from binary FBX files 2014-07-23 12:27:52 -07:00
David Rowe
ef8ce8ad7d Remember location of model file last selected 2014-07-21 21:39:52 -07:00
David Rowe
f87a83f79e Read mappings from FST file 2014-07-21 12:55:25 -07:00
David Rowe
ab0ec9f474 Read raw data of different model file types 2014-07-20 22:55:07 -07:00
David Rowe
2be03ada9c Prepare for reading and processing model file content 2014-07-20 15:14:48 -07:00
David Rowe
ed1b058cb1 Upload selected model file directly to public folder for starters 2014-07-20 13:55:26 -07:00
David Rowe
6027f4dad1 Add model file selection dialog box 2014-07-19 15:33:54 -07:00
David Rowe
c5faeadd81 Add button menu options for loading model from URL or file 2014-07-19 15:27:41 -07:00
David Rowe
f16eb0fd89 Encapsulate and lint "new model" toolbar 2014-07-19 14:33:48 -07:00
Atlante45
c07ba9fec5 Added browser as a tool 2014-07-17 17:50:56 -07:00
Atlante45
7ab8b5a843 Added S3 browser 2014-07-17 17:12:54 -07:00
Atlante45
60f242118e Code cleanup 2014-07-16 11:52:12 -07:00
Atlante45
f960b4fff3 new windows JS interface 2014-07-16 11:32:18 -07:00
ZappoMan
2baac96665 Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	examples/sit.js
	interface/src/Application.cpp
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelsScriptingInterface.cpp
 2014-07-15 10:04:40 -07:00
Ryan Huffman
874b542c0c Add import/export/paste model functionality to editModels.js 2014-07-09 04:13:53 -07:00
barnold1953
bf2959675f First pass at laser oculus UI pointer 2014-07-03 16:09:54 -07:00
ZappoMan
2c5209d1e7 virtual entities checkpoint 2014-07-03 09:07:11 -07:00
ZappoMan
865566414c Merge branch 'master' of https://github.com/worklist/hifi into renameModelsToEntities 
Conflicts:
	interface/src/entities/EntityTreeRenderer.cpp
	libraries/entities/src/EntityItem.h
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelTree.cpp
	libraries/models/src/ModelTreeElement.cpp
	libraries/models/src/ModelsScriptingInterface.cpp
	tests/octree/CMakeLists.txt
	tests/octree/src/ModelTests.cpp
 2014-07-01 16:32:47 -07:00
ZappoMan
ccc9eabd33 first cut at renaming Models to Entities 2014-06-26 16:39:52 -07:00
Atlante45
cce6132a07 Add sitting points to the model properties display 2014-06-25 11:50:30 -07:00
ZappoMan
a019b70e58 Merge branch 'master' of https://github.com/worklist/hifi into experimentalStoreModel 
Conflicts:
	tests/octree/CMakeLists.txt
	tests/octree/src/ModelTests.cpp
	tests/octree/src/main.cpp
 2014-06-24 15:59:17 -07:00
Atlante45
266dc6be3e fixed tooltip not disapearing when deleting model 2014-06-19 18:09:17 -07:00
ZappoMan
fb34d13305 more work on optimized storeModel() 2014-06-19 14:30:44 -07:00
Atlante45
4a4efb0bfa Don't glow models if you can't grab it 2014-06-19 11:11:08 -07:00
Atlante45
676141024a Added angular size limit to hydras too. 2014-06-19 10:46:06 -07:00
Atlante45
641b9e8253 Set minimum angular size too model selection 2014-06-19 10:43:25 -07:00
Atlante45
900024eefe More intuitive rotation UI 2014-06-18 14:22:46 -07:00
ZappoMan
ed32ca721a fix bug 2014-06-18 12:19:01 -07:00
Clément Brisset
7597191081 Merge pull request #3042 from ZappoMan/editModelFeatures 
add support for changing the model URL of a model
 2014-06-18 11:52:01 -07:00
ZappoMan
26075d9d26 add support for changing the model URL of a model 2014-06-18 11:29:56 -07:00
Atlante45
97dd695213 if model takes too much angular size, don't select it 2014-06-17 18:32:45 -07:00
Atlante45
4467ee266d Added snapped/smoothed rotation for models + tooltip 2014-06-17 17:19:16 -07:00
Atlante45
b3b3a72946 Disable editModels.js mouse events when ALT is pressed. (no conflict with inspect.js) 2014-06-16 10:55:34 -07:00
Atlante45
69adf8d0dd Removed extra debug, fix model jumping when releasing one of the two triggers. 2014-06-06 11:19:43 -07:00
Atlante45
9322e1f71b More work on editModels 2014-06-05 17:36:56 -07:00
Atlante45
145a159233 Slight glow on laser intersection 2014-06-05 15:45:25 -07:00
Atlante45
79092e3e81 editModels now has 2 modes 2014-06-04 14:18:28 -07:00
Atlante45
15863198d1 change editModels icon 2014-06-04 13:52:31 -07:00
Atlante45
9ea53f8070 some testing with editModels 2014-06-04 11:38:46 -07:00
ZappoMan
cad5e12aad make editVoxels.js and editModels.js play nice together with the delete menu item 2014-05-31 14:05:05 -07:00
ZappoMan
f92facea76 changed Models/Delete and Voxels/Delete to both use same menu item name of 'Delete' so that either option will correctly delete either. 2014-05-31 13:30:45 -07:00
Brad Hefta-Gaub
a257af76dc Merge pull request #2966 from Atlante45/grab_attachements 
First pass at grabbing attachment
 2014-05-30 19:46:03 -07:00
Atlante45
4ffd51d9c4 First pass at grabbing attachment 2014-05-30 18:40:50 -07:00
Andrzej Kapolka
be9703d46f Merge pull request #2958 from Atlante45/click_drag_attach 
Update joints list everytime I try to attach
 2014-05-30 14:15:43 -07:00
Atlante45
0b31971592 Update joints list everytime I try to attach 2014-05-30 10:42:54 -07:00
Brad Hefta-Gaub
c3b87504d9 Merge pull request #2957 from Atlante45/fix_for_editModel 
Fixed JS parse error
 2014-05-30 10:24:54 -07:00
Atlante45
a7f10798b2 Fixed JS parse error 2014-05-30 10:23:36 -07:00
Atlante45
17e3bd6110 CR comments 2014-05-29 18:24:21 -07:00
Atlante45
b89d0a292c code cleanup 2014-05-29 15:56:46 -07:00
Atlante45
fd0c195132 Code cleanup 2014-05-29 15:55:17 -07:00
Atlante45
c7b636365c Don't attach to joints in range when I grab 2014-05-29 15:50:23 -07:00
Atlante45
980e873a13 Better prints in editModels 2014-05-29 15:02:09 -07:00
Atlante45
b34453647b editModels click/drag/attach tweaks 2014-05-29 14:34:10 -07:00
Atlante45
372ddc92fd Added attaching of model to MyAvatar when close enough 2014-05-28 16:00:37 -07:00
Atlante45
285bd0d2f2 Switched to findRayIntersection 2014-05-27 15:50:39 -07:00
Atlante45
37a939588f Mode sure the closest model is always selected 2014-05-23 11:28:48 -07:00
Atlante45
53141ff1c1 Glow when grabbed with the mouse (for now) 2014-05-23 11:10:56 -07:00
ZappoMan
519f5539d9 also support deleting mouse selected model 2014-05-22 14:37:34 -07:00
ZappoMan
b5056dcd3a fix broken mouse edit 2014-05-22 13:01:02 -07:00
ZappoMan
66b9d582a8 fix broken mouse edit 2014-05-22 12:43:23 -07:00
ZappoMan
b9e73a6ef7 added delete support to edit models 2014-05-22 12:23:01 -07:00
ZappoMan
b228da34a5 slight DRY 2014-05-18 20:43:27 -07:00
ZappoMan
31ae7ceaff added isLocked() to lock the ground plane in hq 2014-05-18 20:31:55 -07:00
Atlante45
0edcd732fe Added rotation and scale to overlay anchers 2014-05-16 17:36:27 -07:00
Atlante45
61fd09e0bd Add ability to anchor an overlay 2014-05-15 16:24:31 -07:00
Atlante45
5ef71d6a35 Full mouse handling 2014-05-14 10:40:50 -07:00
Atlante45
624ae4732f Fixes to PickRay check 2014-05-13 14:58:34 -07:00
Atlante45
701bc63bd1 Removed old toolbar 2014-05-13 14:34:08 -07:00