David Rowe
|
b62bd682ed
|
Tidying
|
2016-02-27 11:03:57 +13:00 |
|
David Rowe
|
e8f349ec31
|
Fix up capitalization of labels and use of colons
|
2016-02-27 11:02:39 +13:00 |
|
David Rowe
|
bf0bcbe2ec
|
Style spinbox control
|
2016-02-27 10:48:53 +13:00 |
|
David Rowe
|
3cac94ed35
|
Refactor label style
|
2016-02-26 17:32:25 +13:00 |
|
David Rowe
|
3dc9d01aab
|
Style checkbox control
|
2016-02-26 15:56:19 +13:00 |
|
David Rowe
|
b620427ae8
|
Fix text field label color
|
2016-02-26 15:54:50 +13:00 |
|
David Rowe
|
513bc5d4ef
|
Style scripts section
|
2016-02-26 14:10:37 +13:00 |
|
David Rowe
|
a25702535b
|
Style snapshots section
|
2016-02-26 14:01:57 +13:00 |
|
David Rowe
|
d255ad3805
|
Improve property naming
|
2016-02-26 10:17:36 +13:00 |
|
David Rowe
|
5d931523ad
|
Style settings section headings
|
2016-02-26 10:03:00 +13:00 |
|
David Rowe
|
09029e4edd
|
Change name of dialog to match menu item
|
2016-02-25 20:37:54 +13:00 |
|
David Rowe
|
f04654fb56
|
Style and swap order of save and cancel buttons
|
2016-02-25 20:35:27 +13:00 |
|
David Rowe
|
10efbd996f
|
Update General Settings dialog to use new window frame style
|
2016-02-25 20:26:36 +13:00 |
|
David Rowe
|
023c04d2fe
|
Add optional footer to "form editor" dialogs
|
2016-02-25 20:25:20 +13:00 |
|
David Rowe
|
4cc36d1df0
|
Update QML UI test environment for Settings > General dialog
|
2016-02-25 17:13:48 +13:00 |
|
Chris Collins
|
f6a6560b86
|
Merge pull request #7175 from sethalves/grab-clean-up-abandoned
grab script cleans up abandoned grabs
|
2016-02-24 17:20:46 -08:00 |
|
Seth Alves
|
cfdaf643a1
|
Merge pull request #7181 from sethalves/fix-grab-action
fix avatarActionHold
|
2016-02-24 16:28:17 -08:00 |
|
Brad Hefta-Gaub
|
f9b55c4b87
|
Merge pull request #7185 from ctrlaltdavid/20809
Fixes for new modal message dialog
|
2016-02-24 16:20:40 -08:00 |
|
Anthony J. Thibault
|
62ed5333e0
|
AvatarActionHold: compute velocities for other avatars
|
2016-02-24 15:14:56 -08:00 |
|
Anthony J. Thibault
|
b3b4c6473d
|
Merge branch 'master' into fix-grab-action
|
2016-02-24 14:34:23 -08:00 |
|
David Rowe
|
b9a1c2051b
|
Fix modal dialog not being opaque to mouse clicks
|
2016-02-25 10:52:16 +13: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
|
568fd3e77f
|
Merge pull request #7164 from ctrlaltdavid/20809
Restyle message box modal dialogs
|
2016-02-24 13:47:00 -08:00 |
|
Brad Hefta-Gaub
|
1699e4a396
|
Merge pull request #7131 from ctrlaltdavid/20805
Restyle the Running Scripts dialog
|
2016-02-24 13:45:40 -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 |
|
Seth Alves
|
ea16a659b2
|
Merge pull request #7183 from zzmp/fix/avatar-warnings
Fix avatar warnings
|
2016-02-24 13:35:54 -08:00 |
|
Zach Pomerantz
|
3c4ab077be
|
Init validOrientation for myAvatar calc
|
2016-02-24 13:16:45 -08:00 |
|
Zach Pomerantz
|
e78905a6d1
|
Rm previousDeltaTimeStep unused field from AvatarActionHold
|
2016-02-24 13:15:49 -08:00 |
|
David Rowe
|
51b41da488
|
Horizontally center short messages in the dialog
|
2016-02-25 09:15:07 +13:00 |
|
Seth Alves
|
e1b10e79df
|
don't crash when watching someone else near-grab something
|
2016-02-24 12:09:51 -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
|
fa23e2023e
|
Fix bad tool window placement
|
2016-02-23 21:05:57 -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 |
|
Clément Brisset
|
8e8e23452f
|
Merge pull request #7156 from ZappoMan/depthReticleWork
Depth reticle work
|
2016-02-23 17:54:35 -08:00 |
|
Nex Pro
|
6403bb60a5
|
added particleOrientationTest.js for testing.
|
2016-02-24 01:20:49 +00: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 |
|
David Rowe
|
a816d835d3
|
Finesse modal message box dialog layout
|
2016-02-24 13:59:43 +13:00 |
|
Seth Alves
|
7fb67e487e
|
when releasing a near-grab, zero velocity if there is another grab, regardless of the isInitialGrab flag
|
2016-02-23 16:47:05 -08:00 |
|
Seth Alves
|
efca6ecb1d
|
remove debug print
|
2016-02-23 16:37:08 -08:00 |
|
Seth Alves
|
acd2caf26c
|
handle case where user grab data didn't have a heartbeat
|
2016-02-23 16:35:20 -08:00 |
|
Zach Pomerantz
|
ea8edb3744
|
Remove antialiasing from menus, default to on
|
2016-02-23 16:24:44 -08:00 |
|
Zach Pomerantz
|
7ae9752272
|
Remove Render > Ambient Light menu
|
2016-02-23 16:24:43 -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 |
|
Seth Alves
|
0e028fbac8
|
keep a heart-beat timestamp in userData of grabbed entities. if grabbing something with an out-of-date heartbeat, reset it before grabbing
|
2016-02-23 16:21:41 -08:00 |
|