466 commits

Author	SHA1	Message	Date
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
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
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
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
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
Stephen Birarda	4188a4eab1	change unattenuated zone placeholder and offer method to grab JSON settings	2014-06-25 14:16:24 -07:00
Stephen Birarda	6519d4028a	populate the settings page correctly with existing values	2014-06-25 13:55:32 -07:00
Stephen Birarda	f8dccad6ec	enable persisting of posted settings to a JSON file	2014-06-25 11:20:09 -07:00
Stephen Birarda	11f23ca6f6	add POSTing of settings to DS via form2js	2014-06-24 15:56:53 -07:00
Stephen Birarda	cf0e1ab1a9	finish up handlebars template for settings	2014-06-24 14:24:56 -07:00
Stephen Birarda	afe2e57701	add a settings page to DS that uses handlebars template library	2014-06-24 12:33:40 -07:00
Andrew Meadows	3f36325642	remove warnings about signed/unsigned comparison	2014-06-17 11:59:37 -07:00
John Grosen	47a88a2713	Updated AssignmentClient to use HifiConfigVariantMap... ... ...and also updated DomainServer to appropriately use boolean options	2014-06-12 17:08:23 -07:00
Stephen Birarda	ce485c48b8	make scripted assignments passed in DS config static	2014-05-27 15:23:10 -07:00
Stephen Birarda	714e29c887	fix credit amount in window title	2014-05-23 17:37:36 -07:00
Stephen Birarda	45ab8145a4	fix another implicit float cast	2014-05-23 16:22:08 -07:00
Stephen Birarda	831b0faa20	fix a mistyped constant	2014-05-23 16:15:11 -07:00
Stephen Birarda	1b00cda068	don't use powf for credit conversions	2014-05-23 16:12:34 -07:00
Stephen Birarda	15a8272286	fix domain-server pending credits to actually be in credits	2014-05-23 15:43:02 -07:00
Stephen Birarda	34eb0f9f43	make transaction amounts and balances signed 64-bit	2014-05-23 15:34:34 -07:00
Stephen Birarda	e7e19e8714	fix a comment in script handling	2014-05-23 12:37:27 -07:00