Commit graph

41631 commits

Author SHA1 Message Date
Andrew Meadows
20914df330 fix warning about signed/unsigned comparison 2016-04-01 13:31:14 -07:00
Andrew Meadows
de5fe705a3 optimize Bullet broadphase using collision groups 2016-04-01 13:14:03 -07:00
Andrew Meadows
25fbf926df CollisionWorld only updates _active_ Aabbs
we manually set/clear active state of static objects
  that need their Aabbs updated
also fixing a bug when starting kinematic motion
2016-04-01 13:14:03 -07:00
Andrew Meadows
e1602b57fa faster isNaN checks 2016-04-01 13:14:03 -07:00
Andrew Meadows
442b52313f faster kinematic motion calculations 2016-04-01 13:14:03 -07:00
Andrew Meadows
3f52d237ed adding Bullet profiler instances for better stats 2016-04-01 13:14:03 -07:00
Brad Hefta-Gaub
7db22ee8c2 Merge pull request #7477 from ericrius1/cowTipper
Adds a cow which untips itself and moos when it collides with an entity
2016-04-01 13:08:41 -07:00
Brad Hefta-Gaub
95e0682012 Merge pull request #7446 from ctrlaltdavid/20855
Restyle entities editor
2016-04-01 13:07:58 -07:00
Brad Davis
cd548744f6 Merge pull request #7531 from ZappoMan/optimizeDepthReticle
only do depth reticle depth check when the reticle is visible
2016-04-01 13:06:44 -07:00
Brad Hefta-Gaub
270a9b0483 Merge pull request #7534 from hyperlogic/tony/only-update-model-on-main-thread
Application: don't call Model::simulate on network thread.
2016-04-01 13:05:54 -07:00
Brad Hefta-Gaub
a3734eba00 Merge pull request #7535 from birarda/suppress-more
add suppression for ring buffer and sequence number messages
2016-04-01 13:04:32 -07:00
Brad Hefta-Gaub
830c7a90e1 Merge pull request #7537 from zzmp/fix/fst
Keep textureBaseUrl for fst models
2016-04-01 12:28:23 -07:00
Brad Davis
7696764bfb Merge pull request #7538 from ZappoMan/hmdAudioSwitching
switch to HMD preferred audio when mounting the HMD
2016-04-01 11:44:34 -07:00
Zach Pomerantz
489a2fd0b9 Persist tex base url across caching 2016-04-01 11:32:29 -07:00
Zach Pomerantz
2daf0c4da4 Init tex base url in Geometry ctor 2016-04-01 11:32:13 -07:00
Brad Hefta-Gaub
aee6fc9c8a handle starting in HMD mode 2016-04-01 11:22:12 -07:00
Anthony Thibault
8d06cd2447 Merge pull request #7539 from huffman/fix-asset-request-cancel
Fix asset resource request not properly cleaning up
2016-04-01 10:58:31 -07:00
Ryan Huffman
0948c8cefb Fix format of long lines 2016-04-01 10:11:32 -07:00
Ryan Huffman
8e375fd076 Fix asset resource request not properly cleaning up 2016-04-01 10:08:44 -07:00
Brad Hefta-Gaub
5a665f9aef Merge pull request #7482 from huffman/extra-logging
Add system information to log file
2016-04-01 09:10:21 -07:00
Brad Hefta-Gaub
c36a5370e6 whitespace 2016-04-01 09:02:16 -07:00
Brad Hefta-Gaub
d5ecb99b16 switch to HMD preferred audio when mounting the HMD 2016-04-01 09:00:57 -07:00
Ryan Huffman
03f9a02857 Update env var logging to only include certain keys 2016-03-31 22:49:22 -07:00
David Rowe
b9054897f7 Merge branch 'master' into 20855 2016-04-01 17:32:47 +13:00
David Rowe
7d36ec9520 Miscellaneous fixes 2016-04-01 17:30:22 +13:00
Brad Hefta-Gaub
1e7a69fb90 Merge pull request #7523 from zzmp/fix/tex-load-fixup
Render alpha textures immediately
2016-03-31 21:04:04 -07:00
Brad Hefta-Gaub
7f041ec18e Merge pull request #7529 from jherico/texture_stress_test
Add texture stress test
2016-03-31 21:01:39 -07:00
Brad Hefta-Gaub
16f249ce6c Merge pull request #7524 from jherico/oculus_audio
Allow display plugins to expose a preferred audio device
2016-03-31 19:09:46 -07:00
Brad Davis
ef7febfcaf Merge pull request #7533 from zzmp/fix/model-release-texs
Release textures from cache
2016-03-31 18:58:01 -07:00
Eric Levin
8176852503 removed extra space 2016-03-31 18:50:24 -07:00
Eric Levin
e0f843d6eb removes extra space 2016-03-31 18:49:51 -07:00
David Rowe
1f0529b5ea Miscellaneous fixes 2016-04-01 14:13:38 +13:00
Stephen Birarda
fc8707dc05 add suppression for unreasonable sequence number messages 2016-03-31 18:04:13 -07:00
Anthony J. Thibault
3d43f73a88 Application: don't call Model::simulate on network thread.
This can cause a crash.

On startup the Application::processOctreeStats method on the network thread will call into entities entity->isReadyToComputeShape() (without a tree lock) and trigger Model::simulate.  Model is NOT thread safe.  This was leading to a single model to be initialized on two threads simultaneously.

This might be somewhat rare, I only caught it because I was running a debug build.
2016-03-31 17:57:20 -07:00
Stephen Birarda
5ab59fe770 suppress overflown AudioRingBuffer debug 2016-03-31 17:53:39 -07:00
Zach Pomerantz
809b489146 Don't cache 0-sized Resources 2016-03-31 17:15:20 -07:00
Clément Brisset
588a5da3ca Merge pull request #7525 from sethalves/fix-load-from-disk
Fix load from disk
2016-03-31 17:04:33 -07:00
Zach Pomerantz
33d56d974e Set texture size in cache post-proc 2016-03-31 17:02:40 -07:00
Zach Pomerantz
b80f0fc8a6 Add actual byte size to Resource 2016-03-31 17:02:40 -07:00
Zach Pomerantz
9d3abe5513 Release texs when models are cached 2016-03-31 17:02:40 -07:00
Clément Brisset
dc1d3a8ff5 Merge pull request #7527 from zzmp/fix/model-cache-delay
Fix model fetch delay
2016-03-31 16:59:27 -07:00
David Rowe
b900fcbbf0 Back out attempt at fixing OSX styling 2016-04-01 12:43:30 +13:00
Brad Hefta-Gaub
bbca1ba6db only do depth reticle depth check when the reticle is visible 2016-03-31 15:58:37 -07:00
Brad Davis
27406f5b21 Add texture stress test 2016-03-31 15:13:04 -07:00
David Rowe
a2953595a5 Tweak spinbox fields for large values 2016-04-01 10:23:39 +13:00
Ryan Huffman
1c1158b761 Add Windows manifest to interface.exe 2016-03-31 14:20:19 -07:00
Seth Alves
63595e196e fix batch-loaded local scripts 2016-03-31 14:02:47 -07:00
David Rowe
048865fb09 Style spin buttons 2016-04-01 09:55:27 +13:00
Brad Davis
97e96f7b67 PR comments 2016-03-31 13:19:26 -07:00
Zach Pomerantz
bc2901aa96 Fix model fetch delay 2016-03-31 12:54:23 -07:00