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

328 commits

Author SHA1 Message Date
Stephen Birarda
d4f2c9e631 Merge branch 'master' of https://github.com/highfidelity/hifi into authentication 2014-04-09 14:40:14 -07:00
stojce
7b26317eaf Merge branch 'master' of https://github.com/worklist/hifi into 19548 2014-04-09 18:55:17 +02:00
stojce
ce85e67a42 Modify icons in Interface "mirror" 2014-04-09 18:54:59 +02:00
Stephen Birarda
6681754994 Merge branch 'master' of https://github.com/highfidelity/hifi into authentication 2014-04-08 14:26:10 -07:00
Andrzej Kapolka
ccd7106527 Include "InterfaceConfig" before QOpenGLFramebufferObject to fix Windows 
build.
 2014-04-08 10:54:41 -07:00
Stephen Birarda
080b0d7221 Merge branch 'master' of https://github.com/highfidelity/hifi into authentication 2014-04-08 10:28:14 -07:00
Andrzej Kapolka
d4706bba8a Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-04-08 10:21:13 -07:00
Andrzej Kapolka
5a61009099 Add metavoxel bandwidth to details. 2014-04-08 10:19:39 -07:00
Andrzej Kapolka
0011276b0b Added back the download stats, which got lost in a merge. 2014-04-07 14:19:17 -07:00
Stephen Birarda
efcf506383 resolve conflicts on merge with upstream master 2014-04-07 09:32:08 -07:00
Andrzej Kapolka
2d535f3b86 Removed debugging code. 2014-04-04 16:36:58 -07:00
Andrzej Kapolka
d2b0cc43dd Extent tweaks. 2014-04-04 16:32:14 -07:00
Andrzej Kapolka
1c822542c1 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-04-04 15:29:13 -07:00
Andrzej Kapolka
1f3a5d09d9 Merge pull request #2593 from Atlante45/display_models_metadata 
Display models metadata
 2014-04-04 15:18:18 -07:00
Andrzej Kapolka
a2b94aa433 Working on render modes. 2014-04-04 14:22:01 -07:00
Andrzej Kapolka
a0c7e4d3cc Working on model rendering modes. 2014-04-04 11:45:03 -07:00
Andrzej Kapolka
38022d2440 Fix for voxelizing models. 2014-04-04 00:33:33 -07:00
Andrzej Kapolka
1bf19111dc Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-04-03 23:57:30 -07:00
Andrzej Kapolka
dfaa98cc34 Blend when setting. 2014-04-03 23:51:49 -07:00
Andrzej Kapolka
d706e23012 Basic voxelization. 2014-04-03 23:47:31 -07:00
AndrewMeadows
4a98f9f159 Merge pull request #2485 from kordero/19498 
Code Review for Job #19498
 2014-04-03 12:58:47 -07:00
Lucas Crisman
793179dc72 Merge branch 'master' of git://github.com/worklist/hifi into 19498 
Conflicts:
	interface/src/Application.cpp
 2014-04-03 16:24:32 -03:00
Andrzej Kapolka
061d7719d4 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-04-03 11:55:50 -07:00
Andrzej Kapolka
22710af111 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	interface/interface_en.ts
 2014-04-03 11:37:27 -07:00
Andrzej Kapolka
df4fd9df5f Remove translations for now, but use correct translation keys for the only 
translations we had (days/weeks/etc.)
 2014-04-03 11:30:06 -07:00
Andrzej Kapolka
407a6ecc70 More work on voxelizing. 2014-04-03 11:26:54 -07:00
Atlante45
df718c430a Merge branch 'master' of https://github.com/highfidelity/hifi into display_models_metadata 2014-04-03 11:20:24 -07:00
Dimitar Dobrev
716858e6f6 Informed users who want to chat they have to log in first. 2014-04-03 20:09:54 +03:00
Andrzej Kapolka
4375fe85f1 Working on voxelizing spanners using a set of six rendered images. 2014-04-02 18:56:18 -07:00
Atlante45
5acc8313ba Manual merge 2014-04-02 18:07:55 -07:00
Atlante45
c2f0545d96 Setup for actual metadata 2014-04-02 17:12:11 -07:00
Atlante45
cf20c448a3 Few tweaks before PR 2014-04-02 16:46:03 -07:00
Atlante45
52df77b4b5 Final work on models metadata support 2014-04-02 16:25:35 -07:00
Lucas Crisman
76921d9b52 Merge branch 'master' of git://github.com/worklist/hifi into 19498 2014-04-02 17:18:27 -03:00
Atlante45
b73598ae8a Merge branch 'master' of https://github.com/highfidelity/hifi into display_models_metadata 2014-04-02 11:40:41 -07:00
Atlante45
e60e1929f3 Review comments 2014-04-02 11:36:52 -07:00
Lucas Crisman
1a468ab8ca Merge branch 'master' of git://github.com/worklist/hifi into 19498 
Conflicts:
	interface/src/Application.cpp
 2014-04-02 01:26:25 -03:00
Philip Rosedale
389091ace6 Merge pull request #2587 from matsukaze/nocrAudioFixes 
Audio fixes for win OS.
 2014-04-01 21:03:26 -07:00
matsukaze
d28d686ceb Fix for missing voxel system on domain change. Fix for assertion failure thrown by Qt on exit. 2014-04-02 17:45:22 -07:00
Stephen Birarda
62041d91a8 rename NodeList DomainInfo to DomainHandler 2014-04-01 13:09:35 -07:00
Atlante45
f87c82450a Modified dialog default size 2014-04-01 12:20:08 -07:00
Atlante45
bdd5c291b0 Merge branch 'master' of https://github.com/highfidelity/hifi into display_models_metadata 2014-04-01 12:03:45 -07:00
Atlante45
03958f2fa0 work on metadata in the model browser + real time updates 2014-04-01 12:02:47 -07:00
Andrzej Kapolka
005ae79928 Various fixes and what-not, got the basic spanner clipping working. 2014-03-31 18:21:28 -07:00
Andrzej Kapolka
78896d6af9 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-28 13:29:11 -07:00
Dimitar Dobrev
f9cee2ccfa Fixed a typo that resulted in a wrong padding of a widget. 2014-03-28 22:21:55 +02:00
Andrzej Kapolka
cc5ea2a465 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-28 11:19:58 -07:00
Dimitar Dobrev
6fd1bf7edb Simplified the new goToUser function. 2014-03-28 18:44:06 +02:00
Dimitar Dobrev
4374e28e9c Changed the highlighting of own messages to occupy the whole row. 2014-03-28 18:36:53 +02:00
Dimitar Dobrev
e27f191413 Changed the dock widget for the chat so that it replicates the agreed 
upon design.
 2014-03-28 18:36:53 +02:00