Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 09:53:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
9776 commits 25 branches 0 tags 1.1 GiB
Commit graph

9776 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
a6c1e3e87f tweaks to domain-server authentication flow 2014-02-20 16:31:50 -08:00
Stephen Birarda
217a7862e5 groundwork for domain-server to redeem registration tokens 2014-02-20 14:50:35 -08:00
Stephen Birarda
ee90c25a41 add helpers for json responses from AccountManager 2014-02-20 14:22:08 -08:00
Stephen Birarda
2408d909ba resolve conflicts on merge with upstream master 2014-02-20 12:12:29 -08:00
Philip Rosedale
7010c45b16 Merge pull request #2036 from ZappoMan/js_clipboard 
Clipboard support in JS and lots of improvements to editVoxels.js
 2014-02-20 12:08:56 -08:00
Stephen Birarda
3bace43aae Merge branch 'master' of https://github.com/highfidelity/hifi into authentication 2014-02-20 12:08:47 -08:00
Philip Rosedale
55a1734a3e Merge pull request #2042 from birarda/metavoxel-fix 
metavoxel interest list and kill/add fixes
 2014-02-20 11:49:30 -08:00
Stephen Birarda
4022d9f4c4 fix metavoxel interest list, keep node alive with ping 2014-02-20 11:36:16 -08:00
Stephen Birarda
6f84230d9d resolve conflicts on merge with upstream/master 2014-02-20 10:14:36 -08:00
ZappoMan
d04166811e wired up voxel size slider to actually change voxel size 2014-02-20 02:24:26 -08:00
ZappoMan
7cab5013cc more work to wire up voxel size slider and +/- keys 2014-02-20 01:20:56 -08:00
ZappoMan
66d757863c adding first cut at voxel size slider to editVoxels.js 2014-02-19 23:52:29 -08:00
ZappoMan
546ab51ed5 add click support to color swatchs in editVoxels.js 2014-02-19 22:37:43 -08:00
ZappoMan
cbacf5f328 correctly draw tools when in orbit mode 2014-02-19 22:30:28 -08:00
ZappoMan
61d9ea44af add tool palette and eye dropper mode 2014-02-19 22:17:19 -08:00
ZappoMan
cbf1b09552 fix small bug in line preview mode 2014-02-19 21:07:52 -08:00
ZappoMan
f506c21590 add line preview mode to editVoxels.js and make that the default mode 2014-02-19 20:57:58 -08:00
ZappoMan
0e8cab7349 added Clipboard.nudgeVoxel() and added support for calling clipboard opertations with VoxelDetail as well as xyzs 2014-02-19 20:09:35 -08:00
Stephen Birarda
cb165902fd use existing constants for HTTP operations 2014-02-19 18:12:10 -08:00
Stephen Birarda
d3dd49a2e8 force DomainServer to wait for session UUID before setup with auth 2014-02-19 18:06:21 -08:00
ZappoMan
91d79f65f2 fix crash on import from JS 2014-02-19 17:57:28 -08:00
ZappoMan
3a8a880a8b Merge branch 'master' of https://github.com/worklist/hifi into js_clipboard 2014-02-19 17:49:22 -08:00
ZappoMan
f6fba54dda improved text mapping in keyboard events 2014-02-19 17:49:00 -08:00
ZappoMan
7662264af8 more work on clipboard example 2014-02-19 17:48:38 -08:00
Stephen Birarda
32ceccfeb6 have domain-server bail if username/password not provided for auth 2014-02-19 17:26:21 -08:00
ZappoMan
8ede0ed32b Merge pull request #2031 from Atlante45/fix_import 
Fix import
 2014-02-19 16:55:49 -08:00
Atlante45
b69bdccc8f Merge branch 'master' of https://github.com/highfidelity/hifi into fix_import 2014-02-19 16:11:31 -08:00
ZappoMan
3f572765ed Merge pull request #2027 from josecpujol/19489 
Code Review for Job #19489
 2014-02-19 16:06:21 -08:00
Atlante45
af3e19e640 Added style and pngs for the buttons 2014-02-19 16:01:14 -08:00
Jose Carlos
44d5b9b2f8 cosmetic change 2014-02-20 00:22:29 +01:00
ZappoMan
2a57080191 add clipboard example 2014-02-19 15:06:10 -08:00
Jose Carlos
ee7b5844b8 Minor cosmetic change 2014-02-19 23:24:26 +01:00
Stephen Birarda
57538af8fd give a separate QNetworkAccessManager to the AccountManager 2014-02-19 14:19:00 -08:00
Stephen Birarda
a4cabe91f8 use UUID setter to fire signal and debug on UUID change 2014-02-19 14:17:14 -08:00
Stephen Birarda
c5b8ff181e indicate that both username or email can be passed for login 2014-02-19 14:14:17 -08:00
Stephen Birarda
5f130872af repair usage of INI file for QSettings 2014-02-19 14:09:18 -08:00
Jose Carlos
241214ba37 Fixed compilation after merged from upstream 2014-02-19 23:08:19 +01:00
Jose Carlos
828508bbf1 merged from master 2014-02-19 23:01:13 +01:00
Jose Carlos
ba0b01d028 Style changes after ZappoMan's comments 2014-02-19 22:51:40 +01:00
Stephen Birarda
0b4021ea43 switch to ini settings file by default for Interface, closes #2029 2014-02-19 13:17:53 -08:00
ZappoMan
1dde40167d Merge branch 'master' of https://github.com/worklist/hifi into js_clipboard 2014-02-19 13:16:41 -08:00
Atlante45
406768bf12 Code style fixes 2014-02-19 13:13:17 -08:00
Stephen Birarda
78c246f1ba repair to saveSnapshot call from interface 2014-02-19 13:08:57 -08:00
Jose Carlos
4fd735e28f Added a factor to correct display name position for non default models 
For the default avatar, the position is wrong
 2014-02-19 22:08:47 +01:00
Stephen Birarda
ff7a49d8c2 resolve conflicts on merge with upstream master 2014-02-19 13:07:26 -08:00
Atlante45
919891d73c Merge branch 'master' of https://github.com/highfidelity/hifi into fix_import 2014-02-19 12:38:08 -08:00
Atlante45
a732cbf300 Modified QSS for new UI (QProgressBar) 2014-02-19 12:37:08 -08:00
Atlante45
0ed7b959d7 Changed import dialog UI 2014-02-19 12:36:27 -08:00
Atlante45
7bce649080 Fix for voxelImporter 2014-02-19 12:35:45 -08:00
Atlante45
f24cd0ceba Added switch to pasteMode after successful import. 2014-02-19 12:34:38 -08:00