Stephen Birarda
43d2c0653d
return correct ATP url from upload dialog
2015-08-27 16:06:54 -07:00
Stephen Birarda
549c514400
fix upload leak, return error for failed load
2015-08-27 15:12:08 -07:00
Stephen Birarda
46990184d6
AssetUploadDialogFactory constructor should be private
2015-08-27 15:07:15 -07:00
Stephen Birarda
777e6c3c2d
use existing AssetUploadDialogFactory ref
2015-08-27 15:03:13 -07:00
Stephen Birarda
e3e529c4e5
resolve conflicts on merge with origin/protocol
2015-08-27 14:52:29 -07:00
Stephen Birarda
80cf7b6c76
resolve conflicts on merge with upstream/master
2015-08-27 14:50:04 -07:00
Stephen Birarda
59775e5756
actually add the additional error to the dialog
2015-08-27 14:40:12 -07:00
Stephen Birarda
26757eae7a
immediately show permission denied error if applicable
2015-08-27 14:37:44 -07:00
Stephen Birarda
f238c1b167
include the extension in upload confirmation
2015-08-27 14:29:42 -07:00
Howard Stearns
96c74ebbd5
Enable Rig Animations is now a developer menu item (rather than requiring javascript to set). Also turning it off resets you to bind pose and deliberately throws away old animations.
...
Default animations are the new ones for our standard T-pose. (Had been for the double-A pose fightbot.)
Rig state machine now does "backup", and doesn't apply strafe while turning.
2015-08-27 12:25:40 -07:00
Stephen Birarda
229015a5da
don't allow asset-server upload if no server present
2015-08-27 12:21:38 -07:00
Stephen Birarda
16eee10cab
repairs to permission error for asset-server upload
2015-08-27 12:13:20 -07:00
Stephen Birarda
c212ef5734
fix PacketReceiver cleanup, return permission error for upload
2015-08-27 12:01:24 -07:00
Stephen Birarda
b3bd94c8db
show a QMessageBox if not connected to asset-server
2015-08-27 11:37:27 -07:00
Stephen Birarda
f92ee597e5
fix width of asset upload dialog to fit ATP url
2015-08-27 11:32:03 -07:00
Brad Hefta-Gaub
79a9694d4a
Merge pull request #5648 from ctrlaltdavid/20663
...
Clean Interface.ini after a crash
2015-08-27 10:52:25 -07:00
Brad Hefta-Gaub
176860c612
Merge pull request #5649 from larsnaesbye/master
...
Move i18n to own dir, update FA
2015-08-27 10:46:29 -07:00
Stephen Birarda
513cae0d40
thread the AssetUpload so it doesn't take over main
2015-08-27 10:23:02 -07:00
Stephen Birarda
c277584f2e
Merge branch 'atp-server' of https://github.com/huffman/hifi into asset-upload
2015-08-27 09:17:25 -07:00
Stephen Birarda
5b5941fea2
move asset upload to AssetUploadDialogFactory
2015-08-26 16:30:09 -07:00
Ryan Huffman
4105b7369c
Remove AssetScriptingInterface
2015-08-26 15:55:29 -07:00
Ryan Huffman
59b32751f0
Cleanup AssetScriptingInterface
2015-08-26 15:54:02 -07:00
Brad Davis
270f2f7a3b
Fixing framerate limit, moving vsync to 2d plugin
2015-08-26 15:47:45 -07:00
Brad Davis
8cd13cad00
Merge pull request #5661 from sethalves/linux-memory-debugger
...
call setup_memory_debugger from common macros rather than from everywhere
2015-08-26 15:43:08 -07:00
Seth Alves
d2eb3108d5
Merge pull request #5644 from howard-stearns/eye-correction-application
...
eye correction correction
2015-08-26 14:46:48 -07:00
Ryan Huffman
aed1ba31c4
Fix bugs in Menu.cpp
2015-08-26 12:26:24 -07:00
Ryan Huffman
aa7d8678e1
Merge branch 'protocol' of github.com:birarda/hifi into atp-server
2015-08-26 12:26:11 -07:00
Seth Alves
695ffa29c7
call setup_memory_debugger from common macros rather than from every CMakeLists.txt file
2015-08-26 11:09:59 -07:00
Ryan Huffman
d90ceb200a
Add asset uploader to Menu
2015-08-26 09:27:50 -07:00
Brad Hefta-Gaub
aa80fc9127
Merge pull request #5653 from jherico/homer
...
Remove items from the VR menu properly
2015-08-26 09:14:48 -07:00
Andrew Meadows
45c846572e
Merge pull request #5645 from jherico/maggie
...
Fixing problems reported by static analysis tool
2015-08-26 08:31:05 -07:00
Atlante45
179ee73e26
Merge branch 'master' of https://github.com/highfidelity/hifi into update_protocol
2015-08-26 16:50:33 +02:00
Brad Hefta-Gaub
b19f1e0631
Merge pull request #5658 from ctrlaltdavid/20653
...
Add Desktop object to JavaScript with width and height properties
2015-08-25 23:18:20 -07:00
Brad Hefta-Gaub
1cd699de9d
Merge pull request #5657 from birarda/master
...
fix for 0 entity avg ping
2015-08-25 22:27:44 -07:00
Brad Davis
d311e4f2ea
Fixing problems reported by static analysis tool
2015-08-25 19:18:55 -07:00
Brad Davis
f176003dad
Fixing aspect ratio on stereo plugins
2015-08-25 19:05:31 -07:00
Brad Davis
0aaa07a2de
Remove items from the QML version of the menu when they are removed from the main menu
2015-08-25 19:05:29 -07:00
David Rowe
9d3d104ec3
Add Desktop object to JavaScript with width and height properties
2015-08-25 16:13:36 -07:00
Ryan Huffman
dc5d5cbb63
Add asset server ping to stats
2015-08-25 15:06:40 -07:00
David Rowe
1f541832b6
Reword dialog
2015-08-25 14:24:15 -07:00
Stephen Birarda
6f14eb2206
fix for 0 entity avg ping
2015-08-25 12:35:34 -07:00
Howard Stearns
6508d5943a
textChanged has to do something
2015-08-25 11:29:27 -07:00
David Rowe
7c8ff4dcbd
If Interface.ini doesn't contain crash option value assume default
2015-08-25 11:07:55 -07:00
Howard Stearns
2ed6900c7e
Clear the brush, clear the cobwebs, and set the other orientations now that we're clear on what coordinate system we're in.
2015-08-25 09:55:04 -07:00
Brad Davis
f9f5743fd7
Merge pull request #5650 from ZappoMan/fixCrashInController
...
Fix a couple crashes in the Controller scripting interface
2015-08-24 18:49:50 -07:00
Brad Hefta-Gaub
34e32ddaeb
Merge pull request #5636 from howard-stearns/marketplace-avatars
...
marketplace avatars
2015-08-24 17:49:20 -07:00
Brad Hefta-Gaub
5ea6d2704a
Merge pull request #5628 from ctrlaltdavid/webwindow-external-links
...
Make WebWindow hyperlinks with target="_blank" open in user's browser
2015-08-24 17:45:35 -07:00
Lars Christensen
324f592719
updated FontAwesome to v4.4
2015-08-25 01:55:52 +02:00
David Rowe
b27d25b46e
Implement crash option that retains only login and avatar information
2015-08-24 16:41:25 -07:00
Lars Christensen
110ba131a6
moved translation efforts into subdir
2015-08-25 01:36:19 +02:00
