Commit graph

43044 commits

Author SHA1 Message Date
Andrew Meadows
db9a4d6b8f cleanup for code review 2016-05-10 07:49:11 -07:00
Andrew Meadows
778820edb4 fix broken dupe method implementation 2016-05-06 09:07:03 -07:00
Andrew Meadows
635e2e78e3 minor cleanup 2016-05-05 18:43:08 -07:00
Andrew Meadows
d1591e03b9 fix typo 2016-05-05 18:28:27 -07:00
Andrew Meadows
eeb100b62f use glm::isnan() instead of isnan() from math.h 2016-05-05 18:28:27 -07:00
Andrew Meadows
01950fba96 recover unused code that may prove useful someday 2016-05-05 18:28:27 -07:00
Andrew Meadows
64c2e2d175 remove warning about unused variable 2016-05-05 18:28:27 -07:00
Andrew Meadows
7d6424bdcc Head::render() was cruft 2016-05-05 18:28:27 -07:00
Andrew Meadows
2cbc771eba reorder data members, remove cruft, 744->616 bytes 2016-05-05 18:28:27 -07:00
Andrew Meadows
71b2d647e8 add locks and explicitly copy ViewFrustums 2016-05-05 18:28:27 -07:00
Andrew Meadows
bcf2cc8074 use references not pointers for ViewFrustums
also unravelling some spaghetti:
(1) split Octree stuff out of ViewFrustum
(2) moved ViewFrustum from octree to shared lib
(3) removed some cruft
2016-05-05 18:28:27 -07:00
Andrew Meadows
21fa294839 remove cruft 2016-05-05 18:28:27 -07:00
Andrew Meadows
d97bd2bc52 remove cruft 2016-05-05 18:28:27 -07:00
Andrew Meadows
60a72c6660 getViewFrustum() provides const pointer 2016-05-05 18:28:27 -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
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
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
Andrew Meadows
ba226b9cb4 promote priority immediately when already owned 2016-05-03 13:43:08 -07:00
Brad Hefta-Gaub
d2889dbda4 Merge pull request #7804 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 #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