Andrew Meadows
a933935e2d
lock mutex in clearEntitiesInernal()
2016-02-28 15:13:49 -08:00
Andrew Meadows
b4edfe2390
no expiry for simulation ownership
2016-02-25 12:07:20 -08:00
Brad Hefta-Gaub
91f6b7e80d
Merge pull request #7186 from zzmp/feat/scene-ambient-tex
...
Wire up zone ambientURL
2016-02-25 09:05:25 -08:00
Zach Pomerantz
20bfdba14b
Avoid light prop copies when setting globalLight
2016-02-24 16:20:59 -08:00
Zach Pomerantz
1817b8ef2f
Use only skyboxTexture in DeferredLightingEffect
2016-02-24 16:07:28 -08:00
Zach Pomerantz
95d98e3ed7
Wire up zone ambientURL
2016-02-24 16:07:04 -08:00
Anthony Thibault
9d9e63a947
Merge pull request #7182 from zzmp/fix/aa-shader
...
Fix fxaa shader to use texture
2016-02-24 13:51:12 -08:00
Brad Hefta-Gaub
9273238b53
Merge pull request #7178 from Nex-Pro/20807
...
CR for Job #20807 - Fix vertically mirrored particles.
2016-02-24 13:43:40 -08:00
Zach Pomerantz
124c84c8b9
Fix fxaa shader to use texture
2016-02-24 13:36:08 -08:00
Brad Hefta-Gaub
2a18127a01
Merge pull request #7171 from jherico/avatar_qml_location
...
Allow avatar positioning from QML
2016-02-24 11:37:12 -08:00
Brad Hefta-Gaub
3df5d0abad
Merge pull request #7161 from zzmp/fix/overlay-model-scale
...
Use proper getter for model overlay scaling
2016-02-24 09:31:47 -08:00
Chris Collins
64a07440cc
Merge pull request #7180 from jherico/qml
...
Several QML fixes
2016-02-24 08:20:03 -08:00
Chris Collins
7f679af186
Merge pull request #7176 from zzmp/menu/graphics
...
Update graphics menus
2016-02-24 08:18:58 -08:00
Brad Davis
4074ba172d
Fix window confirmation dialog
2016-02-23 20:37:25 -08:00
Brad Davis
b63e4b9d1f
Address shutdown crash
2016-02-23 18:15:29 -08:00
Andrew Meadows
8d91912d4b
Merge pull request #7162 from hyperlogic/tony/controller-velocity
...
Improve hand controller move and throw velocity
2016-02-23 17:13:13 -08:00
Nex Pro
864f00ee61
Fixed inverted particle rendering.
2016-02-24 01:02:17 +00:00
Zach Pomerantz
13153bcf08
Fix keyLight.ambientURL capitalization
2016-02-23 16:53:16 -08:00
Zach Pomerantz
ea8edb3744
Remove antialiasing from menus, default to on
2016-02-23 16:24:44 -08:00
Chris Collins
94d018be3e
Merge pull request #7172 from zzmp/fix/stats
...
Consolidate stats for opaque/transparent/other
2016-02-23 16:23:11 -08:00
Anthony Thibault
38b29f4709
Revert "Physics: extrapolate kinematic objects as well as dynamic ones."
...
This reverts commit e544275500
.
2016-02-23 13:26:15 -08:00
Zach Pomerantz
eb53f44a06
Convert size_t details to int
2016-02-23 12:44:38 -08:00
Brad Davis
2258a9cad9
Allow avatar positioning from QML
2016-02-23 12:16:41 -08:00
Zach Pomerantz
7804ee22d4
Consolidate stats for opaque/transparent/other
2016-02-23 12:14:00 -08:00
Anthony J. Thibault
e544275500
Physics: extrapolate kinematic objects as well as dynamic ones.
2016-02-23 12:07:14 -08:00
Clément Brisset
a802f69aa9
Merge pull request #7169 from samcake/red
...
Fix the crash when Particle system entities are created and removed quickly
2016-02-23 11:45:32 -08:00
Stephen Birarda
7e92841367
Merge pull request #7168 from howard-stearns/audio-restart-injector-limits
...
audio restart injector limits
2016-02-23 11:28:38 -08:00
Howard Stearns
6a987391d2
Remove debugging code.
2016-02-23 10:55:36 -08:00
Howard Stearns
5d9ee84e63
Extend the test for number of active injectors to apply to injector restarts.
2016-02-23 10:42:39 -08:00
samcake
1c53f9bc87
Fix the cleanup of the render::Item::ID in the EntityITem Rendereable wich were often not invalidated after beeing removed from the scene. THis caused a bug with particule system when beeing added /removed / updated quickly
2016-02-23 10:40:50 -08:00
Zach Pomerantz
7c9022fb3e
Fix model overlay scaling
2016-02-23 10:40:47 -08:00
Stephen Birarda
8385d12d9b
Merge pull request #7159 from Atlante45/fix/atp
...
Fix packet resend faillure bug
2016-02-23 10:15:36 -08:00
Brad Davis
160a107bbd
Auto-unhide the desktop when showing or raising a window
2016-02-22 19:36:00 -08:00
Anthony Thibault
3b87cd0ea8
Improve hold action by using controller velocity
...
The AvatarHoldAction now derives the body velocity by using data from the controller::Pose. Rather then trying to derive it based on previous positions. This results in more acurate motion of the held object when the hold is released.
OpenVR input plugin: pass the velocity and angularVelocity directly from the controller pose to the controller::Pose.
2016-02-22 19:15:22 -08:00
Atlante45
4c18a50473
Only debug if define set
2016-02-22 15:42:11 -08:00
Atlante45
97aebaf52a
Fix log regexes
2016-02-22 15:33:53 -08:00
Atlante45
cb4f400c7e
Cleanup obfuscation code
2016-02-22 15:32:00 -08:00
Atlante45
17b4d6fcf9
Factor members copy
2016-02-22 15:15:38 -08:00
Atlante45
f06ac911c5
Fix XORing algorithm
2016-02-22 15:15:38 -08:00
Atlante45
3a11e84c94
Use hex for msvc compatibility
2016-02-22 15:15:38 -08:00
Atlante45
c29ad09306
Fix obfuscation
2016-02-22 15:15:38 -08:00
Atlante45
bf5a65ca45
Add missing copies
2016-02-22 15:15:38 -08:00
Atlante45
4605cf5087
Move all udt header constants to Constant.h
2016-02-22 15:15:38 -08:00
Atlante45
3d7d812044
Add resend mecanic with obfuscation
2016-02-22 15:15:38 -08:00
Atlante45
6d9405d91d
Add obfuscation level to packets
2016-02-22 15:15:38 -08:00
Atlante45
f6526272de
Add header descriptions
2016-02-22 15:15:38 -08:00
Brad Davis
c07f3789e4
Don't crash on script destructor
2016-02-22 14:26:33 -08:00
Brad Davis
b4a7dc113e
Safer shutdown behavior in QML surfaces
2016-02-22 14:25:30 -08:00
Brad Davis
4169e9be9d
Don't deadlock objreader on shutdown
2016-02-22 14:24:31 -08:00
Ryan Huffman
e6ccf501fa
Merge pull request #7135 from zzmp/fix/grid
...
Update renderGrid to use a shader, and fix grid edit tools
2016-02-22 12:58:23 -08:00