Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-25 14:47:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
17522 commits 25 branches 0 tags 1.1 GiB
Commit graph

17522 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
ZappoMan
c3b0700601 introduce Planar3DOverlay for common features of rectangle and circle, introduced rectanglular 3D plane 2014-09-30 14:52:44 -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
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