Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 07:11:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
45482 commits 75 branches 59 tags 1.2 GiB
Commit graph

18650 commits

Author SHA1 Message Date
elisa-lj11
5d2fb68924 Fixed temp dir access 2016-08-16 15:47:57 -07:00
elisa-lj11
9ea9baeadf Making JS/QML safer (DOES NOT WORK) 2016-08-16 14:12:19 -07:00
elisa-lj11
a9a8710689 Switched saving download/upload to temporary directory 2016-08-04 17:01:19 -07:00
elisa-lj11
b1b2ea48b2 Made code more QA; extra browser and download widget close upon download 2016-08-04 17:01:19 -07:00
elisa-lj11
a94a304700 Downloads from Clara.io and uploads to asset server 2016-08-04 16:59:38 -07:00
elisa-lj11
615627e981 Working download and unpackage from Clara.io 2016-08-04 16:59:38 -07:00
elisa-lj11
49712060ed switching to the main site progress 2016-08-04 16:59:38 -07:00
elisa-lj11
c36fc29363 Zip download works 2016-08-04 16:59:03 -07:00
elisa-lj11
6152fa28b7 Download through QML 
It kind of works, not crashing like before, but the weird ghost
file/type error is still happening with multiple downloads
 2016-08-04 16:58:31 -07:00
elisa-lj11
eab7714d70 working within webview to access url 2016-08-04 16:57:19 -07:00
elisa-lj11
9833ba1987 No errors upon build 2016-08-04 16:51:14 -07:00
elisa-lj11
212e4f9cca making quazip work 2016-08-04 16:48:14 -07:00
elisa-lj11
0e79aa9dbe Added quazip for unzipping functions 2016-08-04 16:46:56 -07:00
elisa-lj11
f277a019bf FileScriptingInterface 
Created new .cpp and .h for the download and unzipping of a model
 2016-08-04 16:46:56 -07:00
Seth Alves
a2441ca84c back out some uneeded chagnes 2016-08-04 14:09:12 -07:00
Seth Alves
981a8d76fa code review 2016-08-04 13:47:43 -07:00
Seth Alves
45c21ca523 make UNSET_VALUE still work while still returning and empty string value for undefined keys 2016-08-04 13:37:08 -07:00
Seth Alves
4c258b9568 fix bug which caused getValue for a non-existent key to return the integer 2 2016-08-04 10:16:08 -07:00
Brad Hefta-Gaub
a1dc9beddb Merge pull request #8348 from ZappoMan/beltAndSuspenders 
implement codec renegotiation in client
 2016-08-03 21:22:28 -07:00
Anthony J. Thibault
f24c92f3a1 Bug fix for avatar debug marker rendering. 
"Developer > Hands > Show Hand Targets" works again
"Developer > Avatar > Draw Position" works again
 2016-08-03 15:43:31 -07:00
Brad Hefta-Gaub
eb230071a0 Merge branch 'master' of https://github.com/highfidelity/hifi into beltAndSuspenders 2016-08-03 11:53:28 -07:00
Seth Alves
9962d47173 Merge pull request #8326 from birarda/kick 
kick
 2016-08-03 09:21:09 -07:00
Brad Hefta-Gaub
754eae98c2 Merge pull request #8353 from birarda/fake-atp-url 
fix for disabled physics with unloadable entity
 2016-08-03 09:10:41 -07:00
Seth Alves
cc7322a0de Merge pull request #8334 from ctrlaltdavid/21015 
refresh file dialog when directory content changes
 2016-08-03 08:11:40 -07:00
Brad Hefta-Gaub
193f0bbb99 Merge pull request #8345 from ctrlaltdavid/web-window-signals 
add OverlayWebWindow resized, moved, and closed signals
 2016-08-02 18:41:49 -07:00
Stephen Birarda
5d3e125a06 make failed geomtetry request not hold physics 2016-08-02 16:32:41 -07:00
Zander Otavka
38ba54e481 Fix confirm dialog 2016-08-02 16:04:54 -07:00
Brad Hefta-Gaub
ca3a194454 implment coded renegotiation in client if for some reason unexpected audio codecs come in to inbound stream 2016-08-02 15:30:03 -07:00
Stephen Birarda
4cdc98287b add canKick to USI, revert constants to production 2016-08-02 14:35:51 -07:00
Stephen Birarda
39e6ac0974 cleanup API for HifiConfigVariantMap after migration 2016-08-02 14:35:11 -07:00
Stephen Birarda
62af203d08 migrate the deprecated merged master/user config 2016-08-02 14:35:11 -07:00
Stephen Birarda
7e6dbf2d1a add a kick request packet and send from NL 2016-08-02 14:35:11 -07:00
Stephen Birarda
94b97e8119 expose kick perms from LNL and Node 2016-08-02 14:35:11 -07:00
Stephen Birarda
f04996a53d add the kick permission to domain server settings 2016-08-02 14:35:11 -07:00
David Rowe
31ac7a2812 Add OverlayWebWindow resized, moved, and closed signals 2016-08-02 12:40:01 +12:00
Seth Alves
708bd33056 Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-08-01 12:00:13 -07:00
Seth Alves
60d6673950 switch data-web urls to point at production server rather than dev one 2016-08-01 12:00:08 -07:00
Anthony Thibault
f71a59276c Merge pull request #8317 from hyperlogic/bug-fix/web3doverlay-rendering 
Fix alpha cut-outs and incorrect gamma on web overlays and entities
 2016-07-29 17:44:46 -07:00
David Rowe
800c2b9ec0 Refresh file dialog when directory content changes 2016-07-30 11:21:40 +12:00
Seth Alves
8e1820f911 make sure permissions have the correct ID in the case where a user has been verified 2016-07-29 13:10:14 -07:00
Seth Alves
507410af79 Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-07-29 08:14:15 -07:00
Anthony Thibault
8e3bc97ef9 fix for unused variable warnings 2016-07-29 08:10:10 -07:00
Brad Hefta-Gaub
74a3835a1e CR feedback 2016-07-28 15:15:33 -07:00
Anthony Thibault
ea310bcc43 Web Entities now render correctly as well 2016-07-28 14:11:19 -07:00
Anthony Thibault
be6e401e9a Merge branch 'master' into bug-fix/web3doverlay-rendering 2016-07-28 11:20:35 -07:00
Brad Hefta-Gaub
22619a66ba process events also 2016-07-28 10:51:17 -07:00
Anthony Thibault
6b8e912114 Fix for mac and linux builds 2016-07-28 10:02:19 -07:00
Brad Hefta-Gaub
755989b8ff don't allow punished scripts to slow stop or shutdown 2016-07-28 10:01:05 -07:00
Seth Alves
5a96c8bf57 Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-07-27 18:07:29 -07:00
Seth Alves
cd2f61c90c if logging in, send username signature even when connecting to localhost 2016-07-27 14:03:51 -07:00