Brad Hefta-Gaub
f03e9f8364
Merge pull request #2841 from birarda/master
...
use sheet modality so OAuth window doesn't take over full screen
2014-05-14 10:23:43 -07:00
Ryan Huffman
d59bedfa96
Fix running scripts not properly updated when done programmatically
...
Add a slot to Application to receive ScriptEngine::finished signals.
Notify the Running scripts widget of stopped scripts so it can properly
move them to the recent scripts list.
2014-05-13 22:25:08 -07:00
Stephen Birarda
debd76b2cb
use sheet window modality so OAuth window doesn't take over full screen
2014-05-13 10:38:43 -07:00
AndrewMeadows
3e78d63e34
Merge pull request #2833 from stojce/19597
...
fixed mention sounds dir for deployment
2014-05-12 14:33:21 -07:00
Andrzej Kapolka
8541df9c32
Remember attachment parameters per joint (as well as the last joint used) so
...
that the gun script correctly allows both guns' positions to be tweaked.
2014-05-12 12:16:30 -07:00
Stojce Slavkovski
7ffb700564
fixed mention sounds dir for deployment
2014-05-12 20:55:24 +02:00
Stojce Slavkovski
070d996096
change key missing message
2014-05-12 19:47:41 +02:00
Stojce Slavkovski
c835f2183e
Merge branch 'master' of https://github.com/worklist/hifi into 19507
2014-05-12 18:32:46 +02:00
Clément Brisset
db9f2c563b
Merge pull request #2830 from huffman/19645
...
Code Review for Job #19645
2014-05-12 08:58:06 -07:00
Stojce Slavkovski
3b7e0814fe
CR fixes
2014-05-11 09:57:43 +02:00
Stojce Slavkovski
9aa9b08397
Merge branch 'master' of https://github.com/worklist/hifi into 19507
2014-05-09 19:55:18 +02:00
Andrzej Kapolka
c424f6ce69
Save attachment data for attachment model/skeleton model combinations, let
...
scripts use those saved parameters so that you can tweak the location of
(for example) the gun and have it saved appropriately.
2014-05-08 18:00:41 -07:00
Stojce Slavkovski
96a9a47871
minor code fixes
2014-05-08 20:54:28 +02:00
Ryan Huffman
fdaa42b219
Add hifi:// clickable links to chat
...
The handling also needed to be updated to handle domains correctly -
just routing to goToURL instead of gTo fixes this.
2014-05-08 07:54:49 -07:00
Stojce Slavkovski
490ec23d8c
Merge branch 'master' of https://github.com/worklist/hifi into 19507
2014-05-07 07:38:48 +02:00
Brad Hefta-Gaub
439c873a68
Merge pull request #2794 from AndrewMeadows/thermonuclear
...
misc maintenance and bug fixes
2014-05-06 16:51:28 -07:00
Stojce Slavkovski
8ee282e7d2
Merge branch 'master' of https://github.com/worklist/hifi into 19507
2014-05-06 22:01:48 +02:00
Andrzej Kapolka
983a3af4b9
Attachment translations in world space.
2014-05-06 11:50:37 -07:00
Andrzej Kapolka
082ff760d6
Un-default the "OK" button so that we can press enter on the URL field.
2014-05-06 11:47:35 -07:00
Andrzej Kapolka
9421af9f10
Fix for attachments' not appearing in rear view mirror head mode.
2014-05-06 11:14:48 -07:00
Andrzej Kapolka
72ebeffa5c
Scratch that; I just didn't understand how magic invisible disappearing scroll
...
bars worked on OS X.
2014-05-06 10:59:28 -07:00
Andrzej Kapolka
c5fbf1b55f
Force the scroll bar.
2014-05-06 10:57:11 -07:00
Andrzej Kapolka
e0ecd611c9
Better attachment styling.
2014-05-06 10:53:54 -07:00
Andrzej Kapolka
a06697f2a1
Update attachment data on attachment delete.
2014-05-06 10:37:27 -07:00
Andrew Meadows
2ea10428c8
properly wrap XMPP stuff with "#ifdef HAVE_XMPP"
2014-05-06 09:34:44 -07:00
Stojce Slavkovski
0b03421046
trivial commit - trigger build
2014-05-06 08:37:49 +02:00
Stojce Slavkovski
aedc7eda3e
Merge branch 'master' of https://github.com/worklist/hifi into 19597
2014-05-06 08:27:55 +02:00
Stojce Slavkovski
14fee3b727
trivial commit - trigger build
2014-05-06 08:27:46 +02:00
Andrzej Kapolka
710cc3ec2a
Comment fix.
2014-05-05 17:08:10 -07:00
Andrzej Kapolka
2a32700a30
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-05-05 17:03:31 -07:00
Stojce Slavkovski
519b36240c
build fix
2014-05-06 01:05:04 +02:00
Andrzej Kapolka
65e34f9697
More work on attachment interface.
2014-05-05 13:41:50 -07:00
Stojce Slavkovski
09c385ba0d
Merge branch 'master' of https://github.com/worklist/hifi into 19597
2014-05-05 21:46:17 +02:00
Stojce Slavkovski
ccabe709b1
Merge branch 'master' of https://github.com/worklist/hifi into 19507
2014-05-05 21:40:37 +02:00
Stojce Slavkovski
56e7900aa6
Merge fix
2014-05-05 21:36:05 +02:00
Atlante45
31b5c39f16
Fix warnings
2014-05-05 11:17:11 -07:00
Andrzej Kapolka
e898b4a900
More attachment bits.
2014-05-04 17:24:15 -07:00
Andrzej Kapolka
53a2760905
More attachment bits.
2014-05-04 16:24:23 -07:00
Stojce Slavkovski
f668cc8581
Discourse upload image
...
- success message set
- fixed signal/slots in QDialog w/QEventLoop
- layout fixes
2014-05-05 00:55:24 +02:00
Andrzej Kapolka
e0400dbd9c
Working on allowing attachment models to be uploaded.
2014-05-04 15:23:31 -07:00
Stojce Slavkovski
37664d3877
Merge branch 'master' of https://github.com/worklist/hifi into 19597
2014-05-04 18:32:01 +02:00
Stojce Slavkovski
d93480458f
Posting Image to forum
2014-05-04 18:30:58 +02:00
Stojce Slavkovski
c400630bc4
make post
2014-05-03 21:12:20 +02:00
Stojce Slavkovski
b2c1afe1bd
Merge branch 'master' of https://github.com/worklist/hifi into 19507
2014-05-03 09:52:19 +02:00
Philip Rosedale
9aac74035c
Merge pull request #2771 from birarda/oauth-ds
...
restrict access to domains using user roles retreived from data-web
2014-05-02 17:09:52 -07:00
Stephen Birarda
1f35c07420
more repairs to OAuth signal/slot connection
2014-05-02 16:58:06 -07:00
Stephen Birarda
2dacc81960
use old signal/slot notation in OAuthWebViewHandler
2014-05-02 16:47:49 -07:00
Stephen Birarda
59ad09bfda
fix another missed casing issue
2014-05-02 16:34:06 -07:00
Stephen Birarda
1fda012364
fix another casing issue in OAuthWebViewHandler
2014-05-02 16:22:12 -07:00
Stojce Slavkovski
4d8e1b5bd4
repled audio files
2014-05-02 23:52:12 +02:00
