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

3175 commits

Author SHA1 Message Date
Bradley Austin Davis
3b77118baa Merge branch 'master' into oculus_old_renderer 2015-04-01 14:09:29 -07:00
Andrew Meadows
245729cba8 fix for avatar unable to jump into hover on mac 2015-04-01 13:47:40 -07:00
ZappoMan
aac824fb99 fix crash on shutdown 2015-04-01 13:47:25 -07:00
Sam Gateau
3b92910a91 Adding the cookies sciprt that provide a simple ui useful for debug and exemple, complete the interface on the scene script interface to provide the getters 2015-04-01 12:22:35 -07:00
David Rowe
e519928320 Move friends window to own class 2015-04-01 11:38:32 -07:00
ZappoMan
827e37b920 Merge branch 'master' of https://github.com/highfidelity/hifi into avatarUI 2015-04-01 09:09:50 -07:00
Sam Gateau
ad11503466 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-03-31 23:12:17 -07:00
David Rowe
e06f28b7c5 Merge branch 'master' into 20422 
Conflicts:
	examples/users.js
	interface/src/Application.cpp
 2015-03-31 21:01:54 -07:00
Bradley Austin Davis
db9ab3e699 Merge branch 'master' into oculus_old_renderer 2015-03-31 18:25:34 -07:00
Sam Gateau
0d721ec1e9 merging 2015-03-31 17:47:05 -07:00
Sam Gateau
9b63739a72 Trying to clen up the REnderMode usage in connection with the needed gpu::State for all the different variations 2015-03-31 17:35:34 -07:00
Stephen Birarda
61806935bb add a networking constants class with metaverse URL 2015-03-31 16:40:21 -07:00
ZappoMan
d68143675a first simple pass at using marketplace windows in preferences 2015-03-31 16:24:27 -07:00
Brad Hefta-Gaub
b6f670a8d8 Merge pull request #4554 from samcake/yellow 
Better support for Nvidia Optimus Laptop
 2015-03-31 15:56:01 -07:00
Bradley Austin Davis
a7eebfd002 Merge remote-tracking branch 'upstream/master' into oculus_old_renderer 2015-03-31 15:42:01 -07:00
Sam Gateau
b4d11e2eb5 Add the needed global variable exported to enable the nvidia gpu on optimus platform (laptops with intel integrated) also log the opengl version and gpu and driver used 2015-03-31 15:18:59 -07:00
David Rowe
154dacf791 Fix typo 2015-03-31 14:21:56 -07:00
Bradley Austin Davis
56b5ad2e6b Merge branch 'master' into oculus_old_renderer 2015-03-31 11:10:23 -07:00
Philip Rosedale
5325478940 Merge pull request #4528 from ZappoMan/avatarUI 
Support for Auto-detecting FST type, and adding type hint to FST files when packaged
 2015-03-30 21:31:22 -07:00
Philip Rosedale
ce05d3104a Merge pull request #4535 from ZappoMan/scriptCaching 
Script caching & Fix to Stack Overflow Crash on Windows with lots of entity scripts
 2015-03-30 18:02:52 -07:00
ZappoMan
3475bfb396 fix typos 2015-03-30 17:04:47 -07:00
Bradley Austin Davis
5e5bdec88d Merge branch 'master' into oculus_old_renderer 2015-03-30 16:36:00 -07:00
Andrew Meadows
9b13f186e3 remove character from PhysicsEngine on shutdown 2015-03-30 15:51:58 -07:00
ZappoMan
36657c9473 first cut at script caching 2015-03-30 14:36:48 -07:00
Seth Alves
186cb1ec7a merge from upstream 2015-03-30 11:28:47 -07:00
Philip Rosedale
099a2b5319 Merge pull request #4521 from ctrlaltdavid/20416 
CR for Job #20416 - Update notification.js to include a notification about being blocked from a server
 2015-03-30 08:49:29 -07:00
ZappoMan
3bda65f4fe if installing a body, and you have no head, make your head the default head 2015-03-28 19:19:11 -07:00
ZappoMan
80df8caefb Merge branch 'master' of https://github.com/highfidelity/hifi into avatarUI 2015-03-28 18:43:03 -07:00
David Rowe
be69c0b58f Add add/remove friends menu item 
This must display the dialog whether or not users.js is running. Both
C++ and JavaScript need to open or restore the same dialog, hence a new
dialog rather than using WebWindow with its JavaScript baggage.
 2015-03-28 13:05:23 -07:00
ZappoMan
002fba8018 first cut at predicting FST type for set avatar 2015-03-27 16:56:03 -07:00
Seth Alves
fd69a54f10 Merge branch 'master' of github.com:highfidelity/hifi into multi-hull-collisions 2015-03-27 15:55:20 -07:00
Andrew Meadows
be5fdbf217 enable avatar collisions by default 
also remove old gravity features
 2015-03-27 13:36:20 -07:00
David Rowe
90c1da2094 Merge branch 'master' into 20416 
Conflicts:
	examples/notifications.js
 2015-03-27 12:13:29 -07:00
Seth Alves
7da87d6e15 set up a way to request ResourceCache downloads from a non-networking thread. 2015-03-26 18:37:55 -07:00
ZappoMan
6cff99f9d6 menu and display tweaks 2015-03-26 16:36:46 -07:00
Brad Hefta-Gaub
918154e407 Merge pull request #4491 from huffman/export-json 
Update export entities to export as JSON
 2015-03-25 16:49:23 -07:00
Andrew Meadows
b87360f0f5 merge upstream/master into andrew/inertia 2015-03-24 17:41:07 -07:00
Andrew Meadows
44eca08fa4 PhysicsEngine doesn't need AvatarData 
MyAvatar now owns its CharacterController
fix for bug of phantom collision obj when avatar's physics are disabled
 2015-03-24 17:38:35 -07:00
Philip Rosedale
fe61387121 Merge pull request #4498 from ZappoMan/LODUITweaks 
Some LOD UI Tweaks
 2015-03-24 17:34:27 -07:00
ZappoMan
619428c325 move LOD FPS settings to Preferences 2015-03-24 13:32:22 -07:00
Stephen Birarda
1a6865b41b send immediate location update when domain changes 2015-03-24 13:15:30 -07:00
Ryan Huffman
2fc0ef80d0 Add SVO_JSON_EXTENSION to accepted extensions 2015-03-24 10:40:46 -07:00
ZappoMan
fa122a227b tweaks to the LOD Tools UI 2015-03-23 16:44:07 -07:00
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