David Rowe
|
f49ed0951e
|
Fix clickable areas
|
2015-03-13 12:04:43 -07:00 |
|
Stephen Birarda
|
f8c549ab87
|
Merge pull request #4443 from huffman/fix-svo-path-detection
Fix issue with .svo's not loading when the url has parameters
|
2015-03-13 10:40:29 -07:00 |
|
Ryan Huffman
|
2a84d9a6ab
|
Fix issue with .svo's not loading when the url has parameters
|
2015-03-13 10:06:49 -07:00 |
|
Stephen Birarda
|
edaee9716b
|
Merge pull request #4438 from huffman/edit-rename
Move editEntities.js to edit.js
|
2015-03-13 09:39:34 -07:00 |
|
Clément Brisset
|
f5777867da
|
Merge pull request #4439 from ctrlaltdavid/20394
CR for Job #20394 - Build friends.js v1
|
2015-03-13 09:00:14 -07:00 |
|
Brad Hefta-Gaub
|
fadd1a09e5
|
Merge pull request #4433 from ZappoMan/fix3DTV
fix rendering of models in 3D TV mode
|
2015-03-12 16:42:37 -07:00 |
|
Brad Hefta-Gaub
|
a6b5a73844
|
Merge pull request #4431 from ZappoMan/windowsMenuAssert
Fix windows assert
|
2015-03-12 16:42:10 -07:00 |
|
Brad Hefta-Gaub
|
6e10ed7f9b
|
Merge pull request #4437 from birarda/master
graceful cleanup of NodeList in Application
|
2015-03-12 12:52:58 -07:00 |
|
Ryan Huffman
|
2bedd1cfc7
|
Move editEntities.js to edit.js
|
2015-03-12 12:39:06 -07:00 |
|
Stephen Birarda
|
471e55c8ce
|
fix some lingering warnings
|
2015-03-12 12:36:39 -07:00 |
|
Stephen Birarda
|
09e2c0987e
|
use Dependency customDeleter for Application NL
|
2015-03-12 12:27:48 -07:00 |
|
Stephen Birarda
|
cd2ce2ee2f
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2015-03-12 12:14:43 -07:00 |
|
Stephen Birarda
|
7bfc747748
|
Revert "Revert "NOT MERGEABLE: graceful cleanup on Application dtor for NodeList""
This reverts commit 9269b2a0b2.
|
2015-03-12 12:13:32 -07:00 |
|
Stephen Birarda
|
6c7e0eda6a
|
Merge pull request #4432 from Atlante45/dm_update
Dependency::customDeleter uses a lambda
|
2015-03-12 11:33:32 -07:00 |
|
Stephen Birarda
|
278813e47f
|
Merge pull request #4434 from highfidelity/revert-4429-master
Revert "NOT MERGEABLE: graceful cleanup on Application dtor for NodeList...
|
2015-03-12 11:28:13 -07:00 |
|
Stephen Birarda
|
9269b2a0b2
|
Revert "NOT MERGEABLE: graceful cleanup on Application dtor for NodeList"
|
2015-03-12 11:28:07 -07:00 |
|
Stephen Birarda
|
4da9186045
|
Merge pull request #4429 from birarda/master
NOT MERGEABLE: graceful cleanup on Application dtor for NodeList
|
2015-03-12 11:26:56 -07:00 |
|
Atlante45
|
eb5206f8e6
|
Naming
|
2015-03-12 19:05:06 +01:00 |
|
ZappoMan
|
bbcce6a891
|
fix rendering of models in 3D TV mode
|
2015-03-12 10:59:12 -07:00 |
|
Stephen Birarda
|
3279e19b3d
|
Merge pull request #4430 from Atlante45/update_login_on_launch
Update Login menu item on creation
|
2015-03-12 10:55:07 -07:00 |
|
Atlante45
|
0bd97ce40c
|
Dependency::customDeleter uses a lambda
|
2015-03-12 18:53:29 +01:00 |
|
ZappoMan
|
cd52bab2e8
|
Merge branch 'master' of https://github.com/highfidelity/hifi into windowsMenuAssert
|
2015-03-12 08:59:51 -07:00 |
|
Brad Hefta-Gaub
|
8768b53124
|
Merge pull request #4416 from Atlante45/package_models
Package models
|
2015-03-12 08:57:46 -07:00 |
|
Atlante45
|
52c0ba817a
|
Remove dead code
|
2015-03-12 16:32:09 +01:00 |
|
Atlante45
|
d858956ad8
|
Merge branch 'master' of https://github.com/highfidelity/hifi into package_models
|
2015-03-12 16:31:03 +01:00 |
|
Brad Hefta-Gaub
|
f91a19a918
|
Merge pull request #4424 from huffman/open-svo
Handle drag-n-dropped .svos and using interface to open .svo files
|
2015-03-12 08:15:25 -07:00 |
|
Atlante45
|
decd240f60
|
Update Login menu item on startup after creation
|
2015-03-12 14:53:11 +01:00 |
|
Atlante45
|
bcfd4b50be
|
Merge branch 'master' of https://github.com/highfidelity/hifi into package_models
|
2015-03-12 14:18:37 +01:00 |
|
ZappoMan
|
b798761ec5
|
test fix for Austin's repro
|
2015-03-11 23:55:53 -07:00 |
|
David Rowe
|
dfd9506223
|
Add user location after username
Credit @nbq
|
2015-03-11 21:20:47 -07:00 |
|
David Rowe
|
2e16794615
|
Change font size to 12
|
2015-03-11 21:18:53 -07:00 |
|
David Rowe
|
eb22b0085b
|
Add radio buttons
|
2015-03-11 20:05:35 -07:00 |
|
David Rowe
|
a109a18bc3
|
Add visibility control
|
2015-03-11 19:28:29 -07:00 |
|
Brad Hefta-Gaub
|
356dbbec72
|
Merge pull request #4399 from ctrlaltdavid/20369
Fix for 20369
|
2015-03-11 18:09:07 -07:00 |
|
Stephen Birarda
|
d7e99594ae
|
make the application the parent of the node thread
|
2015-03-11 18:04:32 -07:00 |
|
Stephen Birarda
|
851d020390
|
remove QThread include required for debug
|
2015-03-11 17:21:49 -07:00 |
|
Stephen Birarda
|
7a8e94f1e5
|
remove extra debug information for node thread cleanup
|
2015-03-11 17:18:49 -07:00 |
|
Stephen Birarda
|
69bc6c9761
|
Merge pull request #4426 from ZappoMan/fixAvatarManagerCrash
some cleanup of dead code related to timers
|
2015-03-11 17:14:40 -07:00 |
|
Stephen Birarda
|
5d9a3811ca
|
more graceful cleanup for Application NodeList and DatagramProcessor
|
2015-03-11 17:14:20 -07:00 |
|
Stephen Birarda
|
943670285c
|
Merge pull request #4427 from ZappoMan/crashonexit
fix crash on exit related to AvatarManager using TextureCach resources
|
2015-03-11 17:11:56 -07:00 |
|
Stephen Birarda
|
9f754e40d0
|
move all silent node timers into LimitedNodeList
|
2015-03-11 16:59:06 -07:00 |
|
Brad Hefta-Gaub
|
7fdcc64292
|
Merge pull request #4425 from huffman/look-default
Make look.js the default look script and remove the old scripts
|
2015-03-11 16:51:35 -07:00 |
|
Stephen Birarda
|
429e1c6368
|
Merge pull request #4428 from birarda/master
use glm from hifi S3 now that fedora is down
|
2015-03-11 16:45:19 -07:00 |
|
Stephen Birarda
|
d3bc540919
|
use glm from hifi S3 now that fedora is down
|
2015-03-11 16:42:29 -07:00 |
|
ZappoMan
|
cab6cc8c75
|
fix crash on exit related to AvatarManager using TextureCach resources
|
2015-03-11 16:30:21 -07:00 |
|
ZappoMan
|
e87e0a1e0b
|
some cleanup of dead code related to timers
|
2015-03-11 16:27:04 -07:00 |
|
Ryan Huffman
|
1904e5e209
|
Make look.js the default look script and remove the old scripts
|
2015-03-11 16:17:44 -07:00 |
|
Ryan Huffman
|
76ebac1185
|
Add import svo requests in editEntities
|
2015-03-11 15:44:26 -07:00 |
|
Ryan Huffman
|
0048b91311
|
Add handling for opening an .svo using interface
|
2015-03-11 15:42:16 -07:00 |
|
Ryan Huffman
|
c3c2a75f48
|
Handle .svo drop events and emit svoImportRequested
|
2015-03-11 15:38:15 -07:00 |
|