Commit graph

43056 commits

Author SHA1 Message Date
James B. Pollack
8cac61081d change cuckoo and whiteboard positions 2016-05-11 10:33:06 -07:00
James B. Pollack
46c6999dd4 add fire sound 2016-05-11 09:59:50 -07:00
James B. Pollack
af8a827c83 add fire remove plant 2016-05-10 17:18:21 -07:00
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
Chris Collins
8eb61e9470 Merge pull request #7820 from imgntn/usersJS
Add users.js to default, start visible to friends only
2016-05-06 16:07:23 -06: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
fb09efc0c9 send location updates immediately on mode change and startup 2016-05-06 12:01:03 -07:00
Stephen Birarda
258c5308db don't require an active domain connection for location update 2016-05-06 11:57:25 -07:00
Stephen Birarda
ed1ddc2a8b remove code to update/store wallet balance 2016-05-06 11:54:49 -07:00
Stephen Birarda
7dd8515bd8 send a simple heartbeat if location has not changed 2016-05-06 11:50:40 -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
James B. Pollack
97e1621776 increase width 2016-05-05 15:02:16 -07:00
James B. Pollack
d1755649b1 order 2016-05-05 14:55:41 -07:00
James B. Pollack
67b1015f4a re add users to default, default to visible friends only 2016-05-05 14:54:04 -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
Brad Hefta-Gaub
d89c339b6a Merge pull request #7803 from imgntn/homeUpdates
[Home] Dressing Room Updates
2016-05-05 11:06:10 -07:00
Andrew Meadows
967a67256e fix bug preventing sim ownership release 2016-05-05 10:52:53 -07:00
James B. Pollack
6d3a3b0cc5 cleanup comments, semicolons 2016-05-05 10:37:32 -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
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
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
3619821b82 Improve timing tests with averages 2016-05-04 13:23:10 -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
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