38449 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Philip Rosedale	ee95f7906b	Fish flocking example	2016-01-29 00:59:06 -08:00
Philip Rosedale	9f95a9de89	Limits on distance and mass for far grabbing	2016-01-29 00:52:59 -08:00
Brad Hefta-Gaub	8efe15cb21	Merge pull request #6963 from jherico/qmlOverlays ... Make all 2D overlays QML-based	2016-01-28 23:33:30 -08:00
Brad Davis	e97850dd26	Merge pull request #6965 from ctrlaltdavid/20793 ... Warn user if OpenGL version is too low (< 4.1)	2016-01-28 20:39:56 -05:00
Ryan Huffman	c67f39a6c0	Merge pull request #6976 from birarda/injector-dos ... fix for overflow on injector playNextFrameAt	2016-01-28 16:37:12 -08:00
Brad Davis	8c19b95ea2	Fix oversized text, invalid color handling	2016-01-28 16:36:28 -08:00
David Rowe	6232a83f43	Specify minimum OpenGL version in gl library's config ... Note: Defines minimum OpenGL version as 4.1 in anticipation of Interface soon properly supporting both 4.1 and 4.3 on Windows.	2016-01-29 13:03:54 +13:00
Brad Davis	72b264dcde	Ensure toolbar z-order is always below windows	2016-01-28 16:03:27 -08:00
Brad Davis	06071c6493	Fixing build errors	2016-01-28 16:03:26 -08:00
Brad Davis	5b817ccc21	Make all 2D overlays QML	2016-01-28 16:03:26 -08:00
James B. Pollack	96ddb9febb	Merge pull request #6970 from ericrius1/webEntityURL ... Moved source URL up to top of entity properties panel	2016-01-28 16:02:21 -08:00
James B. Pollack	78d06ed32a	Merge pull request #6952 from howard-stearns/avatar-preferences-chooser ... avatar preferences chooser modal web	2016-01-28 16:01:53 -08:00
Stephen Birarda	0c2805db7e	remove debug added to catch injector DOS	2016-01-28 15:50:04 -08:00
Stephen Birarda	311f1ac0e3	fix for overflow on time of next frame	2016-01-28 15:38:33 -08:00
David Rowe	2020514974	Move OpenGLVersionChecker to gl library	2016-01-29 12:29:21 +13:00
David Rowe	b7134c75c3	Rename OpenGLInfo to OpenGLVersionChecker	2016-01-29 12:14:47 +13:00
Zach Pomerantz	02d530ccc8	Merge pull request #6971 from samcake/hdr ... Fixing the default value for the TOneMapping curve	2016-01-28 14:09:41 -08:00
Ryan Huffman	15db8040d8	Merge pull request #6961 from birarda/resampling-error ... fix a couple of resampling errors in Sound downSample	2016-01-28 13:22:00 -08:00
Ryan Huffman	d39ab952f7	Merge pull request #6973 from birarda/injector-dos ... add some debug for AudioInjector DOS case	2016-01-28 13:14:54 -08:00
samcake	5863e340af	Cleaner...	2016-01-28 12:46:18 -08:00
samcake	ef451d40df	Cleaner...	2016-01-28 12:39:52 -08:00
Brad Hefta-Gaub	49bbf42995	Merge pull request #6960 from sethalves/fix-adjust-edit-packet-for-clock-skew ... don't adjust a time of '0 usecs since epoch' with clock skew in edit packets	2016-01-28 12:31:27 -08:00
Brad Hefta-Gaub	da709f3f56	Merge pull request #6968 from imgntn/nodebugheap ... Document the _NO_DEBUG_HEAP trick	2016-01-28 12:29:25 -08:00
Howard Stearns	33226796ff	Merge pull request #6964 from ericrius1/editHref ... Validate href entity property (hifi:// only)	2016-01-28 12:29:18 -08:00
Stephen Birarda	79c6ed9739	add some debug for AudioInjector DOS case	2016-01-28 12:22:36 -08:00
samcake	62d5a45829	Cleaner init	2016-01-28 12:20:09 -08:00
samcake	bf3a09cd00	Fixing the default value for the TOneMapping curve and cleaning the code into the ToneMappingEffect file	2016-01-28 12:14:20 -08:00
ericrius1	98453c085b	Moved source URL up to top of entity properties panel	2016-01-28 12:08:21 -08:00
Andrew Meadows	3e35a5fc2d	Merge pull request #6937 from ctrlaltdavid/20790 ... Make entity properties be undefined after entity is unloaded	2016-01-28 11:59:01 -08:00
James B. Pollack	9cb768bcbd	document no debug heap trick	2016-01-28 11:42:51 -08:00
Howard Stearns	bff3362f94	Merge pull request #6953 from jherico/qml ... More small fixes	2016-01-28 11:22:40 -08:00
Anthony Thibault	85843cff39	Merge pull request #6955 from AndrewMeadows/stable-judasboots ... apply "hips offset" to root of state graph	2016-01-28 11:13:11 -08:00
Brad Davis	04e6a5360a	Renaming preference dialog variable	2016-01-28 10:29:21 -08:00
samcake	54b9c1ac0d	Merge pull request #6962 from zzmp/feat/task-io ... Reduce code duplication for render::Job::Model	2016-01-28 09:31:26 -08:00
Brad Davis	18d6a09dc9	Better preferences dialog initial state	2016-01-28 09:20:31 -08:00
Brad Davis	d9651c6d4b	Allow user browser to work with marketplace	2016-01-28 09:20:29 -08:00
David Rowe	af3d842e60	Warn user if OpenGL version is too low (< 4.1)	2016-01-28 15:25:00 +13:00
Stephen Birarda	0a386cdde8	remove trimFrames call from Sound	2016-01-27 16:10:18 -08:00
ericrius1	cd5e81de36	Validating href for edit.js	2016-01-27 16:02:02 -08:00
Andrew Meadows	7b5c221ceb	Merge pull request #6956 from hyperlogic/tony/velocity-fix ... MyAvatar: copy body velocity + hmd follow velocity onto avatar	2016-01-27 14:59:46 -08:00
Seth Alves	8286a037b0	Merge pull request #6941 from imgntn/dicelocation ... Update dice location in toybox	2016-01-27 14:49:21 -08:00
Andrew Meadows	1b45f5cc0c	tweaks to neck and spine constraints	2016-01-27 14:45:09 -08:00
Andrew Meadows	f67a20ee68	apply _hipsOffset in hips local-frame	2016-01-27 14:45:08 -08:00
Andrew Meadows	00715f1906	apply "hips offset" to root of state graph ... (Somemtimes the hips are not the root. I'm looking at YOU blender!)	2016-01-27 14:45:06 -08:00
Stephen Birarda	dc716461e3	fix for a couple of resampling edge cases	2016-01-27 14:33:03 -08:00
Anthony Thibault	3cdd88e06c	Merge pull request #6951 from ZappoMan/fixAnimationRestart ... fix for animations stopping after domain restart	2016-01-27 14:31:27 -08:00
Stephen Birarda	f3903022f2	Merge pull request #6958 from huffman/injector-timing-fixes ... Fix injector looping issues when using audio that isn't a multiple of the sample size	2016-01-27 14:29:30 -08:00
samcake	f4e0352f61	Merge pull request #6930 from zzmp/feat/bubble-render-settings ... Bubble up render settings from CPP to JS/QML	2016-01-27 14:20:51 -08:00
Ryan Huffman	2ec201b85e	Fix conversion warning	2016-01-27 14:13:23 -08:00
Seth Alves	f2ea73d646	don't adjust a time of '0 usecs since epoch' with clock skew in edit packets	2016-01-27 14:12:03 -08:00