Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-17 21:00:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
23778 commits 25 branches 0 tags 1.1 GiB
Commit graph

3132 commits

Author SHA1 Message Date
Ryan Huffman
61dc31ffe7 Update export entities to export as JSON 2015-03-23 14:09:45 -07:00
David Rowe
cb6abfb2e6 Display notification if domain connection refused 2015-03-23 12:05:56 -07:00
Bradley Austin Davis
1d56266044 Merge branch 'master' into oculus_old_renderer 2015-03-20 09:56:54 -07:00
ZappoMan
5f825211df Merge branch 'master' of https://github.com/highfidelity/hifi into dragDropLinkAvatars 2015-03-19 15:12:06 -07:00
ZappoMan
24132968fe oops 2015-03-19 12:41:44 -07:00
ZappoMan
26670f9e41 remove unneeded debug 2015-03-19 12:15:12 -07:00
ZappoMan
c5314aceac more DRYing up of code 2015-03-19 11:57:57 -07:00
ZappoMan
5814a14152 removed dead code 2015-03-19 11:42:00 -07:00
ZappoMan
3c41ecd091 cleanup accepted files implementation 2015-03-19 11:29:41 -07:00
Brad Davis
31c7c93aa3 Merge branch 'master' into oculus_old_renderer 2015-03-19 10:05:22 -07:00
ZappoMan
8e0141b8e9 first cut at fst drag/drop support 2015-03-19 08:48:13 -07:00
samcake
c0a66a05f4 Merge pull request #4463 from ZappoMan/LODTweaks 
MVP Task - tweaks to automatic-LOD adjustments & Display warning when LOD is decreased
 2015-03-18 16:55:39 -07:00
Brad Davis
872012856f Merge branch 'master' into oculus_old_renderer 2015-03-18 15:35:49 -07:00
Brad Davis
0c465ce2b5 Merge pull request #4460 from ZappoMan/runJSFiles 
MVP task - Allow a script to be added to a users "running script" from the marketplace
 2015-03-18 12:52:44 -07:00
ZappoMan
8239a295cb Merge branch 'master' of https://github.com/highfidelity/hifi into LODTweaks 2015-03-18 11:54:05 -07:00
ZappoMan
a2e012f7a9 Merge branch 'master' of https://github.com/highfidelity/hifi into runJSFiles 2015-03-18 11:53:19 -07:00
Brad Davis
07ee350c09 Removing reported logspam from release builds 2015-03-18 10:24:53 -07:00
Brad Hefta-Gaub
a5294ae3fa Merge pull request #4436 from sethalves/persist-entities-as-json 
Optionally persist entities as json
 2015-03-17 21:53:17 -07:00
Brad Davis
d066271e4e Merging from master 2015-03-17 18:28:58 -07:00
Brad Hefta-Gaub
55d9560c9e Merge pull request #4469 from jherico/frustumFetchCheck 
Fix broken aspect ratio in mirror
 2015-03-17 17:06:21 -07:00
Brad Davis
1662230289 Adding some fixmes to the code, since globals are evil and such checks should be confined to debug mode only 2015-03-17 16:44:29 -07:00
Brad Davis
e616308911 Adding runtime check to ensure that the correct frustum is fetched during rendering 2015-03-17 16:28:44 -07:00
Brad Davis
c88f6f8f07 Adding some documentation on the change 2015-03-17 13:49:06 -07:00
ZappoMan
1e03335012 implement scripting interface for LODManager 2015-03-17 13:18:29 -07:00
Brad Davis
71e59cfa88 Fix: Mini-mirror doesn't render avatar head when in first person mode 2015-03-17 13:15:15 -07:00
ZappoMan
749bc1ee9b support for loading of JS files by drag, web page urls, and openfile events 2015-03-17 08:38:39 -07:00
Atlante45
1f8a874ce6 Hide cursor in 3D TV mode too 2015-03-17 12:34:13 +01:00
Brad Davis
5aa4277d9b Removing a superfluous clear from Application.cpp. It's only required in client distortion mode 2015-03-16 12:22:35 -07:00
Atlante45
c5010c4d55 Hide cursor at MainWindow level when in VRMode 2015-03-16 14:19:24 +01:00
Seth Alves
6c4b808813 Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json 2015-03-15 07:10:56 -07:00
Stephen Birarda
641581a825 Merge pull request #4446 from huffman/marketplace-window 
Marketplace window
 2015-03-13 17:51:44 -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
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
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
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
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
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
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
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
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
Stephen Birarda
d7e99594ae make the application the parent of the node thread 2015-03-11 18:04:32 -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
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
Atlante45
9b80c01357 Remove ModelUploader from the menu 2015-03-11 16:21:36 +01: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
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
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
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
Andrew Meadows
a758ccd75a Merge pull request #4402 from birarda/master 
add underlying controls for user discoverability
 2015-03-10 08:30:46 -07:00
Stephen Birarda
6d900d5a40 handle discoverability change in DiscoverabilityManager 2015-03-09 17:05:57 -07:00
Stephen Birarda
0658b54263 move location update to DiscoverabilityManager 2015-03-09 16:48:39 -07:00
Seth Alves
99300a5bc8 merge from master 2015-03-09 13:39:51 -07:00
Leonardo Murillo
9ccd0a5afa Fixing updater 2015-03-09 14:12:47 -06:00
Andrew Meadows
51d05cc43e merge upstream/master into andrew/isentropic 
Conflicts:
	libraries/networking/src/PacketHeaders.cpp
 2015-03-09 08:51:49 -07:00
Seth Alves
3604fd639a formatting 2015-03-08 20:03:10 -07:00
Seth Alves
08c3fa6363 merge from upstream 2015-03-08 17:29:05 -07:00
Brad Hefta-Gaub
e2a367607a Merge pull request #4384 from ctrlaltdavid/20369 
CR for Job #20369 - Uploaded avatars without skeletons crash Interface
 2015-03-08 11:42:07 -07:00
Brad Hefta-Gaub
21cd7e36e0 Merge pull request #4381 from Atlante45/disk_cache 
Disk cache tweaks
 2015-03-08 11:40:40 -07:00
Seth Alves
9ec72e4902 quiet warning on linux 2015-03-07 20:25:46 -08:00
Andrew Meadows
ba6e66f169 merge upstream/master into andrew/isentropic 2015-03-07 18:03:49 -08:00
Seth Alves
6e79fc8b68 Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide 2015-03-06 18:46:13 -08:00
Brad Hefta-Gaub
c9dd96c98d Merge pull request #4389 from birarda/master 
render application overlay only if enabled
 2015-03-06 17:06:05 -08:00
Andrew Meadows
373be95297 entity cubes are in meters 2015-03-06 15:32:03 -08:00
Stephen Birarda
a4963f1895 render application overlay only if enabled 2015-03-06 15:22:25 -08:00
David Rowe
032896f75c Fix starting up fullscreen 2015-03-06 14:57:27 -08:00
David Rowe
22d9ff2788 Show/hide menu bar in non-VR fullscreen 2015-03-06 14:36:08 -08:00
Ryan Huffman
6848025504 Add exporting by entity ID to Application 2015-03-05 13:36:16 -08:00
Ryan Huffman
71768ef275 Return entity IDs on paste 2015-03-05 12:36:45 -08:00
Atlante45
f4d8ee39dc Menu item for cache editor 2015-03-05 21:10:02 +01:00
Atlante45
9d7144dab0 Bumped disk cache size to 10GB 2015-03-05 18:52:48 +01:00
Andrew Meadows
49eee89c19 merge upstream/master into andrew/isentropic 
Conflicts:
	libraries/networking/src/PacketHeaders.cpp
	libraries/networking/src/PacketHeaders.h
 2015-03-05 08:22:02 -08:00
Andrew Meadows
ca1c9b4105 EntityItem::findEntities() uses meters 2015-03-04 16:05:29 -08:00
David Rowe
aad3f1dfd9 Automatically switch to default model if avatar model is skeletonless 2015-03-03 22:34:07 -08:00
Seth Alves
a254f017cc Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide 2015-03-03 18:37:40 -08:00
Seth Alves
8eec66c066 merge upstream, avatar can now fall onto a cube 2015-03-03 18:37:16 -08:00