Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-13 10:16:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
17272 commits 75 branches 59 tags 1.2 GiB
Commit graph

17272 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
138e57bcd8 don't set SIXENSE_LIB_FILENAME for INSTALLER_BUILD 2014-10-02 11:16:25 -07:00
Brad Hefta-Gaub
949c39bf6b Merge pull request #3522 from birarda/hydra-crash 
add failsafe for hydra load, look in app frameworks folder
 2014-10-02 10:42:28 -07:00
Leonardo Murillo
78670245df Merge pull request #3523 from birarda/master 
add debug to domain server if script not saved
 2014-10-02 11:10:13 -06:00
Stephen Birarda
b6e0b08a29 add debug to domain server if script not saved 2014-10-02 10:07:02 -07:00
Stephen Birarda
172ee3d7dc add failsafe for hydra load, look in app frameworks folder 2014-10-02 09:06:29 -07:00
Brad Hefta-Gaub
5d67739ab7 Merge pull request #3521 from birarda/domain-wizard 
handle select inputs in domain server settings creation
 2014-10-02 08:36:10 -07:00
Brad Hefta-Gaub
4e752f9bb8 Merge pull request #3520 from Adrianl3d/20082 
CR for Job #20082 - Entity properties bad readable, background is wrong sized
 2014-10-02 08:35:50 -07:00
AndrewMeadows
be3a6e490a Merge pull request #3519 from birarda/master 
add a domain-server scripts folder that is ignored for clean symlink
 2014-10-02 08:35:33 -07:00
Stephen Birarda
a4b4fc52b6 handle select inputs in domain server settings creation 2014-10-01 11:57:44 -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
Brad Hefta-Gaub
b6fba04d4f Merge pull request #3518 from birarda/master 
move jquery for easier updating in domain-server
 2014-10-01 09:07:26 -07:00
Brad Hefta-Gaub
15ccec676c Merge pull request #3513 from Atlante45/recording_audio_offset 
Recording audio offset
 2014-10-01 09:07:06 -07:00
Stephen Birarda
f1de2ac937 rename jquery for easier updating in domain-server 2014-10-01 09:00:24 -07:00
Atlante45
56acc86f4f Missed some qints 2014-09-30 21:20:37 -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
Atlante45
68c25e805a Switch int64 to int 2014-09-30 14:31:40 -07:00
Atlante45
4042df8bfb Merge branch 'master' of https://github.com/highfidelity/hifi into recording_audio_offset 2014-09-30 14:19:31 -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
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
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