Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 14:29:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
23293 commits 76 branches 59 tags 1.2 GiB
Commit graph

11356 commits

Author SHA1 Message Date
Ryan Huffman
47e63719ee Handle svo request in DataWebPage as import requests 2015-03-13 17:35:33 -07:00
Ryan Huffman
aca509d5cc Add Application::improtSVOFromURL 2015-03-13 17:35:06 -07:00
Philip Rosedale
009551c4dd Merge pull request #4441 from AndrewMeadows/isentropic 
more correct shape for avatar collision capsule
 2015-03-13 17:33:16 -07:00
Ryan Huffman
9d5c0cf4e3 Add layout to WebWindowClass to that it maximizes the webview 2015-03-13 17:25:24 -07:00
Ryan Huffman
1193d86d7b Update webwindow to use datawebview 2015-03-13 16:39:25 -07:00
Ryan Huffman
d512a67c8a Merge branch 'master' of github.com:highfidelity/hifi into edit-lights-overlays 2015-03-13 14:13:56 -07:00
Ryan Huffman
53b5c7e971 Update WebWindow to raise when being set to visible 2015-03-13 14:11:01 -07:00
Ryan Huffman
dc3453a878 Add Window.raiseMainWindow() 2015-03-13 14:10:46 -07:00
Stephen Birarda
2b08c20900 Merge pull request #4440 from birarda/master 
remove the close activity from Interface
 2015-03-13 13:46:59 -07:00
Ryan Huffman
7ef1964a52 Add user agent for WebWindow 2015-03-13 11:52:02 -07:00
Ryan Huffman
93cdb3a293 Add option for non-tool window WebWindows 2015-03-13 11:51:40 -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
Andrew Meadows
924ebe1e54 propagate skeleton's bounding box into AvatarData 2015-03-13 09:39:47 -07:00
Andrew Meadows
645fc7dbc9 remove unused variable 2015-03-13 09:39:06 -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
Andrew Meadows
be252147e2 merge upstream/master into andrew/isentropic 2015-03-12 16:38:59 -07:00
Andrew Meadows
6bd857c4ea update Avatar in PhysicsEngine on load new body 2015-03-12 16:35:12 -07:00
Andrew Meadows
1f3a267b16 compute correct bounding shape dimensions 2015-03-12 16:34:47 -07:00
Andrew Meadows
2fad4153a9 remove unused Avatar::getBoundingRadius() 2015-03-12 16:34:27 -07:00
Stephen Birarda
0fe843db01 Revert "remove the launch activity from UserActivityLogger" 
This reverts commit bc6ac9081f.
 2015-03-12 15:53:05 -07:00
Stephen Birarda
bc6ac9081f remove the launch activity from UserActivityLogger 2015-03-12 15:08:05 -07:00
Stephen Birarda
0b55a0f123 remove the close event from UserActivityLogger 2015-03-12 15:06:44 -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
7bfc747748 Revert "Revert "NOT MERGEABLE: graceful cleanup on Application dtor for NodeList"" 
This reverts commit 9269b2a0b2.
 2015-03-12 12:13:32 -07:00
Ryan Huffman
ebf70f818a Merge branch 'master' of git://github.com/highfidelity/hifi into edit-light-2 
Conflicts:
	examples/editEntities.js
 2015-03-12 11:39:26 -07:00
Seth Alves
b945ce5e7a Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json 2015-03-12 11:38:01 -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
Seth Alves
4aa7b0eb0f provide defaults for anything entity properties read from a map 2015-03-12 11:19:47 -07: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
Seth Alves
898b9f4af3 Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json 2015-03-12 10:24:05 -07:00
Seth Alves
90f6b798b1 don't mess with tools window in this branch 2015-03-12 10:11:37 -07:00
Seth Alves
fb93d08dd8 change how tool window acts on linux 2015-03-12 09:13:29 -07:00
ZappoMan
cd52bab2e8 Merge branch 'master' of https://github.com/highfidelity/hifi into windowsMenuAssert 2015-03-12 08:59:51 -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
Seth Alves
2a06816f71 added persist-as-json checkbox to domain settings. File extension of persist file is automatically adjusted when entity server saves. When loading, if both a json and svo file exist, the newer one is used. This is regardless of the persistAsJson setting 2015-03-11 23:09:15 -07:00
Seth Alves
87ac38c3df Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json 2015-03-11 18:35:13 -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
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
9f754e40d0 move all silent node timers into LimitedNodeList 2015-03-11 16:59:06 -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
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
Ryan Huffman
2f885bb7f2 Move WindowScriptingInterface to DependencyManager 2015-03-11 15:34:29 -07:00
Seth Alves
48aca5c46f Merge pull request #4423 from AndrewMeadows/isentropic 
remove old ragdoll simulation and avatar interactions
 2015-03-11 15:18:15 -07:00
Seth Alves
918cfa8b4e Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json 2015-03-11 14:36:25 -07:00
Andrew Meadows
bd115aa8f8 merge upstream/master into andrew/isentropic 2015-03-11 14:30:22 -07:00
Andrew Meadows
feafa0a60b remove old Ragdoll and avatar interactions 2015-03-11 14:29:03 -07:00
David Rowe
32897de80a Rename Stereo Audio menu item 2015-03-11 12:41:47 -07:00
Clément Brisset
885e6206e9 Merge pull request #4420 from ctrlaltdavid/20394 
CR for Job #20394 - Build friends.js v1
 2015-03-11 11:17:04 -07:00
Atlante45
bfbc8ffb47 File extension is case insensitive 2015-03-11 18:35:15 +01:00
Atlante45
1609823e2b Move helper function to top 2015-03-11 16:32:45 +01:00
Atlante45
a727669a15 Move menu option to tools 2015-03-11 16:30:24 +01:00
Atlante45
9b80c01357 Remove ModelUploader from the menu 2015-03-11 16:21:36 +01:00
Atlante45
95a6df7102 Remove ModelUploader 2015-03-11 16:18:39 +01:00
Atlante45
40c593bd0d Working model packager 2015-03-11 16:17:13 +01:00
Atlante45
a949af3296 Merge branch 'master' of https://github.com/highfidelity/hifi into upload_thumbnail 2015-03-11 14:09:32 +01:00
David Rowe
3d11dde8ad Check that the user configures a skeleton root joint 
Instead of just checking that the model has a "Hips" joint.
 2015-03-10 20:27:31 -07:00
David Rowe
e57d63b20e Merge branch 'master' into 20369 2015-03-10 18:55:27 -07:00
Leonardo Murillo
0509270bc6 Merge pull request #4415 from birarda/master 
fix for SVG issues on Windows
 2015-03-10 19:28:21 -06:00
Stephen Birarda
931a234ba7 fix reset for close button SVG in LoginDialog 2015-03-10 18:08:19 -07:00
Brad Hefta-Gaub
5cced9fc66 Merge pull request #4400 from samcake/temp0 
Introduce gpu::Shader, Pipeline and State
 2015-03-10 16:51:40 -07:00
Brad Hefta-Gaub
04837d5302 Merge pull request #4390 from ctrlaltdavid/20287 
CR for 20287 - Don't show the application menu bar when in full screen
 2015-03-10 16:36:11 -07:00
Seth Alves
48244840d5 merge from upstream 2015-03-10 15:43:40 -07:00
Seth Alves
cf20596d6d Merge pull request #4406 from ZappoMan/svoFromURL 
Support for importing from a network URL
 2015-03-10 15:41:41 -07:00
Stephen Birarda
6afdb26042 let QMainWindow delete GLCanvas, just stop the QTimer instead 2015-03-10 13:19:32 -07:00
Ryan Huffman
36c14de250 Add rotation to facingAvatar billboard overlays 2015-03-10 13:11:39 -07:00
ZappoMan
feddea821a cleanup import from file vs url 2015-03-10 12:35:12 -07:00
ZappoMan
5facb39aa7 support for import entities from network URL 2015-03-10 12:21:37 -07:00
Stephen Birarda
a8046b8316 fix a typo in comment, NULL glWidget pointer 2015-03-10 11:47:35 -07:00
Stephen Birarda
292354e180 manually call delete on GLCanvas in Application dtor 2015-03-10 11:33:49 -07:00
David Rowe
abb62fd8f9 Fix typo found in passing 2015-03-10 10:57:48 -07:00
Seth Alves
afd2c87dfe Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json 2015-03-10 10:12:43 -07:00
Sam Gateau
c1a0d767c9 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-03-10 09:37:40 -07:00
Sam Gateau
853cf75f60 adding the atmosphere in the directional lighting pass, debug 2015-03-10 09:37:13 -07:00
David Rowe
2df3eed31e Merge branch 'master' into 20287 
Conflicts:
	interface/src/Application.h
 2015-03-10 09:31:15 -07:00
ZappoMan
89f3a091f1 remove debugging 2015-03-10 09:02:35 -07:00
Andrew Meadows
a758ccd75a Merge pull request #4402 from birarda/master 
add underlying controls for user discoverability
 2015-03-10 08:30:46 -07:00
Atlante45
8bb974f01b Move ModelPropertiesDialog to own file 2015-03-10 14:50:38 +01:00
Atlante45
f1460e5c5b Fixed missing forward declaration 2015-03-10 11:50:49 +01:00
Atlante45
d0d9d4bbac Introduced ModelPackager 2015-03-10 11:50:13 +01:00
Atlante45
f55e9b6c1c ModelSelector implementation 2015-03-10 11:49:07 +01:00
Atlante45
60867cc931 Added ModelSelector class 2015-03-10 11:48:31 +01:00
Seth Alves
d0bbac2eb6 json writer sort of works. started on reader 2015-03-09 17:55:58 -07:00
Stephen Birarda
de38221cf6 default to All discoverability until UI is present 2015-03-09 17:28:44 -07:00
Stephen Birarda
c6afa131d9 store discoverability mode as an int 2015-03-09 17:26:56 -07:00
Stephen Birarda
cd382eeea5 expose discoverability changes to js 2015-03-09 17:20:09 -07:00
Stephen Birarda
6d900d5a40 handle discoverability change in DiscoverabilityManager 2015-03-09 17:05:57 -07:00