Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-13 01:54:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
17843 commits 76 branches 59 tags 1.2 GiB
Commit graph

17843 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philip Rosedale
2a502ae97c Merge pull request #3569 from ey6es/metavoxels 
Improved dual contour averaging.
 2014-10-09 16:55:55 -07:00
Stephen Birarda
e40aff4864 remove a missed console log 2014-10-09 16:54:08 -07:00
Stephen Birarda
31df339565 pipe username signature requirement through to DomainHandler 2014-10-09 16:53:22 -07:00
Philip Rosedale
f18faf9e3e removed commented code. 2014-10-09 16:46:06 -07:00
Atlante45
90c5c7f43c Attenuation coefficients parsing 2014-10-09 16:41:48 -07:00
Philip Rosedale
36044d772c Merge branch 'master' of https://github.com/worklist/hifi 2014-10-09 16:31:47 -07:00
Stephen Birarda
0d2b1e361c have domain-server reply back with username request is allowed_users is not empty 2014-10-09 16:29:52 -07:00
Ryan Huffman
0fce89a627 Add gamepad.js 2014-10-09 16:22:27 -07:00
Stephen Birarda
c342e1b2e8 cleanup help text for allowed users for domain 2014-10-09 16:19:16 -07:00
Stephen Birarda
d70bf7fc50 add allowed users to describe, remove +/- from table header 2014-10-09 16:15:59 -07:00
Stephen Birarda
d741b860f8 fix for delete of object table row 2014-10-09 15:58:26 -07:00
Atlante45
fb520bf47f Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones 2014-10-09 15:34:24 -07:00
Atlante45
f2bbb88405 Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones 
Conflicts:
	domain-server/resources/describe-settings.json
	domain-server/resources/web/js/settings.js
 2014-10-09 15:34:17 -07:00
Stephen Birarda
b6a58925ed Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel 2014-10-09 15:29:54 -07:00
Stephen Birarda
57211927ac Merge pull request #3572 from birarda/master 
fix error in describe json
 2014-10-09 15:29:29 -07:00
Stephen Birarda
95bca3f33e fix an error in describe json 2014-10-09 15:29:15 -07:00
Stephen Birarda
cd531ccf0c Merge pull request #3571 from birarda/master 
remove allowed users from describe until ready
 2014-10-09 15:28:22 -07:00
Stephen Birarda
90a79fc6f5 remove allowed users from describe until ready for primetime 2014-10-09 15:27:51 -07:00
Clément Brisset
eb26b64ae2 Merge pull request #3570 from birarda/master 
fix for array tables with multiple columns
 2014-10-09 15:26:42 -07:00
Stephen Birarda
7eae64a26b constantize the delete row button classes 2014-10-09 15:24:12 -07:00
Stephen Birarda
c748ecb967 constantize the new row class 2014-10-09 15:22:20 -07:00
Stephen Birarda
e80cf6fc76 highlight new rows by making them green 2014-10-09 15:21:38 -07:00
Stephen Birarda
4d13718d87 constantize the trigger change class for input changes 2014-10-09 15:19:56 -07:00
Stephen Birarda
712a81c950 more constantization and removal of extra line 2014-10-09 15:17:45 -07:00
Stephen Birarda
ee36b6b91a jump to input for next row after enter on previous row 2014-10-09 15:12:42 -07:00
Stephen Birarda
a6c5f4308a handle the enter button in domain server forms 2014-10-09 15:10:17 -07:00
Stephen Birarda
ad48592a69 start to constantize some classes in settings.js 2014-10-09 15:02:14 -07:00
Atlante45
0fa95ba61d Removed Unattenuated zones from mixer 2014-10-09 14:46:32 -07:00
Atlante45
b19956b0ca Changed panel names 2014-10-09 14:46:13 -07:00
Stephen Birarda
9dc0bf52b8 constantize the advanced settings class 2014-10-09 14:44:24 -07:00
Stephen Birarda
2472dc0c11 handle transition from input to row for array of objects 2014-10-09 14:42:21 -07:00
Atlante45
06bd9ba16e Split settings parsing according to new structure 2014-10-09 14:39:31 -07:00
Stephen Birarda
323eaa0ac9 remove an extra space 2014-10-09 14:36:33 -07:00
Stephen Birarda
6cef4dbce4 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-10-09 14:36:05 -07:00
Stephen Birarda
98925e4adb handle removal of last row and removal of hidden input for empty array 2014-10-09 14:34:05 -07:00
Andrzej Kapolka
66b83d0ff9 Increment packet version to avoid crashes. 2014-10-09 14:31:41 -07:00
Stephen Birarda
e1b64275c9 fix population of multi-column array from values in settings 2014-10-09 14:26:39 -07:00
Andrzej Kapolka
f69184d8cb Adjustment of threshold multiplier for metavoxels. 2014-10-09 14:22:22 -07:00
Andrzej Kapolka
df49bf8dda Substantial betterification of Hermite data averaging. 2014-10-09 14:04:51 -07:00
Philip Rosedale
2da4345b21 First person and mirror HMD view almost fixed 2014-10-09 13:32:35 -07:00
Atlante45
06007863d2 Fixed placeholder 2014-10-09 12:39:00 -07:00
Atlante45
72e4785db2 Reorganized settings 2014-10-09 12:38:46 -07:00
Atlante45
e7ecf1cd6f Optional labels 2014-10-09 12:38:07 -07:00
Atlante45
4c3f32782a Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones 2014-10-09 12:22:57 -07:00
Clément Brisset
e451942a85 Merge pull request #3568 from birarda/master 
add array type to domain-server setting tables
 2014-10-09 12:22:30 -07:00
Sam Gateau
86c20b26eb Adding proper TODO and comments 2014-10-09 12:20:46 -07:00
Stephen Birarda
6d01724568 rename in changedInput in badge sidebar in settings.js 2014-10-09 11:57:11 -07:00
Stephen Birarda
84fa1c7f5f remove an extra space 2014-10-09 11:54:53 -07:00
Stephen Birarda
806e73d321 don't set data-changed when a row is added and deleted in same session 2014-10-09 11:54:37 -07:00
Atlante45
981666cb38 Moved audioMixer setting parsing to its own function 2014-10-09 11:49:55 -07:00