17510 commits

Author	SHA1	Message	Date
Chris Collins	91a5d82af5	Merge pull request #7826 from zzmp/perf/mipmap ... Defer mipmap gen to gpu	2016-05-09 10:52:49 -07:00
Chris Collins	4f22e0ad5a	Merge pull request #7828 from sethalves/show-other-sim-owner ... show with debug icons when someone else is the simulation owner	2016-05-09 10:49:30 -07:00
Clément Brisset	b234d94d25	Merge pull request #7832 from birarda/session-location ... repairs to user heartbeats	2016-05-06 15:15:52 -07:00
Brad Hefta-Gaub	6d97ad609b	Merge pull request #7818 from zzmp/fix/colliding-fbx-paths ... Fix colliding fbx tex names	2016-05-06 15:03:58 -07:00
Stephen Birarda	6f6221840e	put back the correct metaverse API url in NetworkingConstants	2016-05-06 13:26:23 -07:00
Stephen Birarda	ed1ddc2a8b	remove code to update/store wallet balance	2016-05-06 11:54:49 -07:00
Brad Hefta-Gaub	47f8adf187	Merge pull request #7824 from sethalves/avatar-id-reliable ... use reliable and ordered packets for avatar identity	2016-05-06 11:32:05 -07:00
Seth Alves	073d845bb5	show with debug icons when someone else is the simulation owner	2016-05-05 18:33:01 -07:00
Seth Alves	aeebf7d9bf	Merge pull request #7823 from Atlante45/fix/potential-it-invalidation ... Fix potential iterator invalidation	2016-05-05 18:28:49 -07:00
Seth Alves	16a5030159	Merge pull request #7810 from zzmp/perf/usleep ... Improve CPU performance of Win32 usleep	2016-05-05 18:23:31 -07:00
Zach Pomerantz	7f496ea069	Fix colliding fbx tex names	2016-05-05 17:54:00 -07:00
Zach Pomerantz	6a6d6dd20f	Defer mipmap gen to gpu	2016-05-05 16:34:02 -07:00
Stephen Birarda	a5d09e268d	fix sessionID pull and re-sent for HB	2016-05-05 15:56:16 -07:00
Stephen Birarda	839c7fb8c2	provide session ID for metaverse heartbeat once received	2016-05-05 15:45:11 -07:00
Stephen Birarda	0ea46cb415	send fallback socket, don't send HB if send usage disabled	2016-05-05 15:35:37 -07:00
Seth Alves	96174468b3	use reliable and ordered packets for avatar identity	2016-05-05 15:27:30 -07:00
Atlante45	f65b15803a	Fix potential iterator invalidation	2016-05-05 15:04:39 -07:00
Seth Alves	ec50744aa1	Merge pull request #7817 from AndrewMeadows/ignore-echo-of-stale-data ... fix bug preventing sim ownership release	2016-05-05 11:14:55 -07:00
Andrew Meadows	967a67256e	fix bug preventing sim ownership release	2016-05-05 10:52:53 -07:00
Seth Alves	929d831212	Merge pull request #7807 from AndrewMeadows/ignore-echo-of-stale-data ... fix object position glitch of owned simulations on networks with long ping-time	2016-05-05 10:11:02 -07:00
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
Andrew Meadows	3202a723b8	remove warning about unused variable	2016-05-05 08:54:09 -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
Andrew Meadows	be9a572fb0	fix grab motion glitch on long-ping connections	2016-05-04 16:50:42 -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
Zach Pomerantz	1553f532ba	Specialize usleep for Win32	2016-05-04 15:40:53 -07:00
Zach Pomerantz	526143b097	Improve perf of Win32 usleep	2016-05-04 13:36:07 -07:00
Zach Pomerantz	0f6162d683	Use appropriate units for timing tests	2016-05-04 13:23:10 -07:00
David Rowe	4b05d8ed95	Increase maximum friction to 10.0 - Bullet's maximum	2016-05-05 07:50:15 +12: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
Andrew Meadows	ba226b9cb4	promote priority immediately when already owned	2016-05-03 13:43:08 -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
Atlante45	eb21b9c5d7	OSX warnings	2016-05-02 17:18:57 -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