Stephen Birarda
|
42e9a4ebf0
|
fix ATP SendQueue failure to receive after re-activity
|
2016-02-04 13:43:50 -08:00 |
|
Eric Levin
|
294a7ee9ad
|
Merge pull request #7027 from birarda/avatars-property
move two AvatarList invokable methods from AvatarManager to AvatarHashMap
|
2016-02-04 11:41:52 -08:00 |
|
James B. Pollack
|
3c9043987f
|
Merge pull request #7019 from birarda/absolute-paths
allow absolute path to entity-server persist file
|
2016-02-04 08:53:21 -08:00 |
|
James B. Pollack
|
8b09cf3b82
|
Merge pull request #7024 from birarda/audio-mute-crash
fix for audio-mixer mute env crash
|
2016-02-04 08:53:10 -08:00 |
|
Eric Levin
|
2af6c08057
|
Merge pull request #7022 from imgntn/mastertoys
Fix userData for pistol in toybox reset scripts
|
2016-02-03 17:47:21 -08:00 |
|
Eric Levin
|
32fc973698
|
Merge pull request #7010 from imgntn/cellscience
Decrease Cell Science Volume
|
2016-02-03 17:46:56 -08:00 |
|
Stephen Birarda
|
816fe52c5b
|
mark getAvatarBySessionID as virtual
|
2016-02-03 17:31:38 -08:00 |
|
Stephen Birarda
|
058bba7b55
|
move avatar invokables from AvatarManager to AvatarHashMap
|
2016-02-03 17:13:35 -08:00 |
|
Andrew Meadows
|
63df34541d
|
Merge pull request #6802 from huffman/agent-simulation
Fix Agents bidding on simulation ownership
|
2016-02-03 13:45:12 -08:00 |
|
Stephen Birarda
|
ea9d84bdc4
|
handle downloading of absolute persist file contents
|
2016-02-03 13:18:29 -08:00 |
|
Andrew Meadows
|
861082964e
|
Merge pull request #7017 from hyperlogic/tony/fly
MyAvatar: Improved Jump / InAir / Fly behavior
|
2016-02-03 12:22:30 -08:00 |
|
Andrew Meadows
|
00f30201a7
|
Merge pull request #7003 from sethalves/save-held-adjustments
automatically save adjustments to offsets of equipped items
|
2016-02-03 12:21:17 -08:00 |
|
Brad Hefta-Gaub
|
839ce50bde
|
Merge pull request #7018 from jherico/qml
QML fixes
|
2016-02-03 11:59:27 -08:00 |
|
Ryan Huffman
|
77b86e654e
|
Merge pull request #7006 from birarda/final-overrides
fix the last of the current override warnings for OS X
|
2016-02-03 11:26:46 -08:00 |
|
Stephen Birarda
|
93530fca72
|
fix the last of the current override warnings for OS X
|
2016-02-03 11:08:41 -08:00 |
|
Stephen Birarda
|
0e20392e66
|
remove debug for mute environment packet
|
2016-02-03 11:07:16 -08:00 |
|
Stephen Birarda
|
26abca92ae
|
don't move the re-used mute environment packet
|
2016-02-03 10:55:07 -08:00 |
|
Seth Alves
|
ad2a7bfc3c
|
code review
|
2016-02-03 10:54:08 -08:00 |
|
Andrew Meadows
|
cd56d635e1
|
Merge pull request #7012 from sethalves/adjust-palm-position
base palm position on finger joint rather than an offset from hand joint
|
2016-02-03 10:34:39 -08:00 |
|
Anthony J. Thibault
|
fff603e4e2
|
Removed comment
|
2016-02-03 10:21:27 -08:00 |
|
James B. Pollack
|
51b335c902
|
reduce cellscience volume
|
2016-02-03 09:53:14 -08:00 |
|
Ryan Huffman
|
963c71a476
|
Fix ES rejecting unowned entity physics updates
|
2016-02-03 09:28:49 -08:00 |
|
samcake
|
4d62df2996
|
Merge pull request #7011 from zzmp/fix/render-connect-warnings
Only connect render config if dirty signal present
|
2016-02-02 17:46:22 -08:00 |
|
samcake
|
940ef40b69
|
Merge pull request #6999 from zzmp/refactor/render-init-file
Migrate stencil and overlay jobs to use plumbers
|
2016-02-02 17:45:17 -08:00 |
|
James B. Pollack
|
61daed5376
|
fix userdata for pistol
|
2016-02-02 17:39:43 -08:00 |
|
Zach Pomerantz
|
aa10af2851
|
Revert "Move DrawStencil to use ShapePlumber"
This reverts commit 671f27e5bc.
|
2016-02-02 17:10:21 -08:00 |
|
Seth Alves
|
6503fd6d46
|
Merge pull request #7009 from PhilipRosedale/calibrateNoBumper
calibrate hydras using either the 1 or 2 button on each hand
|
2016-02-02 17:04:55 -08:00 |
|
Seth Alves
|
30e97c2a76
|
run attachedEntitiesManager.js by default, but without a UI
|
2016-02-02 16:34:06 -08:00 |
|
Stephen Birarda
|
2c1623ed42
|
use extension with preceeding period
|
2016-02-02 16:07:14 -08:00 |
|
Stephen Birarda
|
8ab15770b8
|
use absolutePath for absolute persist path
|
2016-02-02 15:52:12 -08:00 |
|
Stephen Birarda
|
99d1fa08fd
|
handle incorrect casing in persist file extension
|
2016-02-02 15:49:40 -08:00 |
|
Stephen Birarda
|
90b78feb1e
|
force models file to end in .json.gz
|
2016-02-02 15:37:34 -08:00 |
|
Bradley Austin Davis
|
bc7fda0ae9
|
Set desirable global settings for QML web views
|
2016-02-02 15:19:47 -08:00 |
|
Bradley Austin Davis
|
f24f2749e1
|
Make users.js show QML window for edit friends
|
2016-02-02 15:19:12 -08:00 |
|
Stephen Birarda
|
ff239a7c6a
|
add helper text for extension to persistFilePath
|
2016-02-02 15:17:45 -08:00 |
|
Stephen Birarda
|
9633e40c6e
|
add code to remove old persistFilename setting
|
2016-02-02 15:15:19 -08:00 |
|
Anthony J. Thibault
|
6cc3b2b47f
|
Fixed unused variable warnings on OSX and Linux
|
2016-02-02 15:04:28 -08:00 |
|
Stephen Birarda
|
13d58003be
|
migrate persistFilename to persistFilePath in DS settings
|
2016-02-02 15:02:12 -08:00 |
|
Stephen Birarda
|
4d91b8b7d6
|
fix check for existing persist file directory
|
2016-02-02 14:38:17 -08:00 |
|
Bradley Austin Davis
|
cede14fdc6
|
Don't cut off title of windows without close icons
|
2016-02-02 14:32:04 -08:00 |
|
Stephen Birarda
|
cfff765731
|
allow for absolute path handling at entity-server
|
2016-02-02 14:21:34 -08:00 |
|
Brad Hefta-Gaub
|
a025fab5c8
|
Merge pull request #7016 from jherico/qml
QML Fixes
|
2016-02-02 14:08:45 -08:00 |
|
Ryan Huffman
|
759b1a347c
|
Merge pull request #7015 from birarda/audio-mute-crash
rename canAdjustLocks to isAllowedEditor, add debug for crash
|
2016-02-02 13:12:06 -08:00 |
|
Ryan Huffman
|
25632b63b7
|
Adjust Entities.addEntity to not bid on simulation from AC Script
|
2016-02-02 13:00:35 -08:00 |
|
Anthony J. Thibault
|
656608e2ff
|
Fixes for away.js
|
2016-02-02 12:08:52 -08:00 |
|
Bradley Austin Davis
|
2c26b32341
|
Make QML based tool-windows close properly
|
2016-02-02 12:00:58 -08:00 |
|
Bradley Austin Davis
|
5adf9adb0e
|
Make mirror rectaqngle move with mirror controls
|
2016-02-02 12:00:17 -08:00 |
|
James B. Pollack
|
43bf7cf679
|
Merge pull request #7014 from huffman/disable-edit-grid
Disable gridTool in edit.js
|
2016-02-02 11:44:46 -08:00 |
|
Stephen Birarda
|
79dc2d5d55
|
add some debug for mute environment crash
|
2016-02-02 11:40:15 -08:00 |
|
Anthony J. Thibault
|
c4e1509aa2
|
CharacterController: better debug support of internal state machine
Head is no longer visible when flying fast, in first-person HMD mode.
|
2016-02-02 11:26:18 -08:00 |
|