Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-17 20:26:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
17264 commits 6 branches 1 tag 1.1 GiB
Commit graph

17264 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philip Rosedale
11395a0e10 Merge branch 'master' of https://github.com/worklist/hifi 2014-09-26 17:03:44 -07:00
Philip Rosedale
9b228c9e37 Merge pull request #3497 from ZappoMan/entityPropsRescale 
add rescale support to entity properties UI
 2014-09-26 16:42:15 -07:00
Leonardo Murillo
bf380391c2 Merge pull request #3498 from birarda/domain-wizard 
fix for ds static assignments from queue
 2014-09-26 17:41:01 -06:00
Stephen Birarda
ae542419d1 fix for static assignments from queue 2014-09-26 16:36:18 -07:00
Brad Hefta-Gaub
e145b988b1 Merge pull request #3494 from birarda/master 
cleanup for ifdef'ed glm::vec3 getters in OculusManager
 2014-09-26 16:26:35 -07:00
ZappoMan
cbc502553b add rescale support to entity properties UI 2014-09-26 16:25:24 -07:00
Stephen Birarda
4559c8a9ca Merge pull request #3496 from birarda/domain-wizard 
fix for domain-server allowed roles
 2014-09-26 16:24:24 -07:00
Stephen Birarda
9e02a36d3d fix for domain-server allowed roles 2014-09-26 16:23:57 -07:00
Stephen Birarda
3f517bef82 Merge pull request #3495 from birarda/domain-wizard 
fix for role lookup in domain-server
 2014-09-26 16:21:36 -07:00
Stephen Birarda
d389f13e1b fix for role lookup in domain-server 2014-09-26 16:21:12 -07:00
Philip Rosedale
c276523afd Merge branch 'master' of https://github.com/worklist/hifi 2014-09-26 15:55:41 -07:00
Stephen Birarda
bd73c950ac cleanup for eyePosition ifdef HAVE_LIBOVR 2014-09-26 15:44:10 -07:00
Stephen Birarda
7c738edbd8 Merge pull request #3488 from PhilipRosedale/master 
Correct eye contact for Oculus users
 2014-09-26 15:42:03 -07:00
Philip Rosedale
2f609bb711 Merge pull request #3492 from birarda/domain-wizard 
initial re-tooling of domain-server settings for metaverse setup
 2014-09-26 15:40:44 -07:00
Philip Rosedale
3ea9923240 Merge pull request #3493 from ZappoMan/moreWorkOnCollidingEntitites 
handled multiple collisions correctly, and don't collide if fully enclosed
 2014-09-26 15:33:54 -07:00
Atlante45
6df430660d Uninitialized member 2014-09-26 15:23:17 -07:00
Stephen Birarda
ae5a7b40a6 don't symlink the web directory on WIN32 2014-09-26 15:19:40 -07:00
ZappoMan
7bea4b3123 also honor ignore collisions for voxels and avatars 2014-09-26 15:12:59 -07:00
Stephen Birarda
42d40d5a13 some help text cleanup for audio settings 2014-09-26 15:11:12 -07:00
ZappoMan
bbd476d564 handled multiple collisions correctly, and don't collide if fully enclosed 2014-09-26 14:55:05 -07:00
Stephen Birarda
6bc81e6ff4 use panels on main domain-server page 2014-09-26 14:45:32 -07:00
Stephen Birarda
e8c3fa3cf1 use ID from new domain settings, don't disable save button 2014-09-26 14:39:50 -07:00
Stephen Birarda
3cbfad69cd fix indentation issues for merged AddressBarDialog classes 2014-09-26 14:32:59 -07:00
Stephen Birarda
e75a2d355e Merge branch 'master' of https://github.com/highfidelity/hifi into domain-wizard 2014-09-26 14:31:52 -07:00
Stephen Birarda
cccacf4e6a disable the save button if no settings are changed 2014-09-26 14:31:44 -07:00
Stephen Birarda
bbf111a9a0 disable the save button when nothing has changed 2014-09-26 14:27:29 -07:00
Stephen Birarda
5b2b0c47c0 Merge pull request #3483 from stojce/20061 
Code Review for Job #20061
 2014-09-26 14:24:44 -07:00
Stephen Birarda
05b80e3fb4 remove scrollspy while sections are not large enough 2014-09-26 14:21:49 -07:00
Stephen Birarda
401eb7df4f remove the offset from scrollspy 2014-09-26 14:19:56 -07:00
Stephen Birarda
2a7626159c stop the refresh countdown once we hit zero 2014-09-26 14:15:56 -07:00
Stephen Birarda
80f1594a17 add a restart modal to settings page 2014-09-26 14:12:30 -07:00
AndrewMeadows
7f7861671e Merge pull request #3471 from ctrlaltdavid/20055 
Code Review for Job #20055
 2014-09-26 14:00:33 -07:00
AndrewMeadows
7223cf8d2a Merge pull request #3490 from ZappoMan/moreWorkOnCollidingEntitites 
add support for ignore collisions and collisions will/wont move entities
 2014-09-26 14:00:01 -07:00
Andrzej Kapolka
aa0b3a18ef Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-09-26 13:53:23 -07:00
Stephen Birarda
0f41ca65a9 add a save button on domain settings when viewport small 2014-09-26 13:53:12 -07:00
Andrzej Kapolka
2426df9e1d Merge pull request #3491 from ey6es/master 
If we're rendering the billboard, don't render the body.
 2014-09-26 13:48:57 -07:00
Andrzej Kapolka
efa22d931f If we're rendering the billboard, don't render the body. 2014-09-26 13:48:11 -07:00
Andrzej Kapolka
3fe6e30632 Working on QR decomposition. 2014-09-26 13:43:28 -07:00
Stephen Birarda
e3a85299ce fix setting parsing in AudioMixer for new format 2014-09-26 13:17:11 -07:00
Stephen Birarda
33856be29e add period to help text for http password 2014-09-26 13:16:08 -07:00
Stephen Birarda
96627a8f97 allow authenticated access to full domain-server settings 2014-09-26 12:56:35 -07:00
ZappoMan
21b0e31ee1 Merge branch 'master' of https://github.com/highfidelity/hifi into moreWorkOnCollidingEntitites 2014-09-26 12:21:51 -07:00
Stephen Birarda
94f30fe4d9 handle password setting by not converting to double 2014-09-26 12:20:12 -07:00
Stephen Birarda
21809cc9df fix http username with no password 2014-09-26 12:09:29 -07:00
ZappoMan
2d81d7c554 add support for ignore collisions and collisions will/wont move entities 2014-09-26 11:43:56 -07:00
Philip Rosedale
b3f15966fc Merge branch 'master' of https://github.com/worklist/hifi 2014-09-26 11:29:42 -07:00
Stephen Birarda
60258e4989 remove the save requires restart signal 2014-09-26 11:26:38 -07:00
Stephen Birarda
3c71d4d96e add ability for domain-server to restart after setting save 2014-09-26 11:26:21 -07:00
Philip Rosedale
7c1333dcb0 Merge pull request #3486 from ZappoMan/moreWorkOnCollidingEntitites 
Improvements to entity collisions (using shape collider)
 2014-09-26 11:25:51 -07:00
Philip Rosedale
60d6a0bf0d Merge pull request #3489 from Atlante45/radio_js 
AudioInjector stereo fix
 2014-09-26 11:25:13 -07:00