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 |
|
Seth Alves
|
260d27f4d7
|
increase drop-on-joint radius. fix bug that kept from dropping on hips (index 0). save adjustments if in dressing room
|
2016-02-02 14:31:20 -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 |
|
ericrius1
|
0aa68328c8
|
adding sound entity script
|
2016-02-02 13:59:56 -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 |
|
Anthony J. Thibault
|
8b5cf3e49a
|
CharacterController: refined state machine.
|
2016-02-02 11:26:17 -08:00 |
|
Anthony J. Thibault
|
47f3ce3786
|
CharacterController jump is more reliable.
|
2016-02-02 11:26:16 -08:00 |
|
Anthony J. Thibault
|
2936811484
|
Added takeoff animation, WIP
Character controller still has some jump/in-air bugs.
|
2016-02-02 11:26:15 -08:00 |
|
Anthony J. Thibault
|
61c55ebf6c
|
Updated character controller with a state enumeration
Also, adjusted checkForSupport logic such that very slanted walls are not considered support.
|
2016-02-02 11:26:15 -08:00 |
|
Anthony J. Thibault
|
e9fd439ffd
|
Added inAir animations
|
2016-02-02 11:23:46 -08:00 |
|
ericrius1
|
93220c3b01
|
two sounds
|
2016-02-02 10:51:10 -08:00 |
|
Ryan Huffman
|
eff02d3e3a
|
Fix Agents bidding on simulation ownership
|
2016-02-02 10:47:51 -08:00 |
|
ericrius1
|
20d1ba11c3
|
Basic ac sound playing and entity searching
Injecting sounds from entity
|
2016-02-02 10:37:23 -08:00 |
|
Ryan Huffman
|
57d92bcfa6
|
Stop creation of GridTool altogether in edit.js
|
2016-02-02 10:13:24 -08:00 |
|
Seth Alves
|
3bbecf5c8b
|
Merge branch 'adjust-palm-position' of github.com:sethalves/hifi into dressing-room
|
2016-02-02 10:04:35 -08:00 |
|
Seth Alves
|
53e3f5a5d1
|
Merge branch 'save-held-adjustments' of github.com:sethalves/hifi into dressing-room
|
2016-02-02 10:04:15 -08:00 |
|
Ryan Huffman
|
dad36b73fc
|
Disable gridTool in edit.js
|
2016-02-02 09:57:52 -08:00 |
|
Seth Alves
|
fec479d70a
|
Merge branch 'master' of github.com:highfidelity/hifi into dressing-room
|
2016-02-02 09:25:11 -08:00 |
|
Andrew Meadows
|
ee96341380
|
Merge pull request #7001 from imgntn/masterOffsets
Update reset scripts to use new offset style
|
2016-02-02 08:25:32 -08:00 |
|
Andrew Meadows
|
e394f64540
|
Merge pull request #6991 from seefo/master
Added camera sensitivity dialog preferences
|
2016-02-02 08:22:45 -08:00 |
|
James B. Pollack
|
d25dbfff9f
|
Merge pull request #6993 from hyperlogic/tony/mirrored-doppelganger
doppelganger.js: mirror joint rotations & translations about x-axis
|
2016-02-01 19:09:42 -08:00 |
|
James B. Pollack
|
8a70e53131
|
Merge pull request #7004 from jherico/qml
Small QML fixes
|
2016-02-01 19:08:38 -08:00 |
|
Seth Alves
|
1e69c12e87
|
move grab position to front of palm
|
2016-02-01 18:47:26 -08:00 |
|
Bradley Austin Davis
|
4860c7d4f1
|
Give title to tool window
|
2016-02-01 18:28:23 -08:00 |
|
Bradley Austin Davis
|
aecf582593
|
Don't crash on GL error in present thread
|
2016-02-01 18:26:32 -08:00 |
|
Seth Alves
|
2501be16cb
|
base palm position on finger joint rather than an offset from hand joint. double size of near-grab sphere
|
2016-02-01 18:11:27 -08:00 |
|
Zach Pomerantz
|
0b6cfbe50a
|
Only connect render config if dirty signal present
|
2016-02-01 17:48:31 -08:00 |
|
James B. Pollack
|
43844dd0be
|
Merge pull request #7008 from ericrius1/editPropsDecimals
Fixed bug where lack of 0 as prefix for numbers would throw an error
|
2016-02-01 17:35:44 -08:00 |
|
James B. Pollack
|
822a64a08b
|
decrease volume
|
2016-02-01 17:16:27 -08:00 |
|
James B. Pollack
|
25fe8583c8
|
decrease all volume
|
2016-02-01 16:48:15 -08:00 |
|
Philip Rosedale
|
b038e4b7e7
|
calibrate using either the 1 or 2 button on each hand
|
2016-02-01 16:48:00 -08:00 |
|
Seth Alves
|
8d8e3520d5
|
Merge pull request #7007 from samcake/hdr
Fixing the darkening rendering bug
|
2016-02-01 16:46:32 -08:00 |
|
Stephen Birarda
|
095f0b9349
|
rename canAdjustLocks to isAllowedEditor for multi-purpose
|
2016-02-01 16:46:11 -08:00 |
|
ericrius1
|
1387f5f322
|
Fixed bug where lack of 0 as prefix for numbers would throw an error
|
2016-02-01 16:44:55 -08:00 |
|
Seth Alves
|
67c95a00a0
|
Merge branch 'hdr' of github.com:samcake/hifi into dressing-room
|
2016-02-01 16:42:42 -08:00 |
|
samcake
|
e645f8a1f1
|
FIxing the rendering bug, current zone enity lighting and skybox were not applied anymore
|
2016-02-01 16:25:55 -08:00 |
|
Seth Alves
|
c570f4af67
|
Merge branch 'master' of github.com:highfidelity/hifi into dressing-room
|
2016-02-01 16:15:42 -08:00 |
|
Brad Davis
|
1d4dc636af
|
Merge pull request #7002 from hyperlogic/tony/qml-overlay-delete-fix
QmlOverlay: Fix for issue use after delete
|
2016-02-01 16:03:58 -08:00 |
|
Brad Davis
|
3fcea102ed
|
Remove unused variable
|
2016-02-01 16:03:47 -08:00 |
|
Philip Rosedale
|
fb9df717b6
|
Merge pull request #7005 from sethalves/grab-user-controller-rotation
use controller hand rotation rather than IK hand rotation in grab script
|
2016-02-01 15:47:55 -08:00 |
|
Anthony J. Thibault
|
bea5ced3eb
|
QmlOverlay: remove unnecessary capture by value sigil from lambda
|
2016-02-01 15:46:49 -08:00 |
|