21355 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Philip Rosedale	6483df69a4	Merge pull request #4209 from sethalves/rework-bandwidth-meter ... Consolidate Network Bandwidth Metrics	2015-02-03 09:05:28 -08:00
Philip Rosedale	c234f3372f	Merge pull request #4212 from huffman/fix-clone-billboard ... Add missing _texture to BillboardOverlay copy ctor	2015-02-03 09:04:30 -08:00
Ryan Huffman	13ea8ddb9e	Add missing _texture to BillboardOverlay copy ctor	2015-02-03 08:52:58 -08:00
Philip Rosedale	2ae6514c87	Merge pull request #4200 from PhilipRosedale/master ... Planet simulation script	2015-02-02 21:31:47 -08:00
Philip Rosedale	81fe2d69ba	Merge pull request #4207 from huffman/billboard-update ... Update BillboardOverlay to use NetworkTexture	2015-02-02 21:30:18 -08:00
Seth Alves	38162380ad	coding standard	2015-02-02 15:37:28 -08:00
Seth Alves	3fdf05ff77	coding standard	2015-02-02 15:36:18 -08:00
Seth Alves	82b8595af8	coding standard	2015-02-02 15:34:08 -08:00
Seth Alves	e779a55e22	remove stray debugging line	2015-02-02 12:30:11 -08:00
Seth Alves	8e64417607	formatting and cleanups	2015-02-02 12:21:46 -08:00
Seth Alves	4377105410	formatting and cleanups	2015-02-02 12:13:54 -08:00
Seth Alves	779a0086c4	BandwidthRecorder no longer knows about channel displays. cause overlay pps and Mbps to only update once per second	2015-02-02 11:56:50 -08:00
Seth Alves	f1cca2ac92	move bandwidth stats display details out of recorder class into dialog class	2015-02-02 09:26:09 -08:00
Seth Alves	c0a219678c	use DependencyManager to keep track of BandwidthRecorder	2015-02-02 08:55:55 -08:00
Seth Alves	b85456b1e9	refactoring, cause BandwidthDialog to only update numbers once per second	2015-02-02 05:28:28 -08:00
Seth Alves	fc07ecf83d	use BandwidthRecorder rather than recompute Mbps and pps in Application	2015-01-31 20:40:18 -08:00
Seth Alves	bee895ba0a	capture network bandwidth stats from NodeList rather than various places	2015-01-31 20:02:04 -08:00
Seth Alves	105b2c5fd7	shell script to regenerate emacs TAGS file for project	2015-01-31 10:54:01 -08:00
Seth Alves	77582f50df	Merge branch 'master' of github.com:highfidelity/hifi into rework-bandwidth-meter	2015-01-31 10:53:33 -08:00
Seth Alves	97035b6cd9	move some magic numbers to constants	2015-01-31 07:42:01 -08:00
Brad Hefta-Gaub	2eeb2a5ec5	Merge pull request #4205 from AndrewMeadows/isentropic ... small models get box collision shape	2015-01-30 18:30:55 -08:00
Andrew Meadows	a723c748f5	check initialization of _needsInitialSimulation	2015-01-30 18:08:00 -08:00
Ryan Huffman	42bab84990	Merge branch 'master' of github.com:highfidelity/hifi into billboard-update ... Conflicts: interface/src/ui/overlays/BillboardOverlay.cpp	2015-01-30 16:58:05 -08:00
Brad Hefta-Gaub	e73a000bb8	Merge pull request #4208 from birarda/master ... update to @problem's new interface icon	2015-01-30 16:53:32 -08:00
Brad Hefta-Gaub	918349b227	Merge pull request #4196 from ctrlaltdavid/20277 ... CR for Job #20277 - Interface user agent string change	2015-01-30 16:52:30 -08:00
Andrew Meadows	7a2def167b	Merge pull request #4206 from sethalves/rework-bandwidth-meter ... Rework bandwidth meter dialog	2015-01-30 16:41:07 -08:00
Andrew Meadows	9da6b623a3	move shape polymorphism to ModelEntityItem	2015-01-30 16:25:35 -08:00
Andrew Meadows	bc52ba1d29	restore polymorphism for Box and Sphere entities	2015-01-30 16:18:50 -08:00
David Rowe	729fbbf5ac	A further custom User-Agent string	2015-01-30 15:56:01 -08:00
Stephen Birarda	f78f6ab4cf	fix check for debug/release icon	2015-01-30 15:41:44 -08:00
Stephen Birarda	2c74502394	move Interface icon back in icon sub-folder	2015-01-30 15:26:29 -08:00
Stephen Birarda	c4a2da15d1	change interface icon to lowercase	2015-01-30 15:26:07 -08:00
Seth Alves	067deefeb6	avoid use of snprintf	2015-01-30 15:23:40 -08:00
Stephen Birarda	ae87dac523	update to new interface icon	2015-01-30 15:22:21 -08:00
Ryan Huffman	1f24658f67	Remove BillboardOverlay::replyFinished()	2015-01-30 14:45:45 -08:00
Ryan Huffman	efd383d269	Update BillboardOverlay to use NetworkTexture	2015-01-30 14:42:41 -08:00
Seth Alves	eda7785d3b	minor edit to make diff nicer	2015-01-30 14:41:03 -08:00
Andrew Meadows	80f6f718d0	EntityItem base class now computes shapeInfo	2015-01-30 14:17:29 -08:00
Andrew Meadows	b035c5b082	fix for updating moving models	2015-01-30 14:16:32 -08:00
David Rowe	5474c0634e	Merge branch 'master' into 20277 ... Conflicts: libraries/script-engine/src/ScriptEngine.cpp	2015-01-30 13:49:45 -08:00
Seth Alves	5c9d64c482	Merge branch 'master' of github.com:highfidelity/hifi into rework-bandwidth-meter	2015-01-30 13:46:43 -08:00
Seth Alves	620efb2bbe	change display style of bandwidth detail dialog, include a totals line	2015-01-30 13:43:28 -08:00
Brad Hefta-Gaub	53534cea61	Merge pull request #4203 from huffman/remove-auto-on-edit-entities ... Fix editEntities.js automatically turning on	2015-01-30 13:15:57 -08:00
Ryan Huffman	a98829ed8a	Fix editEntities.js automatically turning on	2015-01-30 13:12:00 -08:00
samcake	efbf043f7d	Merge pull request #4202 from Atlante45/master ... Edge case when removing all scripts	2015-01-30 13:01:53 -08:00
Atlante45	fae59ab939	Edge case when removing all scripts	2015-01-30 12:20:00 -08:00
Seth Alves	dd9d054286	Start on refactoring of bandwidth metrics	2015-01-30 11:44:57 -08:00
samcake	1c89e27718	Merge pull request #4201 from Atlante45/master ... Fix not saving stopped scripts	2015-01-30 11:39:40 -08:00
Atlante45	18c77e1cca	Fix not saving stopped scripts	2015-01-30 11:27:45 -08:00
Seth Alves	2999a77f87	merge from master	2015-01-30 11:15:01 -08:00