Commit graph

43031 commits

Author SHA1 Message Date
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
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
ec50744aa1 Merge pull request 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 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 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 from ZappoMan/fixRecursiveMutex
fix recursive mutex in Entites.callEntityMethod()
2016-05-05 10:06:58 -07:00
Seth Alves
24289b1e66 Merge pull request 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 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 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 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 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 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
d2889dbda4 Merge pull request from imgntn/diceFix2
Move Dice GUI
2016-05-03 13:05:46 -07:00
James B. Pollack
d98732d5a1 dressing room updates 2016-05-03 12:08:44 -07:00
Brad Hefta-Gaub
bbf358f81d Merge pull request 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 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 from Geenz/master
Correction To sRGB Conversions
2016-05-03 08:01:51 -07:00
Brad Hefta-Gaub
ad285ff9a1 Merge pull request 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 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 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 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
James B. Pollack
0b867713cb dressing room updates 2016-05-02 16:26:05 -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