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
Stephen Birarda
8ce474d3e1
make the ice server const scoped to remove warning
2014-10-03 15:29:16 -07:00
Stephen Birarda
4e0bb94cdd
fix for double ICE connect attempts from domain-server
2014-10-03 15:25:47 -07:00
Atlante45
1d37545511
Moved attenuation setting to non advanced
2014-10-03 15:25:03 -07:00
Stephen Birarda
f673ab316a
tell the data-server about auto networking change to full
2014-10-03 15:06:27 -07:00
Atlante45
1aab86884d
Move table view code + wire row delete
2014-10-03 14:25:36 -07:00
Stephen Birarda
52ec949aac
Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel
2014-10-03 11:26:23 -07:00
Stephen Birarda
d02795cc85
have data-web respond with ice server hostname to use for connection
2014-10-03 10:48:09 -07:00
Stephen Birarda
cb6e420392
fix for peer addition from ice-server
2014-10-03 09:50:58 -07:00
Stephen Birarda
d9e0c91e02
remove a peer in domain-server after max connection attempts
2014-10-03 09:45:44 -07:00
Stephen Birarda
5be067cf11
disable automatic networking by default
2014-10-03 09:31:17 -07:00
Stephen Birarda
05cf0142e9
fix for default value search
2014-10-03 09:19:51 -07:00
Stephen Birarda
bd68126b19
fix for values without defaults
2014-10-03 09:14:23 -07:00
Stephen Birarda
720f8ecae8
handle case where access_token is empty
2014-10-03 09:08:27 -07:00
Stephen Birarda
1a1ae43bc7
send back to the network peer on established sock addr if it exists
2014-10-03 09:02:18 -07:00
Stephen Birarda
49d081088a
mode nodes to connected hash upon ping reply receipt
2014-10-03 08:58:03 -07:00
Stephen Birarda
15cc08da97
initial handling of ping replies in domain-server
2014-10-02 17:21:11 -07:00
Stephen Birarda
0d4ef4aaca
ping connecting ICE peers from domain-server
2014-10-02 17:18:05 -07:00
Stephen Birarda
63877b0756
handle domain connection via ICE from NodeList
2014-10-02 16:51:12 -07:00
Stephen Birarda
c7aaf0ce4a
handle ping out from node requiring ice connection to domain
2014-10-02 16:24:46 -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
6425276eb0
have domain-server using full networking heartbeat with ice-server
2014-10-02 14:33:39 -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
Stephen Birarda
9baf983d07
Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel
2014-10-02 10:47:54 -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
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
Stephen Birarda
d6572c3e2e
handle automatic networking changes with data-server
2014-10-01 16:38:44 -07:00
Stephen Birarda
15156519b3
Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel
2014-10-01 16:19:16 -07:00
Stephen Birarda
3292808342
update domain network address updating for IP auto networking
2014-10-01 16:19:10 -07:00
Stephen Birarda
d5b0904d7a
handle new automatic networking option in domain-server
2014-10-01 12:08:19 -07:00
Stephen Birarda
2eec6c1401
changes to settings.js to allow for select inputs
2014-10-01 12:00:10 -07:00
Stephen Birarda
a4b4fc52b6
handle select inputs in domain server settings creation
2014-10-01 11:57:44 -07:00
Stephen Birarda
d3cef7e592
add select for automatic networking to describe settings
2014-10-01 11:57:24 -07:00
Stephen Birarda
a0487e0a57
send public and local sockets to data-server in new format
2014-10-01 10:42:14 -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
Stephen Birarda
f1de2ac937
rename jquery for easier updating in domain-server
2014-10-01 09:00:24 -07:00
Stephen Birarda
4ef2863b79
fix setting posting for checkbox values
2014-09-30 15:01:37 -07:00
Stephen Birarda
fed7dad2b6
use an auto_ptr to be able to reset the AccountManager
2014-09-30 14:36:32 -07:00
Stephen Birarda
909a6e89a8
resolve conflicts on merge with upstream master
2014-09-30 13:50:04 -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
Stephen Birarda
df5ab50703
clear up domain ID selection on domain settings page
2014-09-30 11:34:03 -07:00
Stephen Birarda
26c2aece7a
fix target blank link from domain-server settings
2014-09-30 11:21:35 -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
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
Stephen Birarda
c84aac9d2e
remove an extra console log
2014-09-30 09:12:53 -07:00
Stephen Birarda
bd4a32551b
fix for settings save without organization
2014-09-29 10:09:33 -07:00
Stephen Birarda
46258ae78f
add a tooltip to say why locked settings cannot be changed
2014-09-29 10:02:01 -07:00
Stephen Birarda
58b03c7ef2
disable form inputs for values set by master config
2014-09-29 09:53:27 -07:00
Stephen Birarda
ec0805acc5
add locked settings to json return for auth'ed settings
2014-09-29 09:34:04 -07:00
Stephen Birarda
5e2870ac5f
require a distinction between master config and user config
2014-09-29 09:30:08 -07:00
Stephen Birarda
ae542419d1
fix for static assignments from queue
2014-09-26 16:36:18 -07:00
Stephen Birarda
9e02a36d3d
fix for domain-server allowed roles
2014-09-26 16:23:57 -07:00
Stephen Birarda
d389f13e1b
fix for role lookup in domain-server
2014-09-26 16:21:12 -07:00
Stephen Birarda
ae5a7b40a6
don't symlink the web directory on WIN32
2014-09-26 15:19:40 -07:00
Stephen Birarda
42d40d5a13
some help text cleanup for audio settings
2014-09-26 15:11:12 -07:00
Stephen Birarda
6bc81e6ff4
use panels on main domain-server page
2014-09-26 14:45:32 -07:00
Stephen Birarda
e8c3fa3cf1
use ID from new domain settings, don't disable save button
2014-09-26 14:39:50 -07:00
Stephen Birarda
cccacf4e6a
disable the save button if no settings are changed
2014-09-26 14:31:44 -07:00
Stephen Birarda
bbf111a9a0
disable the save button when nothing has changed
2014-09-26 14:27:29 -07:00
Stephen Birarda
05b80e3fb4
remove scrollspy while sections are not large enough
2014-09-26 14:21:49 -07:00
Stephen Birarda
401eb7df4f
remove the offset from scrollspy
2014-09-26 14:19:56 -07:00
Stephen Birarda
2a7626159c
stop the refresh countdown once we hit zero
2014-09-26 14:15:56 -07:00
Stephen Birarda
80f1594a17
add a restart modal to settings page
2014-09-26 14:12:30 -07:00
Stephen Birarda
0f41ca65a9
add a save button on domain settings when viewport small
2014-09-26 13:53:12 -07:00
Stephen Birarda
33856be29e
add period to help text for http password
2014-09-26 13:16:08 -07:00
Stephen Birarda
96627a8f97
allow authenticated access to full domain-server settings
2014-09-26 12:56:35 -07:00
Stephen Birarda
94f30fe4d9
handle password setting by not converting to double
2014-09-26 12:20:12 -07:00
Stephen Birarda
21809cc9df
fix http username with no password
2014-09-26 12:09:29 -07:00
Stephen Birarda
60258e4989
remove the save requires restart signal
2014-09-26 11:26:38 -07:00
Stephen Birarda
3c71d4d96e
add ability for domain-server to restart after setting save
2014-09-26 11:26:21 -07:00
Stephen Birarda
954fbc2017
use DomainServerSettingsManager to handle simulation settings and config
2014-09-26 11:06:05 -07:00
Stephen Birarda
2c8d8decb8
remove focus from advanced toggle when clicked
2014-09-26 09:46:55 -07:00
Stephen Birarda
507621ca3a
add toggle for advanced settings
2014-09-26 09:27:33 -07:00
Stephen Birarda
7d14408adc
badge the list-group-item when settings have changed
2014-09-26 09:15:48 -07:00
Stephen Birarda
13f2ea33ad
symlink the web directory instead of direct copy for DS
2014-09-26 08:48:00 -07:00
Stephen Birarda
f47cc176b5
resolve conflicts on merge with upstream master
2014-09-26 08:33:34 -07:00
Stephen Birarda
ba929626c2
fix for undefined placeholder values
2014-09-25 18:25:16 -07:00
Stephen Birarda
697ae900dc
handle basic vs advanced settings
2014-09-25 18:14:18 -07:00
Stephen Birarda
9a56e72079
fix for values grabbed from settings
2014-09-25 18:08:22 -07:00
Stephen Birarda
ecb14d261b
distinguish advanced and standard settings, cleanup checkboxes
2014-09-25 18:04:25 -07:00
Stephen Birarda
606a25694d
setup scrollspy for nav links on settings page
2014-09-25 17:18:10 -07:00
Stephen Birarda
623e9e625b
update to jQuery 2.1.1
2014-09-25 16:42:39 -07:00
Stephen Birarda
e8f25db6d8
update underscore to 1.7.0
2014-09-25 16:41:14 -07:00
Stephen Birarda
1c899daa1c
don't escape setting help to allow for html
2014-09-25 16:37:08 -07:00
Stephen Birarda
33a411b895
combine settings and setup into single tab
2014-09-25 16:32:09 -07:00
Stephen Birarda
2e176589b7
initial use of a json file to describe setup options
2014-09-25 15:12:37 -07:00
Stephen Birarda
769586ef30
remove extra panels in domain-server setup
2014-09-25 14:23:15 -07:00
Stephen Birarda
33462f7466
handle permanent sidebar in setup page
2014-09-25 14:22:32 -07:00
Stephen Birarda
4790f517d6
add a nav panel for setup and pin to left
2014-09-25 13:42:11 -07:00
Atlante45
94edf2c900
Defaulted penumbra filter to true
2014-09-24 15:45:43 -07:00
Stephen Birarda
0b83795a13
simplify the domain setup page to just handle domain ID
2014-09-24 14:43:28 -07:00
Stephen Birarda
62e0d98d6b
add username and password to domain setup page
2014-09-24 14:39:10 -07:00
Stephen Birarda
4a040b3f5e
add base of modal to choose from user domains
2014-09-24 14:36:08 -07:00
Stephen Birarda
25150b9285
update to newer bootstrap, add stub of setup form
2014-09-24 13:56:15 -07:00
Craig Hansen-Sturm
8e6d5da8fd
disable positional filter by default
2014-09-18 16:05:15 -07:00
Stephen Birarda
cc79254a41
have domain server make sure access token is present before IP update
2014-09-17 09:40:48 -07:00
Stephen Birarda
f1458dec3f
fix presentation of checkboxes who default to true
2014-09-17 08:46:08 -07:00
Stephen Birarda
885030a10c
handle receipt of new public socket and propogation to data-server
2014-09-16 12:37:22 -07:00
Stephen Birarda
47137c72a5
groundwork for repeated dynamic IP address updating in domain-server
2014-09-16 12:09:24 -07:00
Craig Hansen-Sturm
ea6f89c9f4
head penumbra filter tuning / head penumbra filter now turned on by default
2014-09-15 18:46:10 -07:00
Stephen Birarda
c98b69f24f
don't comment value return, rename domain settings file
2014-09-14 09:52:10 -07:00
Stephen Birarda
d6dca84694
add back commenting out of blind values return
2014-09-14 09:46:01 -07:00
Stephen Birarda
4d80417e3c
don't rename the config file to settings so existing nodes work
2014-09-14 09:45:02 -07:00
Stephen Birarda
cb7a6a7af5
don't blindly return all values if a type is not passed
2014-09-14 09:43:55 -07:00
Stephen Birarda
ee6a90dd54
allow domain to pass down its ID from config
2014-09-10 15:13:02 -07:00
Ryan Huffman
38a14c3864
Reapply "Update assignment client to close on WM_CLOSE message on Windows"
...
This reverts commit a603453cf2
.
2014-09-05 11:19:36 -07:00
Leonardo Murillo
a603453cf2
Revert "Update assignment client to close on WM_CLOSE message on Windows"
2014-09-05 11:36:56 -06:00
AndrewMeadows
9036954d38
Merge pull request #3311 from huffman/fix-wm-close
...
Update assignment client to close on WM_CLOSE message on Windows
2014-09-03 16:43:12 -07:00
Ryan Huffman
f3efbb35f4
Remove nativeEventFilter from DomainServer
2014-09-03 07:08:51 -07:00
Ryan Huffman
76bede04aa
Move stdout/err disabling to a library class
2014-09-03 07:06:08 -07:00
Ryan Huffman
c27bee2c06
Move wm_close handling to a shared library
2014-09-03 07:05:24 -07:00
ZappoMan
2bcad6ab2b
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
...
Conflicts:
assignment-client/src/Agent.cpp
examples/editModels.js
2014-08-28 21:19:56 -07:00
Ryan Huffman
444a974bd6
Merge branch 'master' of github.com:highfidelity/hifi into fix-wm-close
...
Conflicts:
assignment-client/src/AssignmentClient.cpp
2014-08-28 06:52:16 -07:00
Craig Hansen-Sturm
e941e58626
merge HEAD with PR-3281
2014-08-26 18:25:40 -07:00
Craig Hansen-Sturm
4cd1f4afef
add support for head-shadow/penumbra filter for positional audio streams
2014-08-24 22:17:07 -07:00
Ryan Huffman
4c485a26ed
Merge branch 'fix-wm-close' of github.com:huffman/hifi into fix-wm-close
2014-08-22 15:10:23 -07:00
Ryan Huffman
fa7b2a87bf
Add WM_CLOSE support to domain server
2014-08-22 15:09:55 -07:00
Ryan Huffman
b75c3a4976
Disable stdout/err buffering on Windows for assignment client and domain server
2014-08-22 15:08:57 -07:00
ZappoMan
32d5eb3cea
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
...
Conflicts:
assignment-client/CMakeLists.txt
interface/CMakeLists.txt
libraries/entities/CMakeLists.txt
libraries/models/src/ModelEditPacketSender.cpp
libraries/models/src/ModelEditPacketSender.h
libraries/models/src/ModelItem.cpp
libraries/models/src/ModelItem.h
libraries/octree/src/OctreeEditPacketSender.cpp
libraries/octree/src/OctreeEditPacketSender.h
libraries/octree/src/OctreePacketData.h
libraries/octree/src/OctreeQuery.cpp
libraries/particles/src/ParticleEditPacketSender.cpp
libraries/particles/src/ParticleEditPacketSender.h
libraries/script-engine/CMakeLists.txt
tests/octree/CMakeLists.txt
2014-08-18 15:16:35 -07:00
wangyix
db0fbcab97
merge with upstream
2014-08-13 11:09:55 -07:00
wangyix
446c888242
AudioMixer print added; untested
2014-08-12 12:22:32 -07:00
wangyix
e276d15ed4
repetition-with-fade implemented; testing interface crash
2014-08-11 16:25:43 -07:00
wangyix
1f011bfe9d
repetition-with-fade option added, not implemented
2014-08-11 11:22:37 -07:00
ZappoMan
027b1d58cc
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
...
Conflicts:
interface/src/Application.h
interface/src/entities/EntityTreeRenderer.h
interface/src/models/ModelTreeRenderer.cpp
libraries/models/src/ModelItem.h
libraries/models/src/ModelTree.h
2014-08-08 14:26:56 -07:00
Stephen Birarda
2fda95ae8f
repair build of various tools
2014-08-08 13:17:54 -07:00
Stephen Birarda
b1310c065c
remove TARGET_NAME from cmake macros where it is not required
2014-08-08 13:17:54 -07:00
Stephen Birarda
e4d01d269c
use shared dependency linking macro in hifi projects
2014-08-08 13:17:54 -07:00
Stephen Birarda
26f7b1ba62
add macro to link shared dependencies to target
2014-08-08 13:17:54 -07:00
Stephen Birarda
1f0a722d0d
remove antequated windows libraries that have been replaced by Qt usage
2014-08-08 13:17:54 -07:00
Stephen Birarda
17df6484d4
remove ssize_t and replace with size_t or int where appropriate
2014-08-08 13:17:53 -07:00
Stephen Birarda
87cf262b9e
get to successful cmake after library link macro changes
2014-08-08 13:17:53 -07:00
Stephen Birarda
107cbc3f87
more simplification of hifi macros to find libraries
2014-08-08 13:17:53 -07:00
Stephen Birarda
31488e72fe
repairs for interface build to succeed
2014-08-08 13:17:53 -07:00
Stephen Birarda
0378fb3049
break glm helpers out of SharedUtil
2014-08-08 13:17:53 -07:00
Stephen Birarda
fa26957b23
more CMakeLists cleanup for sub-dependencies
2014-08-08 13:17:52 -07:00
wangyix
fd3425dfd1
knobs confirmed working
2014-08-07 17:05:23 -07:00
wangyix
1153a76ab1
new option knobs added, no new behavior yet
2014-08-07 16:37:36 -07:00
Stephen Birarda
4f0218090c
have the domain-server brand in navbar link back to home
2014-08-04 16:23:28 -07:00
Stephen Birarda
4407ea4480
make assignment selector a dropdown
2014-08-04 16:02:13 -07:00
Stephen Birarda
6febca3533
add missing domain-server javascript file
2014-08-04 15:37:06 -07:00
Stephen Birarda
c786ee5c26
dynamically change active link in domain-server navbar
2014-08-04 15:27:34 -07:00
Stephen Birarda
10c94023f1
handle basic authentication for domain-server admin
2014-08-04 15:25:14 -07:00
Stephen Birarda
2c1277ef37
remove voxel settings from domain-server settings until ready to go
2014-08-04 14:47:17 -07:00
Stephen Birarda
40375b8c81
add a navbar to domain-server web page
2014-08-04 14:46:33 -07:00
ZappoMan
3a8c5018ee
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
...
Conflicts:
interface/src/Application.h
libraries/entities/src/EntityTreeElement.h
libraries/models/src/ModelItem.cpp
libraries/models/src/ModelItem.h
libraries/models/src/ModelTree.cpp
libraries/models/src/ModelTree.h
libraries/models/src/ModelTreeElement.cpp
libraries/networking/src/PacketHeaders.h
libraries/octree/src/OctreeEditPacketSender.cpp
libraries/octree/src/OctreeEditPacketSender.h
2014-08-04 12:01:23 -07:00
Stephen Birarda
e846fd24f7
fix an order mistake in DS handling HTTP requests
2014-07-31 15:23:15 -07:00
Stephen Birarda
f0e7bf0462
allow assignments to pull script without session cookie
2014-07-31 15:13:33 -07:00
ZappoMan
77e1867b11
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
...
Conflicts:
assignment-client/src/Agent.cpp
assignment-client/src/Agent.h
examples/editModels.js
interface/src/Application.h
2014-07-31 10:34:23 -07:00
Stephen Birarda
453c37f4b9
Merge branch 'master' of https://github.com/highfidelity/hifi into domain-server-auth
2014-07-31 10:05:40 -07:00
Brad Hefta-Gaub
d4d4069f11
Merge pull request #3225 from birarda/master
...
cmake file cleanup to suppress warnings on cmake 3.0
2014-07-30 19:20:18 -07:00
Stephen Birarda
04effabe48
Merge branch 'master' into domain-server-auth
2014-07-30 17:14:03 -07:00
wangyix
daeb2a898d
added staticDesiredJitterBufferFrames feature; AudioMixer crashing
...
moved some callbacks from Application::updateAvatar() to
Application::update()
2014-07-30 15:35:40 -07:00
Stephen Birarda
2796f71419
library cleanup to suppress warnings on cmake 3.0
2014-07-30 15:06:15 -07:00
wangyix
ecfd5c2757
default max frames over desired changed to 10
2014-07-29 17:37:59 -07:00
Stephen Birarda
9dbe74b02f
parse voxel costs to the DomainHandler object
2014-07-29 17:22:17 -07:00
Stephen Birarda
5fd7a11c6b
rename the voxel cost settings
2014-07-29 16:38:07 -07:00
wangyix
d49970d010
maxFramesOverDesired added; settable from domain page and preferences
2014-07-29 15:57:32 -07:00
Stephen Birarda
ef5db5321d
make voxel charges affect agents
2014-07-29 09:46:59 -07:00
Stephen Birarda
dbf41c8a42
allow domain-server to serve settings publicly, fix retry in DomainHandler
2014-07-28 14:56:26 -07:00
ZappoMan
805a88b73b
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
...
Conflicts:
examples/editModels.js
interface/src/entities/EntityTreeRenderer.h
libraries/models/src/ModelsScriptingInterface.cpp
libraries/script-engine/src/ScriptEngine.cpp
2014-07-28 13:39:35 -07:00
Stephen Birarda
005a3c7c12
persist and recall domain-server web sessions from ini settings
2014-07-24 17:17:57 -07:00
Stephen Birarda
2e5dc2320d
don't flip order on node socket, HifiSockAddr is handling
2014-07-24 11:09:09 -07:00
Stephen Birarda
74d17a094f
tweaks to string default handling in DomainServerSettingsManager
2014-07-23 11:47:56 -07:00
Stephen Birarda
ebf5379275
default voxel costs to free, add a wallet ID for voxel change payments
2014-07-23 11:13:12 -07:00
Stephen Birarda
1a13fbb437
add a setting section for voxel costs
2014-07-23 10:54:55 -07:00
Stephen Birarda
8082e2f88b
allow a user to be let into domain-server based on role
2014-07-21 17:41:22 -07:00
Stephen Birarda
f78a1f7033
hook domain-server to user DomainServerWebSessionData class
2014-07-21 17:32:38 -07:00
Stephen Birarda
e75ed2c4fa
add a class to hold web session data
2014-07-21 17:23:57 -07:00
Stephen Birarda
f45a509508
initial hook-in of OAuth authentication for DS web pages
2014-07-21 16:54:27 -07:00
Stephen Birarda
a77e49d2ab
add back missing colon for node port
2014-07-21 10:47:07 -07:00
Stephen Birarda
624bb33b1d
display the node's username in underscore template
2014-07-21 10:34:12 -07:00
Stephen Birarda
d007079617
associate username with agent nodes in domain-server
2014-07-21 10:30:11 -07:00
Stephen Birarda
74a107f9f4
initial rev of SignedWalletTransaction that creates a message
2014-07-16 12:26:24 -07:00
ZappoMan
ec0c350f60
Merge branch 'master' of https://github.com/worklist/hifi into virtualEntities
...
Conflicts:
interface/src/Application.cpp
interface/src/DatagramProcessor.cpp
libraries/script-engine/src/ScriptEngine.cpp
2014-07-03 14:20:40 -07:00
Stephen Birarda
ef9bb85f8a
fix so domain-server doesn't open missing config file
2014-07-03 11:16:01 -07:00
Atlante45
36fb530594
Switched DomainServer to NetworkAccessManager
2014-07-02 10:26:38 -07:00
ZappoMan
865566414c
Merge branch 'master' of https://github.com/worklist/hifi into renameModelsToEntities
...
Conflicts:
interface/src/entities/EntityTreeRenderer.cpp
libraries/entities/src/EntityItem.h
libraries/models/src/ModelItem.cpp
libraries/models/src/ModelTree.cpp
libraries/models/src/ModelTreeElement.cpp
libraries/models/src/ModelsScriptingInterface.cpp
tests/octree/CMakeLists.txt
tests/octree/src/ModelTests.cpp
2014-07-01 16:32:47 -07:00
Stephen Birarda
8edc4bf9d1
add HTTPS request debugged to domain-server
2014-06-27 10:38:39 -07:00
Stephen Birarda
3ae46bc60d
switch audio-mixer to pull settings from domain-server via JSON request
2014-06-26 17:32:56 -07:00
Stephen Birarda
95d266b305
initial setup of settings request from domain-server
2014-06-26 16:55:22 -07:00
ZappoMan
ccc9eabd33
first cut at renaming Models to Entities
2014-06-26 16:39:52 -07:00
Stephen Birarda
731690e358
add querying for settings that affect a specific type
2014-06-26 16:29:44 -07:00
Stephen Birarda
ab50432ead
use underscorejs templating for queued assignments
2014-06-26 15:45:31 -07:00
Stephen Birarda
e56f4aba0a
use underscorejs for nodes table template
2014-06-26 15:40:10 -07:00
Stephen Birarda
5cd2dc594f
only post changed values to settings.json, fix for bool values
2014-06-26 08:45:12 -07:00
Stephen Birarda
13169fa664
replace handlebars with underscore for templating
2014-06-25 16:35:44 -07:00