Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
17451 commits 2 branches 0 tags 1.1 GiB
Commit graph

17451 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
1788fd46a3 Merge pull request #3515 from Atlante45/attenuation_setting 
Attenuation setting
 2014-09-30 13:32:25 -07:00
Thijs Wenker
7f34079d8f cleared comment 2014-09-30 22:31:41 +02:00
Philip Rosedale
e624058c14 Merge pull request #3514 from birarda/hydra-crash 
fix for debug build without sixense library
 2014-09-30 13:24:17 -07:00
Thijs Wenker
9ba2a9736c style 2014-09-30 22:23:40 +02:00
Thijs Wenker
eed6e2e8f6 - Edit -> Model List menu option 
- Combo items can be JS objects now, write a toString() function for each JS object to describe them
 2014-09-30 22:11:21 +02:00
Atlante45
4c34571570 Removed debug 2014-09-30 12:54:58 -07:00
Atlante45
b571fb86ae Changed attenuation setting help 2014-09-30 12:53:33 -07:00
Atlante45
4e7bf0487b Add attenuation setting on DS page 2014-09-30 12:50:50 -07:00
Stephen Birarda
3969c8bfe0 don't allow a username and password for domain auth, require access token 2014-09-30 12:23:04 -07:00
Andrzej Kapolka
001af5f982 Simplify the message situation by removing color-only edits. 2014-09-30 12:17:35 -07:00
Andrzej Kapolka
e01113d2a7 Simplifications suggested by Andrew. 2014-09-30 12:01:44 -07:00
Stephen Birarda
31080c41df Merge branch 'master' of https://github.com/highfidelity/hifi into domain-wizard 2014-09-30 11:39:13 -07:00
Stephen Birarda
39ee62608b ensure HAVE_SIXENSE is defined to define _sixenseLibrary 2014-09-30 11:35:53 -07:00
Stephen Birarda
df5ab50703 clear up domain ID selection on domain settings page 2014-09-30 11:34:03 -07:00
ZappoMan
7fc6eecca7 added support for dashed lines for 3D Circle overlays 2014-09-30 11:27:16 -07:00
Atlante45
c599bed176 Merge branch 'master' of https://github.com/highfidelity/hifi into recording_audio_offset 2014-09-30 11:24:55 -07:00
Atlante45
5f95cbc101 JS hooks 2014-09-30 11:23:33 -07:00
Atlante45
1afdd34577 Added custom audio offset and volume to Player 2014-09-30 11:23:25 -07:00
Stephen Birarda
26c2aece7a fix target blank link from domain-server settings 2014-09-30 11:21:35 -07:00
Atlante45
dbc81fcdca Update audio injector volume every frame 2014-09-30 11:19:45 -07:00
Stephen Birarda
f566b42d18 make My Tokens link open in a new tab 2014-09-30 11:17:55 -07:00
Stephen Birarda
541c3c6da8 handle style of button while domains are loading 2014-09-30 11:02:47 -07:00
Stephen Birarda
5b03a445a8 allow user to choose domain ID from High Fidelity domains 2014-09-30 10:47:52 -07:00
David Rowe
26cd76e07b Position and orient hands when using Leap on HMD 2014-09-30 10:08:50 -07:00
ZappoMan
16cdc2614f added circle overlays 2014-09-30 10:06:39 -07:00
Philip Rosedale
36e7892826 Merge pull request #3511 from PhilipRosedale/master 
Turn off room limit constraints in headMove.js that were being applied everywhere
 2014-09-30 10:06:07 -07:00
David Rowe
673afca11b Update camera object's position and orientation with actual Rift values 2014-09-30 10:05:59 -07:00
Philip Rosedale
a07a0f4f72 Disable room limits set for demo comedy club 2014-09-30 09:57:05 -07:00
Stephen Birarda
7e184d67e5 handle transition from dashed JSON settings keys to underscore 2014-09-30 09:49:34 -07:00
Stephen Birarda
68a70cc914 don't use dashes in settings JSON keys 2014-09-30 09:40:54 -07:00
Stephen Birarda
f07a8fd672 add a message for domain query with missing access token 2014-09-30 09:37:41 -07:00
Stephen Birarda
85aa0c34fb stub of domain-server choose domain handler 2014-09-30 09:31:04 -07:00
Stephen Birarda
c84aac9d2e remove an extra console log 2014-09-30 09:12:53 -07:00
AndrewMeadows
418bf1ec3c Merge pull request #3510 from ey6es/metavoxels 
Use simpler and more reliable Jacobi eigenvalue algorithm to compute SVD.
 2014-09-30 09:00:18 -07:00
Adrianl3d
2ab38ace1b Improved contrast to textOverlay and resize 
Increased background alpha, increased text color, and resize to allow
for new properties.
 2014-09-30 16:34:47 +10:00
Andrzej Kapolka
4cdfe87cf1 Merge pull request #3507 from Atlante45/recording_frames_interpolation 
Recording frames interpolation
 2014-09-29 19:46:11 -07:00
Andrzej Kapolka
3c1f3b77a7 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-09-29 19:14:47 -07:00
Andrzej Kapolka
802b14d5ab Use Jacobi eigenvalue algorithm to get eigenvalues/eigenvectors. 2014-09-29 19:14:17 -07:00
Stephen Birarda
a2d263f978 Merge pull request #3509 from birarda/hydra-crash 
have OS X hydra support be disabled by default
 2014-09-29 17:29:09 -07:00
Stephen Birarda
e512b05e62 add extra debug for hydra library initialization 2014-09-29 17:28:50 -07:00
Stephen Birarda
f047c2dff0 have OS X hydra support be disabled by default 2014-09-29 17:08:06 -07:00
ZappoMan
25b072cb22 first cut at new glowing pulsing select ui in editModels.js 2014-09-29 16:46:17 -07:00
ZappoMan
bffd236640 add glowLevel, and pulse to all overlays 2014-09-29 16:44:40 -07:00
Stephen Birarda
1f5b13d184 Merge pull request #3508 from birarda/hydra-crash 
fix reset password link for login dialog
 2014-09-29 16:38:40 -07:00
Stephen Birarda
2fbd249d9f fix reset password link for LoginDialog 2014-09-29 16:38:10 -07:00
Atlante45
99da217414 Merge branch 'recording_frames_interpolation' of github.com:Atlante45/hifi into recording_audio_offset 2014-09-29 16:12:51 -07:00
Philip Rosedale
e9cf993c9f Merge branch 'master' of https://github.com/worklist/hifi 2014-09-29 16:11:58 -07:00
Philip Rosedale
3b0214358b Merge pull request #3505 from birarda/hydra-crash 
dynamically load sixense lib on OS X to make avoiding hid_init crash easier
 2014-09-29 16:09:12 -07:00
Stephen Birarda
3c236cc60a resolve conflicts on merge with upstream master 2014-09-29 16:00:50 -07:00
David Rowe
1bffaa262d Reference camera object rather than copy it 2014-09-29 15:46:22 -07:00