Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-04-09 00:52:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
45481 commits 17 branches 0 tags 1.1 GiB
Commit graph

45481 commits

This branch
This branch
All branches
Author SHA1 Message Date
elisa-lj11
9ea9baeadf Making JS/QML safer (DOES NOT WORK) 2016-08-16 14:12:19 -07:00
elisa-lj11
b8f5a9d22f CR changes 2016-08-10 10:26:58 -07:00
elisa-lj11
c009834685 Fixes for linux build of quazip 2016-08-05 17:36:27 -07:00
elisa-lj11
e8c5303f1b Removed examples.js 2016-08-04 17:23:36 -07:00
elisa-lj11
90a1325f65 Finalized combobox feature 2016-08-04 17:02:57 -07:00
elisa-lj11
b39c8c52ab Included combobox in marketplace view 2016-08-04 17:02:04 -07:00
elisa-lj11
d63d0ba870 In process of creating combobox for marketplace with qml 2016-08-04 17:02:04 -07:00
elisa-lj11
cd7706e80b Release now has quazip features 2016-08-04 17:01: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
ab02d16eb7 QML troubleshooting 
Trying to find out why it does multiple downloads on one click, when
everything fails. Has something to do with a download finish request
getting sent despite not being completed.
 2016-08-04 16:58:31 -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
76a847d34f testing for URL bug 2016-08-04 16:53:09 -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
87cbb79d67 fixing up quazip 2016-08-04 16:46:56 -07:00
elisa-lj11
c9c965b1e8 added new files for quazip 2016-08-04 16:46:56 -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
elisa-lj11
4f33e1502f starting the zip project 2016-08-04 16:46:56 -07:00
Brad Davis
49ad0951dd Merge pull request #8364 from sethalves/fix-settings-missing-key 
fix bug which caused getValue for a non-existent key to return the integer 2
 2016-08-04 16:39:49 -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
2ac0a0d343 Merge branch 'master' of github.com:highfidelity/hifi into fix-settings-missing-key 2016-08-04 13:29:32 -07:00
Chris Collins
be87f294d8 Merge pull request #8351 from thoys/fix-handcontrollergrab-grab-message 
fix remote triggering handControllerGrab
 2016-08-04 11:55:48 -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
Chris Collins
2473bbf1db Merge pull request #8313 from imgntn/tweak_lazers 
Tweak Teleport + Hand Lasers
 2016-08-03 16:40:28 -07:00
Seth Alves
7740420b96 Merge pull request #8361 from hyperlogic/bug-fix/avatar-debug-draw 
Bug fix for avatar debug marker rendering.
 2016-08-03 16:07:49 -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
Philip Rosedale
f0c944b0c3 Merge pull request #8350 from sethalves/ignore-touch 
if the oculus HMD isn't on someone's head, don't take input from the controllers
 2016-08-03 15:21:43 -07:00
Philip Rosedale
98e40d54e1 Merge pull request #8355 from SamGondelman/touchDeadZone 
Added dead zones to Hydra and Oculus Touch joysticks
 2016-08-03 15:17:15 -07:00
James B. Pollack
e012d3cebb Merge branch 'tweak_lazers' of github.com:imgntn/hifi into tweak_lazers 2016-08-03 15:00:05 -07:00
James B. Pollack
7a41ed25db Merge remote-tracking branch 'upstream/master' into tweak_lazers 2016-08-03 14:59:51 -07:00
Seth Alves
707fa2cafe Merge branch 'master' of github.com:highfidelity/hifi into ignore-touch 2016-08-03 14:51:28 -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
SamGondelman
458e43fadc added dead zones to hydras, style fixes 2016-08-03 10:18:57 -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
Brad Hefta-Gaub
70cb3d3393 Merge pull request #8354 from AlexanderOtavka/remove-web-debug 
Remove url change debug info for WebView
 2016-08-03 09:10:10 -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
James B. Pollack
5ad5899140 revert pointer changes 2016-08-02 21:26:48 -07:00
James B. Pollack
fed39d9056 cleanup dead code 2016-08-02 21:26:04 -07:00
Chris Collins
b2a354ddb9 Merge pull request #8331 from huffman/feat/progress-updates 
progress.js updates
 2016-08-02 21:10:54 -07:00