43015 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
samcake	a78719bc85	Merge pull request #7813 from ZappoMan/fixRecursiveMutex ... fix recursive mutex in Entites.callEntityMethod()	2016-05-05 10:06:58 -07:00
Seth Alves	24289b1e66	Merge pull request #7815 from birarda/stuck-assignment ... add warnings for socket error and unexpected state change	2016-05-05 08:58:51 -07:00
Brad Hefta-Gaub	1df4cf4db0	Merge pull request #7812 from zzmp/fix/scripting-thread-dtor ... Properly shut down scripting thread	2016-05-05 08:49:51 -07:00
Brad Hefta-Gaub	1e30ba43ea	Merge pull request #7781 from zzmp/log/pipeline-flood ... Avoid missing pipeline log flood	2016-05-05 00:15:10 -07:00
Brad Hefta-Gaub	4cd5123aa6	Merge pull request #7814 from imgntn/cellGUI ... [CellScience] Move buttons; update ribosome location	2016-05-05 00:13:49 -07:00
Stephen Birarda	8a3336ae95	use the networking logging category	2016-05-04 16:31:12 -07:00
Stephen Birarda	effa2fc235	typo fix for comment	2016-05-04 16:28:26 -07:00
Stephen Birarda	7192ad301f	add debug for socket errors and state changes	2016-05-04 16:23:40 -07:00
Andrew Meadows	8c7ee00849	Merge pull request #7808 from ctrlaltdavid/20904 ... Increase maximum friction value from 0.99 to 10.0	2016-05-04 16:11:43 -07:00
David Rowe	4b05d8ed95	Increase maximum friction to 10.0 - Bullet's maximum	2016-05-05 07:50:15 +12:00
James B. Pollack	8d48f54313	fix ribosome location	2016-05-04 12:41:33 -07:00
James B. Pollack	e5ed5218e3	fix ribsome	2016-05-04 12:30:07 -07:00
James B. Pollack	83a7677766	update button position	2016-05-04 12:28:09 -07:00
Zach Pomerantz	56ec0e5db0	Abort infinite JS loops on quit	2016-05-04 12:02:08 -07:00
Brad Hefta-Gaub	2c9608489f	fix recursive mutex in Entites.callEntityMethod()	2016-05-04 10:01:20 -07:00
Zach Pomerantz	284feaf5d4	Properly shut down scripting thread	2016-05-03 20:29:31 -07:00
David Rowe	d1064bf5ea	Increase maximum friction to 1.0 - bullet can handle it	2016-05-04 10:58:33 +12:00
Brad Hefta-Gaub	42169ddcb3	Merge pull request #7806 from Atlante45/fix/warnings ... Fix couple OSX warnings	2016-05-03 15:42:47 -07:00
David Rowe	bc04d1b477	Increase maximum friction value from 0.99 to 0.9999	2016-05-04 09:01:26 +12:00
Brad Hefta-Gaub	d2889dbda4	Merge pull request #7804 from imgntn/diceFix2 ... Move Dice GUI	2016-05-03 13:05:46 -07:00
Brad Hefta-Gaub	bbf358f81d	Merge pull request #7796 from samcake/blue ... Improve Translucent shapes global lighting with support for the ambient map reflection	2016-05-03 11:14:06 -07:00
Brad Hefta-Gaub	754ef071eb	Merge pull request #7786 from sethalves/web-scripts-use-local-libs ... allow scripts on the web to refer to local libraries with /~/	2016-05-03 11:10:48 -07:00
Zach Pomerantz	0bc89d6b18	Avoid missing pipeline log flood	2016-05-03 09:39:31 -07:00
Brad Hefta-Gaub	eb209c7483	Merge pull request #7752 from Geenz/master ... Correction To sRGB Conversions	2016-05-03 08:01:51 -07:00
Brad Hefta-Gaub	ad285ff9a1	Merge pull request #7769 from ZappoMan/abortForInfiniteLoops ... add support to abort evaluation of long running scripts on shutdown	2016-05-02 20:44:12 -07:00
Brad Hefta-Gaub	2b54813075	Merge pull request #7783 from zzmp/fix/script-engine-deletion ... Fix script engine deletion	2016-05-02 18:16:07 -07:00
Brad Hefta-Gaub	49d02b802a	Merge pull request #7719 from zzmp/feat/resource-prefetch ... Add prefetching to exposed caches	2016-05-02 18:04:26 -07:00
Brad Hefta-Gaub	530a06f5f5	Merge pull request #7802 from sethalves/ignore-my-own-actions-on-net ... keep track of actions we are editing and ignore updates from server for these actions	2016-05-02 17:58:49 -07:00
Atlante45	eb21b9c5d7	OSX warnings	2016-05-02 17:18:57 -07:00
James B. Pollack	a9ab531e27	clear up toolbar name	2016-05-02 17:01:44 -07:00
James B. Pollack	e971da7dcb	move dice GUI	2016-05-02 16:54:32 -07:00
Seth Alves	1da041de9b	don't consume the physics related property changes from the packet that informs us that we are the simulationOwner of an entity	2016-05-02 15:09:08 -07:00
Brad Hefta-Gaub	b98419e537	add units to debug message	2016-05-02 14:58:38 -07:00
Seth Alves	ae8f502808	keep track of actions we are editing and ignore updates from server for these actions	2016-05-02 14:23:36 -07:00
Brad Hefta-Gaub	4569032314	more CR feedback	2016-05-02 12:44:07 -07:00
Clément Brisset	2ef87557fc	Merge pull request #7798 from zzmp/clean/override ... Fix warnings on vanilla XCode compilations	2016-05-02 10:56:07 -07:00
Brad Hefta-Gaub	cddcac60c1	Merge pull request #7768 from ctrlaltdavid/20891 ... Add Interface "Home" bookmark function	2016-05-02 10:14:57 -07:00
Brad Hefta-Gaub	a447ce4633	Merge pull request #7770 from AndrewMeadows/avoid-crosseyes ... don't cross the eyes	2016-05-02 10:13:25 -07:00
Brad Hefta-Gaub	e117f280cc	Merge pull request #7779 from zzmp/fix/fst-crash ... Avoid crashing on missed pipelines	2016-05-02 10:12:17 -07:00
Brad Hefta-Gaub	44fb572248	Merge pull request #7775 from ctrlaltdavid/20896 ... Use UI Toolkit border styles for various dialogs	2016-05-02 10:11:29 -07:00
Brad Hefta-Gaub	d599d008c3	Merge pull request #7757 from imgntn/cellProduction ... Move cellscience to production s3 bucket	2016-05-02 10:11:08 -07:00
samcake	a5b32b59a7	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2016-05-02 09:54:54 -07:00
Zach Pomerantz	29e0744b89	Fix equality in scriptableResource/lib	2016-05-02 09:40:08 -07:00
Seth Alves	a9897f1cc4	Merge branch 'master' of github.com:highfidelity/hifi into web-scripts-use-local-libs	2016-05-02 07:25:42 -07:00
ZappoMan	6026e055aa	more CR feedback removed redundant abort code	2016-04-30 15:45:42 -07:00
ZappoMan	00838d1e1e	more CR feedback removed redundant abort code	2016-04-30 15:38:37 -07:00
ZappoMan	ee4748fee9	CR Feedback	2016-04-30 15:31:09 -07:00
ZappoMan	73ff0308a9	some CR feedback	2016-04-30 15:23:50 -07:00
Eric Levin	f1de590835	updated script	2016-04-30 14:45:28 -07:00
Zach Pomerantz	13945aa4d9	Annotate all virtual fns with override	2016-04-30 13:48:59 -07:00