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

176 commits

Author SHA1 Message Date
Atlante45
e7ecf1cd6f Optional labels 2014-10-09 12:38:07 -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
Stephen Birarda
bfaf96dbf5 remove the allowed_users setting that isn't ready for primetime 2014-10-09 11:31:30 -07:00
Stephen Birarda
68dffabd5e handle data-changed setting for all array values 2014-10-09 11:31:00 -07:00
Stephen Birarda
a175c22724 handle addition and removal on same page session 2014-10-09 10:56:54 -07:00
Stephen Birarda
f39120519d fix removal icons, handle row removal for hash 2014-10-09 10:50:05 -07:00
Stephen Birarda
a416f67751 handle add and delete for badged sidebar 2014-10-09 10:33:20 -07:00
Stephen Birarda
90c73dc9e1 post an empty array to remove an array from settings 2014-10-09 09:47:53 -07:00
Stephen Birarda
188320a7b7 badge sidebar for table removal 2014-10-09 09:37:24 -07:00
Stephen Birarda
ed6b62cea4 clear a row value after it is added to the table 2014-10-08 17:07:31 -07:00
Stephen Birarda
1fa0d8df72 change the add and remove style for glyphs in settings 2014-10-08 16:56:41 -07:00
Stephen Birarda
01e6acda39 changes to allow an array setting via table 2014-10-08 16:52:04 -07:00
Stephen Birarda
e6dee30a6a handle drawing a table for array values 2014-10-08 16:01:43 -07:00
Stephen Birarda
1136c1bf13 remove custom font and large X for errors 2014-10-08 15:49:08 -07:00
Stephen Birarda
4daa379b03 use sweet alert for nice error messages in domain-settings 2014-10-08 15:32:56 -07:00
Stephen Birarda
51afd52ffb vertically center the glyphicon for table button 2014-10-08 14:56:09 -07:00
Stephen Birarda
f4eddbc93b change number to numbered for domain-server settings 2014-10-08 14:54:41 -07:00
Stephen Birarda
fb8c5c3bf0 initial styling changes to domain table 2014-10-08 14:52:53 -07:00
Atlante45
19d103c343 Indentation 2014-10-08 13:54:53 -07:00
Atlante45
9a87e764e2 Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones 
Conflicts:
	domain-server/resources/web/js/settings.js
	domain-server/src/DomainServerSettingsManager.cpp
 2014-10-08 11:46:07 -07:00
Atlante45
cd67c9d456 Removed console logs 2014-10-08 11:40:43 -07:00
Atlante45
11b38d554f reindentation 2014-10-08 11:24:01 -07:00
Atlante45
e2d3ca53e6 Changed data to row-data 2014-10-08 11:14:39 -07:00
Atlante45
dd90ea01bd Removed setting-input 2014-10-08 10:25:01 -07:00
Stephen Birarda
7773a94df7 resolve conflicts on merge with upstream master 2014-10-08 09:27:16 -07:00
Atlante45
9c2e688477 indentation 2014-10-07 21:03:02 -07:00
Atlante45
c9e4c12ce2 Removed line number 2014-10-07 21:00:53 -07:00
Atlante45
4e0e9d1dba Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones 2014-10-07 20:52:27 -07:00
Atlante45
91727232f8 Indentation 2014-10-07 20:52:06 -07:00
Atlante45
ec8fcb6b59 removed debug and name in posted object 
:
 2014-10-07 20:43:41 -07:00
Atlante45
2a5292732c DomainServerSettings handles any types of objects 2014-10-07 18:01:32 -07:00
Stephen Birarda
67fdfbb7f1 fix for user domains path in domain settings 2014-10-07 14:19:15 -07:00
Stephen Birarda
ea4c5a8900 repairs for new user scoped paths 2014-10-07 14:18:05 -07:00
Atlante45
8be5c18412 Get table data over to DS 2014-10-06 17:52:41 -07:00
Stephen Birarda
78920234bb handle changed domain-server port on start 2014-10-06 14:49:15 -07:00
Stephen Birarda
14cd044359 handle custom local UDP port for domain-server from webpage 2014-10-06 14:41:16 -07:00
Atlante45
ace8b98064 Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones 2014-10-06 14:12:57 -07:00
Atlante45
011e848c04 Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones 
Conflicts:
	domain-server/resources/describe-settings.json
 2014-10-03 17:52:40 -07:00
Sam Gateau
bd5c6517a5 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 
Conflicts:
	interface/src/ui/MetavoxelEditor.cpp
	interface/src/ui/overlays/Sphere3DOverlay.cpp
 2014-10-03 17:31:05 -07:00
Sam Gateau
738369e21f Replacing glutSolidSphere by a cached Geometry 
Instead of calling glutSolidSphere, just call Application::getInstance()->getGeometryCache()->renderSphere(...)

- replaced all the instances of "glutSolidSphere"
- Changed the atmosphere shaders so instead of drawing a sphere of the size of the atmosphere, we draw a unit sphere, the vertices get scaled at the right radius in th vertex shader using  fOuterRadius
 2014-10-03 16:55:58 -07:00
Philip Rosedale
f38ddb0f6e Merge pull request #3537 from Atlante45/move_att_setting 
Moved attenuation setting to non advanced
 2014-10-03 15:30:58 -07:00
Atlante45
1d37545511 Moved attenuation setting to non advanced 2014-10-03 15:25:03 -07:00
Atlante45
1aab86884d Move table view code + wire row delete 2014-10-03 14:25:36 -07:00
Stephen Birarda
5be067cf11 disable automatic networking by default 2014-10-03 09:31:17 -07:00
Atlante45
a5108375b8 Table JSON data 2014-10-02 15:39:02 -07:00
Atlante45
61e38f545e new table type 2014-10-02 15:38:36 -07:00
Stephen Birarda
e88b3311ad Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel 2014-10-02 09:20:08 -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