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

17291 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrzej Kapolka
27099f6dcd Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-02 13:03:00 -07:00
Andrzej Kapolka
4e19cc21f6 Remove the "box edit" in favor of using the spanner edit. 2014-10-02 13:01:39 -07:00
Andrzej Kapolka
bce0147776 Added aspect fields to cuboids. 2014-10-02 12:51:56 -07:00
Andrzej Kapolka
d3761cd753 Cuboid shape implementation. 2014-10-02 12:25:19 -07:00
Leonardo Murillo
aa1af0e144 Merge pull request #3524 from birarda/master 
fix for domain-server script deployment with auth
 2014-10-02 12:50:21 -06:00
AndrewMeadows
8345ae37d3 Merge pull request #3525 from birarda/hydra-crash 
don't set SIXENSE_LIB_FILENAME for INSTALLER_BUILD
 2014-10-02 11:30:31 -07:00
Stephen Birarda
60e3f3edfa add skipSubHandler to OctreeServer HTTPRequestHandler calls 2014-10-02 11:20:56 -07:00
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
Stephen Birarda
4749fdb0ba allow calls to HTTPManager to skip the subHandler and ask for direct processing 2014-10-02 10:38:46 -07:00
Stephen Birarda
157fdf6afa cleanup debug for script path 2014-10-02 10:17:31 -07:00
Stephen Birarda
89907136fa one more debug line for script redirect 2014-10-02 10:15:12 -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
Andrzej Kapolka
42e95f2b38 Working on spanner metavoxel edits. 2014-10-01 18:46:23 -07:00
Stephen Birarda
a4b4fc52b6 handle select inputs in domain server settings creation 2014-10-01 11:57:44 -07:00
Andrzej Kapolka
1ca212f43d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-01 11:55:27 -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
Andrzej Kapolka
4dbd2367f4 Working on shapes for metavoxel edits. 2014-09-30 17:34:01 -07:00
Stephen Birarda
7f2008161d remove a debug line that slipped through the cracks 2014-09-30 17:25:19 -07:00
Andrzej Kapolka
14267e3902 Layout tweak. 2014-09-30 15:42:33 -07:00
Stephen Birarda
ac4a767d60 include memory for auto_ptr 2014-09-30 15:25:40 -07:00
Andrzej Kapolka
add7ad4d4e Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-09-30 15:21:27 -07:00
Andrzej Kapolka
5d2f6b98e2 Added erase buttons, initialize color editor on creation. 2014-09-30 15:20:24 -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
Andrzej Kapolka
70847ff3f9 Allow painting boxes that aren't grid-aligned; merged color and material 
tools.
 2014-09-30 14:53:19 -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