Stephen Birarda
|
b6e0b08a29
|
add debug to domain server if script not saved
|
2014-10-02 10:07:02 -07:00 |
|
Stephen Birarda
|
0174a985ee
|
add a domain-server scripts folder that is ignored for clean symlink
|
2014-10-01 09:56:13 -07:00 |
|
Stephen Birarda
|
f1de2ac937
|
rename jquery for easier updating in domain-server
|
2014-10-01 09:00:24 -07:00 |
|
Philip Rosedale
|
8f40780af0
|
Merge pull request #3517 from ctrlaltdavid/20048
CR for Job #20048 - Leap - Make leapHands.js work with Leap-on-Rift
|
2014-09-30 21:06:45 -07:00 |
|
Brad Hefta-Gaub
|
22c6298f4d
|
Merge pull request #3516 from thoys/editmodels_js-model-list
Model List in editmodels.js
|
2014-09-30 19:53:57 -07:00 |
|
Brad Hefta-Gaub
|
98fe700105
|
Merge pull request #3512 from birarda/domain-wizard
allow user to select domain ID from their High Fidelity domains
|
2014-09-30 19:53:11 -07:00 |
|
Stephen Birarda
|
7f2008161d
|
remove a debug line that slipped through the cracks
|
2014-09-30 17:25:19 -07:00 |
|
Stephen Birarda
|
ac4a767d60
|
include memory for auto_ptr
|
2014-09-30 15:25:40 -07:00 |
|
Stephen Birarda
|
4ef2863b79
|
fix setting posting for checkbox values
|
2014-09-30 15:01:37 -07:00 |
|
Stephen Birarda
|
cd9029bb92
|
add some debug to NodeList instance refresh
|
2014-09-30 14:59:12 -07:00 |
|
Stephen Birarda
|
9950ed9f9f
|
use auto_ptr in NodeList and LimitedNodeList for cleaner mem management
|
2014-09-30 14:57:32 -07:00 |
|
Stephen Birarda
|
fed7dad2b6
|
use an auto_ptr to be able to reset the AccountManager
|
2014-09-30 14:36:32 -07:00 |
|
Stephen Birarda
|
909a6e89a8
|
resolve conflicts on merge with upstream master
|
2014-09-30 13:50:04 -07:00 |
|
Thijs Wenker
|
fd21d100f6
|
line indention fixes
|
2014-09-30 22:37:29 +02:00 |
|
Thijs Wenker
|
bacad6bcd2
|
Merge branch 'editmodels_js-model-list' of https://github.com/thoys/hifi
|
2014-09-30 22:33:50 +02:00 |
|
Thijs Wenker
|
110e26a9e9
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-09-30 22:32:35 +02:00 |
|
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
|
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 |
|
Stephen Birarda
|
26c2aece7a
|
fix target blank link from domain-server settings
|
2014-09-30 11:21:35 -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 |
|
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 |
|
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 |
|
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 |
|
Philip Rosedale
|
e9cf993c9f
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-09-29 16:11:58 -07:00 |
|