Brad Davis
eb7988e4ef
Cleaning up unused code
2016-02-01 11:07:46 -08:00
Seth Alves
753fc44c12
Merge pull request #6996 from thoys/hydra-scaling-fix
...
Fix for controller palm movement for scaled avatars
2016-02-01 09:17:22 -08:00
Seth Alves
b553c8400d
Merge pull request #6988 from huffman/market-import-fail
...
Fix marketplace imports failing silently if edit.js not running
2016-02-01 07:06:34 -08:00
Thijs Wenker
8f6e7018bd
Fix for Hydra scaling
...
This PR fixes the hydra (and probably other hand controllers) while scaling.
Testing notes:
- Enable your hydra's
- Grow your avatar (x5 or x10) (With the `+` key)
- Spreading your arms in a T-pose should work without any scaling issues
- Reset your scale using the `=` key
2016-01-31 23:39:43 +01:00
Ryan Huffman
acf96a401f
Fix marketplace imports failing silently if edit.js not running
2016-01-29 15:48:08 -08:00
David Rowe
e07baf916b
Fixed a typo noticed in passing
2016-01-30 12:30:21 +13:00
David Rowe
a5bc1cfd19
Periodically store avatar location
2016-01-30 12:27:47 +13:00
David Rowe
d2cdbebc94
Store avatar location after a teleport
2016-01-30 12:26:50 +13:00
David Rowe
be4022983b
Don't store avatar location immediately after a host change
...
Because the avatar location is 0,0,0 rather than the end target.
2016-01-30 12:25:56 +13:00
Brad Hefta-Gaub
721a911cf1
Merge pull request #6972 from jherico/qml
...
Small QML Fixes
2016-01-29 09:57:15 -08:00
Andrew Meadows
5bae01485e
Merge pull request #6975 from hyperlogic/tony/update-standard-anims
...
Update animations to use standard joint orientations
2016-01-29 08:58:06 -08:00
Brad Hefta-Gaub
8efe15cb21
Merge pull request #6963 from jherico/qmlOverlays
...
Make all 2D overlays QML-based
2016-01-28 23:33:30 -08:00
Brad Davis
5b1971907c
Move bookmarks to QML only dialogs
2016-01-28 21:20:43 -08:00
Brad Davis
c80193635b
Update input dialog to support choice selection
2016-01-28 21:19:21 -08:00
Brad Davis
35211b7475
Add titles to modal dialogs, move z-order debug display to bottom of window
2016-01-28 21:18:14 -08:00
Brad Davis
afd3ddf534
Cleaning up message box
2016-01-28 21:17:05 -08:00
Brad Davis
ab56765ebd
Add titles to windows
2016-01-28 17:52:22 -08:00
Brad Davis
e97850dd26
Merge pull request #6965 from ctrlaltdavid/20793
...
Warn user if OpenGL version is too low (< 4.1)
2016-01-28 20:39:56 -05:00
Brad Davis
5b2e739ef3
Fixing warning
2016-01-28 16:39:40 -08:00
Brad Davis
8c19b95ea2
Fix oversized text, invalid color handling
2016-01-28 16:36:28 -08:00
Brad Davis
72b264dcde
Ensure toolbar z-order is always below windows
2016-01-28 16:03:27 -08:00
Brad Davis
06071c6493
Fixing build errors
2016-01-28 16:03:26 -08:00
Brad Davis
5b817ccc21
Make all 2D overlays QML
2016-01-28 16:03:26 -08:00
James B. Pollack
78d06ed32a
Merge pull request #6952 from howard-stearns/avatar-preferences-chooser
...
avatar preferences chooser modal web
2016-01-28 16:01:53 -08:00
Brad Davis
aa03241dd9
Make all load script dialogs QML and respect previous script location
2016-01-28 15:53:04 -08:00
Brad Davis
db7e4eee8f
Make Ctrl-O and 'Running Scripts->load file' follow the same code path
2016-01-28 15:52:11 -08:00
Brad Davis
1324525ecc
Make file dialog compatible with QFileDialog::getOpenFile
2016-01-28 15:50:57 -08:00
Brad Davis
af1180aadb
Fix combobox in modal windows
2016-01-28 15:47:42 -08:00
David Rowe
2020514974
Move OpenGLVersionChecker to gl library
2016-01-29 12:29:21 +13:00
David Rowe
b7134c75c3
Rename OpenGLInfo to OpenGLVersionChecker
2016-01-29 12:14:47 +13:00
Anthony J. Thibault
d743ea2c9b
Changed urls from s3-us-west-1 to hifi-content.s3
2016-01-28 14:20:10 -08:00
Anthony J. Thibault
8710029604
Changed urls to http and updated hand poses.
2016-01-28 14:12:52 -08:00
Brad Davis
c41500f9d2
Running scripts can now show script URL
2016-01-28 12:21:44 -08:00
Brad Davis
04e6a5360a
Renaming preference dialog variable
2016-01-28 10:29:21 -08:00
Brad Davis
18d6a09dc9
Better preferences dialog initial state
2016-01-28 09:20:31 -08:00
Brad Davis
d9651c6d4b
Allow user browser to work with marketplace
2016-01-28 09:20:29 -08:00
David Rowe
af3d842e60
Warn user if OpenGL version is too low (< 4.1)
2016-01-28 15:25:00 +13:00
Anthony J. Thibault
4e4627d039
avatar-animation.json: Updated standard animations
2016-01-27 17:08:49 -08:00
Andrew Meadows
7b5c221ceb
Merge pull request #6956 from hyperlogic/tony/velocity-fix
...
MyAvatar: copy body velocity + hmd follow velocity onto avatar
2016-01-27 14:59:46 -08:00
samcake
f4e0352f61
Merge pull request #6930 from zzmp/feat/bubble-render-settings
...
Bubble up render settings from CPP to JS/QML
2016-01-27 14:20:51 -08:00
James B. Pollack
86b2a67f72
Merge pull request #6891 from sethalves/avatar-updates-query-cube
...
Avatar updates query cube
2016-01-27 13:04:03 -08:00
Anthony J. Thibault
c771c925c8
MyAvatar: copy body velocity + hmd follow velocity onto avatar
...
This was inadvertently removed in a previous PR.
https://github.com/highfidelity/hifi/pull/6895
Also, renamed Velocity stat to Speed.
2016-01-27 11:20:32 -08:00
Howard Stearns
0d257b82fa
Merge pull request #6934 from hyperlogic/tony/anim-pre-post-rot-support
...
Avatar Developer Menu: added animation debug options
2016-01-27 10:39:25 -08:00
Brad Davis
f53aaa1d64
Removing old attachment dialog, updating menu code
2016-01-26 21:55:42 -08:00
Brad Davis
2956557c5f
Adding overlay compatible combo-box
2016-01-26 21:55:41 -08:00
Brad Davis
664100b9b1
Attachment dialog
2016-01-26 21:55:40 -08:00
Howard Stearns
91b0f69312
When the avatar marketplace is chosen from avatar preferences, let it be moveable so that the user can move it aside to see their avatar.
2016-01-26 21:02:16 -08:00
Zach Pomerantz
e770d7b679
Add PhysicsShowOwned back to Menu
2016-01-26 18:56:52 -08:00
Brad Davis
0a6be80578
Added some disabled modal focus protection code
2016-01-26 18:50:55 -08:00
Brad Davis
fbee221966
Fix tool window breaking when visible while edit.js reloads
2016-01-26 18:15:41 -08:00
