Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-07 05:48:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
38615 commits 25 branches 0 tags 1.1 GiB
Commit graph

15595 commits

Author SHA1 Message Date
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
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
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
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
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