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

40200 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
6abd1c50b2 remove the inlined writeError in AssetServer 2016-03-08 15:45:13 -08:00
Stephen Birarda
8d5111a332 move MappingRequest and subclasses to separate file 2016-03-08 15:30:59 -08:00
Stephen Birarda
33cadb36da add server side handling for mapping rename 2016-03-08 14:57:22 -08:00
Stephen Birarda
181b20f673 move the AssetScriptInterface to script-engine 2016-03-08 14:49:26 -08:00
Stephen Birarda
f9f42a085a add client side handling for mapping rename 2016-03-08 14:43:55 -08:00
Stephen Birarda
793d20306d handle multiple paths for mapping delete operations 2016-03-08 14:24:03 -08:00
Stephen Birarda
969244927b use extension for entity add for drag and drop upload 2016-03-08 13:09:20 -08:00
Stephen Birarda
28af9c51e6 add a missing parenthesis 2016-03-08 12:22:13 -08:00
Stephen Birarda
cf5de317ba use correct error handling for MappingRequest errors 2016-03-08 12:21:54 -08:00
Stephen Birarda
8fa32e75b2 client side fixes for upload with no extension 2016-03-08 12:19:15 -08:00
Stephen Birarda
1ece9aac26 remove extension from asset upload task 2016-03-08 12:08:02 -08:00
Stephen Birarda
7cc774c5f4 indentation fix for _filesDirectory in AssetServer 2016-03-08 11:55:29 -08:00
Stephen Birarda
e92a9c9741 fix comment for asset packet version push 2016-03-08 11:53:53 -08:00
Stephen Birarda
88c1892bf6 remove a comment block re-added in merge 2016-03-08 11:51:59 -08:00
Stephen Birarda
c4845e5ae5 remove getMapping call from AssetServer that is unused 2016-03-08 11:50:23 -08:00
Stephen Birarda
4608eddb40 remove an extra blank line 2016-03-08 11:47:55 -08:00
Stephen Birarda
7ecfc20dc2 add error handling for asset-server files directory 2016-03-08 11:47:11 -08:00
Stephen Birarda
8107287e6c remove start from mapping request subclasses 2016-03-08 11:42:57 -08:00
Stephen Birarda
4236d8e147 replace toLocal8Bit with toUtf8 for hex conversions 2016-03-08 11:40:35 -08:00
Stephen Birarda
063826638e move handling of get all operation to sep method 2016-03-08 11:39:28 -08:00
Stephen Birarda
bfb9801b22 Merge branch 'atp' of github.com:birarda/hifi into atp-mappings 2016-03-08 11:37:27 -08:00
Stephen Birarda
79e788523b Merge pull request #76 from huffman/atp-mappings 
Atp mappings
 2016-03-08 11:21:18 -08:00
Ryan Huffman
5368ae3f91 Remove extraneous thread checks in MappingRequest subclasses 2016-03-08 11:20:15 -08:00
Ryan Huffman
93d3fb5ccf Fix network error response for mapping requests 2016-03-08 11:19:08 -08:00
Ryan Huffman
c9bd67bc3e Add MappingRequest superclass and mapping specific errors 2016-03-08 11:18:10 -08:00
Ryan Huffman
e06c1591fb Remove initializer 2016-03-08 10:43:26 -08:00
Ryan Huffman
0a75a94790 Remove commented out private slot 2016-03-08 10:31:40 -08:00
Stephen Birarda
7bf6b8405c pluralize mappings in AssetServer naming 2016-03-08 10:28:59 -08:00
Ryan Huffman
e3523c8604 Remove commented out function 2016-03-08 10:28:31 -08:00
Ryan Huffman
89b37f78f0 Make AssetServer response reliable and ordered 2016-03-08 10:26:50 -08:00
Ryan Huffman
7db296fa69 Remove unused get/set/deleteMapping in AssetServer 2016-03-08 10:23:48 -08:00
Brad Hefta-Gaub
50eb07d465 Merge pull request #7221 from jherico/threaded_compositing2 
Migrate composition of the overlay and pointer to the present thread
 2016-03-08 10:22:02 -08:00
Ryan Huffman
88760d389f Merge branch 'master' of https://github.com/highfidelity/hifi into atp-mappings 2016-03-08 10:21:32 -08:00
Stephen Birarda
a3533b0b7d repairs for moved packet handling in AssetServer 2016-03-08 10:21:29 -08:00
Brad Hefta-Gaub
ed67ef8f14 Merge pull request #7247 from jherico/qml_script_messaging 
Allow message passing from a script to a QML window
 2016-03-08 10:21:09 -08:00
Ryan Huffman
6ca4b72479 Add deleteMapping to asset scripting interface 2016-03-08 10:11:57 -08:00
Ryan Huffman
a18486d97d Fix GetAllMappingsRequest not storing mappings 2016-03-08 10:11:37 -08:00
Ryan Huffman
cf9d4c256a Add proper cache checking to GetAssetMapping 2016-03-08 10:10:48 -08:00
Stephen Birarda
bf8a2bc9e5 update read for get mapping to toHex 2016-03-08 10:03:29 -08:00
Stephen Birarda
fa04f08c4c use toHex/fromHex for more compact messaging 2016-03-08 10:01:54 -08:00
Stephen Birarda
da3e3b7e6c add handle calls for mapping operations 2016-03-08 09:55:48 -08:00
James B. Pollack
9db528d7a3 Merge pull request #7273 from imgntn/nomarketplaceinfo 
DIsable Right Click Marketplace Info for now from edit.js
 2016-03-08 09:08:29 -08:00
Chris Collins
d9088543af Merge pull request #7274 from imgntn/noavatarheadbody 
Remove avatar head and body from package model selections
 2016-03-08 09:00:59 -08:00
James B. Pollack
2e9ebfb178 remove avatar head and body from pacakage model selections 2016-03-07 21:03:11 -08:00
James B. Pollack
482964d8ad hide this for now 2016-03-07 20:37:14 -08:00
James B. Pollack
268a328fd4 Merge pull request #7268 from imgntn/pingponggunfix 
Adjust ping pong gun dimensions
 2016-03-07 20:14:28 -08:00
Chris Collins
5078f486b1 Merge pull request #7266 from sethalves/local-messages 
allow sending interface-local messsages
 2016-03-07 17:21:45 -08:00
Brad Davis
8988dd9771 Fix mouse drag turning 2016-03-07 17:14:44 -08:00
Brad Davis
634f8fbc83 Fix texture leak 2016-03-07 17:14:43 -08:00
Brad Davis
f5acf49e47 Fix reticle transform when depth != 1 2016-03-07 17:14:42 -08:00