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
8a70e53131
Merge pull request #7004 from jherico/qml
...
Small QML fixes
2016-02-01 19:08:38 -08:00
Bradley Austin Davis
4860c7d4f1
Give title to tool window
2016-02-01 18:28:23 -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
samcake
e645f8a1f1
FIxing the rendering bug, current zone enity lighting and skybox were not applied anymore
2016-02-01 16:25:55 -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
Anthony J. Thibault
bea5ced3eb
QmlOverlay: remove unnecessary capture by value sigil from lambda
2016-02-01 15:46:49 -08:00
Anthony J. Thibault
db5e750fd7
Removed debug code
2016-02-01 15:45:57 -08:00
Bradley Austin Davis
c71a20b2f0
Move a QML window to the center of the desktop if it's completely off
2016-02-01 15:34:13 -08:00
Bradley Austin Davis
4393a754e2
File dialog polish
2016-02-01 15:34:10 -08:00
Bradley Austin Davis
9da0181b72
Don't try to be clever with coloring table rows
2016-02-01 15:34:07 -08:00
Bradley Austin Davis
093ccb483d
FontAwseome button polish
2016-02-01 15:34:04 -08:00
Bradley Austin Davis
4b9e5746cd
Removing some runtime warnings about null values
2016-02-01 15:34:01 -08:00
Bradley Austin Davis
7938270802
Fix modal frame decoration
2016-02-01 15:33:58 -08:00
Anthony J. Thibault
64b56207f2
QmlOverlay: Fix for issue use after delete
...
Sometimes, it was possible to set the qmlElement bounds AFTER the qmlElement itself was deleted on another thread.
To fix this we use a shared_ptr to hold the qmlElement, then use a weak_ptr in the setProperties lambda, to verify that the qmlElement still exists.
The script that was previously causing this code to fail is: "users.js".
Because, it creates a textSizeOverlay then immediately deletes it.
2016-02-01 14:20:29 -08:00
samcake
1b52d700a0
Merge pull request #6871 from Atlante45/feat/draw-call-info
...
Unify normal and named draw paths
2016-02-01 14:19:15 -08:00
Brad Hefta-Gaub
6779bc4073
Merge pull request #7000 from jherico/qml
...
Snapshot UI in QML
2016-02-01 14:00:25 -08:00
Brad Hefta-Gaub
711787a997
Merge pull request #6981 from howard-stearns/animate-iff-visible-with-step2-billboard-removal
...
Animate iff visible with step2 billboard removal
2016-02-01 13:54:25 -08:00
Brad Davis
27c38599a9
Snapshot dialogs
2016-02-01 11:07:48 -08:00
Brad Davis
eb7988e4ef
Cleaning up unused code
2016-02-01 11:07:46 -08:00
Atlante45
7e8ea4dc77
Update primitive instance rendering calls
2016-02-01 18:50:01 +01:00
howard-stearns
277dbdbc37
Merge branch 'master' of https://github.com/highfidelity/hifi into better-head-joint-setup
2016-02-01 09:35:30 -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
Seefo
07043d537f
Fixed Ubuntu warnings
2016-01-29 21:11:44 -05:00
Seefo
0fad9b6755
Changed literals to follow coding standard
2016-01-29 20:07:45 -05:00
Seefo
56c3a37cdd
Fixed indentation
2016-01-29 19:59:28 -05:00
Seefo
77050b13dc
Adjusted default pitch/yaw speed
2016-01-29 19:41:34 -05:00
Seefo
33a01819e3
Fixed indentation
2016-01-29 19:36:23 -05:00
Seefo
ffa6687af3
Added setting dialogs for camera pitch and yaw
2016-01-29 19:34:57 -05:00
howard-stearns
ceed571c82
Look harder for head, log if not found, and compute what we need
...
regardless.
2016-01-29 16:02:58 -08:00
Seefo
22044db0b1
Readded center avatar in view option now that third person camera is fixed
2016-01-29 18:48:49 -05: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
howard-stearns
9601b65269
Merge branch 'master' of https://github.com/highfidelity/hifi into animate-iff-visible
2016-01-29 11:40:13 -08: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
