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

40402 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
b0c326fa2c Merge pull request #92 from huffman/atp-more 
Atp more
 2016-03-10 10:51:12 -08:00
Ryan Huffman
0df05d273d Implement addToWorld in asset window 2016-03-10 10:25:51 -08:00
Ryan Huffman
b42bec78dc Add Entities.addModelEntity 2016-03-10 10:25:20 -08:00
Ryan Huffman
3df8f4ad26 Merge pull request #90 from birarda/atp-mappings 
error message boxes for mapping operation errors, reload on load
 2016-03-10 10:22:34 -08:00
Stephen Birarda
899595183e add reload of mappings on component complete 2016-03-10 09:02:45 -08:00
Stephen Birarda
f1919031de error message boxes for mapping errors 2016-03-10 08:57:37 -08:00
Stephen Birarda
55248bc076 Merge pull request #89 from huffman/atp-fixes 
Add mapping sorting, copying, and isKnownMapping
 2016-03-10 08:36:26 -08:00
Ryan Huffman
3e5e2eef17 Add mapping sorting, copying, and isKnownMapping 2016-03-10 08:18:32 -08:00
Ryan Huffman
5a39718645 Merge pull request #88 from birarda/atp-mappings 
fix for leading slash in mapping load, asset-server load of bad mappings
 2016-03-09 19:07:45 -08:00
Stephen Birarda
ae3c0f6646 add hash and path checking 2016-03-09 18:03:44 -08:00
Stephen Birarda
672f8ec1f7 add checking for leading slash in mapping operations 2016-03-09 17:43:31 -08:00
Stephen Birarda
6f044e1cd3 handling for leading slashes while loading mappings 2016-03-09 17:36:04 -08:00
Stephen Birarda
7b08ae3747 drop invalid mappings on AssetServer load 2016-03-09 17:30:02 -08:00
Stephen Birarda
ea5349f7a0 remove ctor and dtor for AssetMappingsScriptingInterface 2016-03-09 16:59:31 -08:00
Stephen Birarda
85fe1349eb fix filename in header comment for AssetMappingsScriptingInterface 2016-03-09 16:58:53 -08:00
Stephen Birarda
0fae72fdab Merge pull request #87 from huffman/atp-model 
ATP Model
 2016-03-09 16:57:26 -08:00
Ryan Huffman
738ae54e8d Remove comment 2016-03-09 16:56:28 -08:00
Ryan Huffman
dd52dd69d9 Fix rename mapping 2016-03-09 16:50:37 -08:00
Ryan Huffman
fa66c0a521 Remove old model code 2016-03-09 16:44:51 -08:00
Ryan Huffman
3467e06199 Fix bugs in mapping model update 2016-03-09 16:44:41 -08:00
Ryan Huffman
232bfc9061 Cleanup AssetServer qml 2016-03-09 16:44:31 -08:00
Ryan Huffman
0d2ae4f3a4 Merge branch 'atp' of github.com:birarda/hifi into atp-model 2016-03-09 16:33:53 -08:00
Ryan Huffman
ebc6c8ce44 Add proper model updating to asset mapping model 2016-03-09 16:29:51 -08:00
Ryan Huffman
f23057b1c0 Add renaming to Asset qml 2016-03-09 16:29:17 -08:00
Ryan Huffman
d299ce2677 Fix missing semicolon 2016-03-09 14:56:56 -08:00
Ryan Huffman
f5497aa1e7 Add new AssetMappingsScriptingInterface and add mappings model 2016-03-09 14:53:04 -08:00
Clément Brisset
aeee89eb15 Merge pull request #86 from birarda/atp-mappings 
disable client caching of ATP mappings, fix bug retreiving assets
 2016-03-09 14:40:57 -08:00
Clément Brisset
9453ff3dea Merge pull request #85 from birarda/atp-rename-mapping 
add folder delete/rename, some AssetServer operation bug fixes
 2016-03-09 14:36:33 -08:00
Stephen Birarda
57ea51d244 Merge pull request #84 from Atlante45/feat/atp 
Replace old drag&drop with new UI
 2016-03-09 14:26:49 -08:00
Stephen Birarda
e2b976d9f1 remove debug, fix asset find bug for incorrect folder 2016-03-09 14:24:35 -08:00
Stephen Birarda
96ba57a946 remove client side caching of ATP mappings 2016-03-09 14:24:14 -08:00
Atlante45
6bd7afc7b3 Confirm overrides 2016-03-09 14:19:28 -08:00
Ryan Huffman
64bd41c37f Add AssetMappingItem and extra data to items 2016-03-09 14:03:56 -08:00
Ryan Huffman
4da4fd889a Add AssetMappingModel 2016-03-09 14:03:56 -08:00
Ryan Huffman
38edfe0557 Fix GetAllMappings reading 2016-03-09 14:03:56 -08:00
Ryan Huffman
fd5a5dd8f4 Add QJSEngine compatible AssetMappingScriptInterface 2016-03-09 14:03:25 -08:00
Stephen Birarda
a986403237 add a leading slash for faked migrated mappings 2016-03-09 13:42:35 -08:00
Stephen Birarda
d3dc81c7a0 add delete debug, handle rename in memory state rollback 2016-03-09 13:37:39 -08:00
Stephen Birarda
5e9751c6ed bug fixes for rename/delete operations 2016-03-09 13:28:05 -08:00
Stephen Birarda
a65d06c7ce fix rename to take old mapping first 2016-03-09 13:14:55 -08:00
Stephen Birarda
5a197838f4 add a deleteMapping call for single path to scripting interface 2016-03-09 13:14:39 -08:00
Stephen Birarda
4bbb8779e3 Merge branch 'atp' of github.com:birarda/hifi into atp-rename-mapping 2016-03-09 12:17:24 -08:00
Stephen Birarda
2e9ee4f8a7 Merge branch 'atp' of github.com:birarda/hifi into atp 2016-03-09 12:16:59 -08:00
Stephen Birarda
9a2b2b4c16 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2016-03-09 12:16:46 -08:00
Stephen Birarda
6b8a71f96a add debug for mapping operations 2016-03-09 12:16:36 -08:00
Stephen Birarda
a53b038ac2 add folder delete handling 2016-03-09 12:10:36 -08:00
Stephen Birarda
03c38eada3 add folder rename handling 2016-03-09 12:06:33 -08:00
Clément Brisset
3f50abcd17 Merge pull request #82 from birarda/atp-rename-mapping 
add rename mapping operation for atomic rename
 2016-03-09 11:57:20 -08:00
Atlante45
5a0beec1f5 Replace old drag&drop with new UI 2016-03-09 11:47:31 -08:00
Stephen Birarda
9587620eb1 Merge pull request #83 from Atlante45/feat/atp 
Add message boxes for rename and delete
 2016-03-09 11:42:57 -08:00