6967 commits

Author	SHA1	Message	Date
Brad Hefta-Gaub	d76ede624c	Merge pull request #4234 from AndrewMeadows/bispinor ... fix physics crash on disconnect from domain-server	2015-02-05 11:36:02 -08:00
Andrew Meadows	b4da2ddd52	fix physics crash on disconnect from domainserver	2015-02-05 09:13:32 -08:00
Clément Brisset	6a4577b6a5	Merge pull request #4231 from ZappoMan/crashonexit ... BUG FIXES: Crash on Exit with partially loaded scene & (near)-infinite loop in skipForward physics	2015-02-04 16:16:56 -08:00
Brad Hefta-Gaub	af91eee5a0	Merge pull request #4220 from sethalves/rework-bandwidth-meter ... fix several signed/unsigned comps, avoid sprintf in overlay code	2015-02-04 16:06:22 -08:00
ZappoMan	8fd11e70cc	clamp dt for skipTimeForward to prevent near infinite loops	2015-02-04 15:16:18 -08:00
Brad Hefta-Gaub	97f888b340	Merge pull request #4227 from huffman/internal-delete-fix ... Add force delete to internal EntityTree deletes	2015-02-04 14:02:34 -08:00
ZappoMan	698fcd8116	fix crash on shutdown	2015-02-04 13:54:14 -08:00
ZappoMan	4061e14c2d	move static members of ResourceManager into DependencyManager	2015-02-04 13:24:37 -08:00
Philip Rosedale	fe3f01be7e	Merge pull request #4225 from ZappoMan/memleak ... actually delete resources... even on windows	2015-02-04 11:57:54 -08:00
Seth Alves	bcf0846310	merge from master	2015-02-04 11:30:22 -08:00
Seth Alves	a645d784d8	uint32_t rather than uint, which mac doesn't like	2015-02-04 11:26:05 -08:00
Ryan Huffman	2b00e3fadc	Add force option to deleteEntity	2015-02-04 10:49:49 -08:00
ZappoMan	ded035094a	actually delete resources... even on windows	2015-02-04 10:45:04 -08:00
Stephen Birarda	a2002d169f	fix for exception handled lookup in LimitedNodeList	2015-02-04 10:27:33 -08:00
Brad Hefta-Gaub	de58c4a007	Merge pull request #4217 from Atlante45/master ... Fix for fps bug/field of view	2015-02-03 19:13:52 -08:00
Brad Hefta-Gaub	01f594b535	Merge pull request #4221 from AndrewMeadows/bispinor ... proof Andrew has a working Windows build on his laptop	2015-02-03 19:07:01 -08:00
Atlante45	fc4bf0c325	Don't check gl errors	2015-02-03 18:55:52 -08:00
Atlante45	7a03daa76f	Inline setFieldOfView	2015-02-03 18:51:26 -08:00
Brad Hefta-Gaub	79b04afaf8	Merge pull request #4210 from ctrlaltdavid/20280 ... CR for Job #20280 - Warn if Interface and Stack have incompatible build level	2015-02-03 18:51:17 -08:00
Andrew Meadows	547a416c3b	merge upstream/master into andrew/bispinor	2015-02-03 18:33:10 -08:00
Seth Alves	450787fde2	Merge branch 'master' of github.com:highfidelity/hifi into rework-bandwidth-meter	2015-02-03 17:33:27 -08:00
Atlante45	e4591e0d03	Work arount for QVariant not converting to QVariant	2015-02-03 17:11:32 -08:00
Seth Alves	8489ee04f3	fix a couple of signed vs unsigned comparisons.	2015-02-03 16:11:04 -08:00
Sam Gateau	5719e277dd	FIx the lightmap not displaying when using the texcoord0	2015-02-03 16:10:31 -08:00
David Rowe	d9e353e498	Merge branch 'master' into 20280 ... Conflicts: libraries/networking/src/LimitedNodeList.h	2015-02-03 14:46:27 -08:00
Atlante45	78a9d002db	Remove settings from InboundAudioStream	2015-02-03 12:47:25 -08:00
Atlante45	27459ba861	Settings update	2015-02-03 12:27:30 -08:00
Atlante45	aacf61609f	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-02-03 10:53:44 -08:00
Seth Alves	d2c70936e3	coding standard, remove unneeded asserts	2015-02-03 10:51:35 -08:00
Atlante45	5388ed1c4a	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-02-02 18:38:09 -08:00
Atlante45	f0b5cd195d	Renaming + end of file spaces	2015-02-02 18:37:49 -08:00
Atlante45	9abdb41764	Rearrange settings classes in correct files	2015-02-02 17:17:19 -08:00
Atlante45	633ec9807d	New settings api	2015-02-02 15:56:03 -08:00
Seth Alves	38162380ad	coding standard	2015-02-02 15:37:28 -08:00
Seth Alves	82b8595af8	coding standard	2015-02-02 15:34:08 -08:00
Seth Alves	c1ae98fa1a	quiet some compiler warnings about signed vs unsigned comparisons	2015-02-02 15:02:29 -08:00
Seth Alves	e779a55e22	remove stray debugging line	2015-02-02 12:30:11 -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
Atlante45	1cfd98b2d7	Name threads	2015-01-31 00:50:12 -08:00
David Rowe	3c7cdc16ce	Merge branch 'master' into 20280 ... Conflicts: interface/src/Application.h	2015-01-30 18:44:14 -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
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