Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-16 14:00:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
26057 commits 70 branches 59 tags 1.2 GiB
Commit graph

3429 commits

Author SHA1 Message Date
Bradley Austin Davis
d2a8681139 Merge branch 'master' into infoview 2015-05-05 10:31:19 -07:00
Andrew Meadows
aa5a59c3dc merge upstream/master into andrew/nova 
Conflicts:
	libraries/entities/src/EntityItem.cpp
	libraries/physics/src/PhysicsEngine.cpp
 2015-05-05 10:24:17 -07:00
Philip Rosedale
d52d3513a4 Merge pull request #4768 from jherico/track-camera 
Remove camera wobble caused by having a face tracker enabled
 2015-05-04 18:01:47 -07:00
ZappoMan
77232e35f8 Merge branch 'master' of https://github.com/highfidelity/hifi into atmosphereInZones 2015-05-04 17:16:33 -07:00
Bradley Austin Davis
dc1b5a262f Remove camera wobble cause by the face tracker and by idle animations 2015-05-04 17:03:33 -07:00
ZappoMan
32ef0c2010 removed some dead code 2015-05-04 15:49:21 -07:00
ZappoMan
741323e6c1 wire up atmosphere.hasStars property 2015-05-04 14:19:13 -07:00
ZappoMan
4561c59203 wire up zone to environment atmosphere rendering 2015-05-04 13:49:43 -07:00
Bradley Austin Davis
098a9bd70e Fixing sixense and restoring lookat 2015-05-04 13:10:16 -07:00
Sam Gateau
936eefd4f0 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-05-04 10:41:32 -07:00
Sam Gateau
c7153bcc14 fixing commetns from review 2015-05-04 10:40:11 -07:00
Bradley Austin Davis
fb3e309a64 Merge branch 'master' into plugins_pt1 2015-05-04 10:00:13 -07:00
Sam Gateau
b7bacccce7 Fine tunning on windows 2015-05-04 00:54:54 -07:00
samcake
8e65ce34d1 FINe tune the scales for the Mac Book 2015-05-03 23:47:43 -07:00
samcake
d2e61dba05 Make the nw mapper work for th einputs 2015-05-03 17:34:39 -07:00
Sam Gateau
c9b296693c bringing the UserInputMapper to the application 2015-05-03 15:45:19 -07:00
Seth Alves
0341caad95 quiet compiler 2015-05-03 11:10:52 -07:00
Andrew Meadows
fef84730bf remake foundation for CollisionEvents 2015-05-03 09:27:15 -07:00
Brad Davis
e72756ab99 Merge remote-tracking branch 'upstream/master' into plugins_pt1 
Conflicts:
	libraries/render-utils/src/TextureCache.cpp
 2015-05-02 00:51:50 -07:00
Brad Davis
302aa9db47 Removing access to the gl widget and display managers 2015-05-02 00:49:52 -07:00
Philip Rosedale
d7cc76e48b Merge pull request #4735 from jherico/menu_fix 
Prevent the menu from coming up when alt is applied as a modifier to touch or mouse events
 2015-05-02 00:35:49 -07:00
Andrew Meadows
0a102575ee fix simulation ownership infection 2015-05-01 16:56:00 -07:00
Andrew Meadows
3031d55c8e merge upstream/master into andrew/nova 2015-05-01 11:03:51 -07:00
Andrew Meadows
b023fe582a make things compile 2015-05-01 10:44:50 -07:00
Andrew Meadows
4cb469dd79 cleanup how MotionStates are deleted from physics 
also fixed some compile errors
removed cruft
 2015-05-01 08:28:32 -07:00
David Rowe
528f73897c Make double click face tracking toggle button reset tracking 2015-04-30 23:14:23 -07:00
David Rowe
bc05159504 Add face tracking toggle button beside microphone toggle button 2015-04-30 23:14:22 -07:00
David Rowe
d053379831 Add "Mute Face Tracking" menu item 2015-04-30 23:14:21 -07:00
Brad Davis
57b7be3abe Prevent the menu from coming up when alt is applied as a modifier to touch or mouse events 2015-04-30 17:43:16 -07:00
Brad Hefta-Gaub
40d2e97d44 Merge pull request #4673 from ctrlaltdavid/20496 
CR for 20496 - Modify lobby.js to work as avatar selector
 2015-04-29 21:51:08 -07:00
Andrew Meadows
31ab16ac62 move stuff into ObjectMotionState 2015-04-29 16:16:44 -07:00
Andrew Meadows
ab38572620 new PhysicsEngine API is mostly in place 
doesn't compile, of course
large code movements are done
non-physical kinematics have been lost --
will readd in PhysicalEntitySimuation class
 2015-04-29 09:48:02 -07:00
Bradley Austin Davis
c4349e797f Merge remote-tracking branch 'upstream/master' into infoview 2015-04-29 00:15:32 -07:00
Brad Davis
0fb8884f9c Merge branch 'browser' into infoview 
Conflicts:
	tests/ui/src/main.cpp
 2015-04-28 17:54:04 -07:00
Stephen Birarda
404cd67bb7 Merge pull request #4716 from sethalves/assignment-client-exits 
assignment-client shouldn't try to save contents of its nonexistent address bar
 2015-04-28 19:40:44 -04:00
Andrew Meadows
14b6ee608a more PhysicalEntitySimulation implementation 
with changes to API's accordingly (does not compile yet)
 2015-04-28 15:07:37 -07:00
Seth Alves
28ad80936a assignment-client shouldn't try to save contents of its nonexistent address bar. interface still needs to save the address. 2015-04-28 13:21:14 -07:00
Andrew Meadows
087d0a027d merge upstream/master into andrew/nova 2015-04-28 10:07:49 -07:00
Andrew Meadows
34974272af proposal for PhysicsEngine API in Application 2015-04-28 10:06:05 -07:00
Brad Davis
f467abcf91 Merge branch 'vr_menus' into browser 2015-04-28 01:18:03 -07:00
Brad Davis
9836ffed97 Merge branch 'vr_menus' into infoview 
Conflicts:
	tests/ui/src/main.cpp
 2015-04-28 01:17:51 -07:00
Brad Davis
b4e9dbedbc Merge remote-tracking branch 'upstream/master' into vr_menus 2015-04-28 00:28:57 -07:00
Brad Davis
f86b9f62b9 Adding key to trigger a browser window 2015-04-27 23:16:35 -07:00
Brad Davis
b0eccc40c2 Fix crash cause when Menu::instance() is before offscreen ui startup 2015-04-27 22:58:09 -07:00
Brad Davis
7bd8bbf565 Merge branch 'vr_menus' into infoview 2015-04-27 18:33:45 -07:00
Brad Davis
59b8b80148 Merge remote-tracking branch 'upstream/master' into vr_menus 
Conflicts:
	interface/src/Menu.cpp
 2015-04-27 16:02:13 -07:00
Andrew Meadows
72deb2e49b merge upstream/master into andrew/thermonuclear 
Conflicts:
	libraries/entities/src/EntityItem.h
	libraries/physics/src/EntityMotionState.cpp
 2015-04-27 12:54:21 -07:00
Seth Alves
bdc6bb3c2d Merge branch 'master' of github.com:highfidelity/hifi into detect-ballistic 2015-04-27 12:20:58 -07:00
Brad Davis
14b660baf7 Merge branch 'vr_menus' into infoview 
Conflicts:
	tests/ui/src/main.cpp
 2015-04-27 11:43:49 -07:00
Brad Davis
d55d467d3f Tweaking VR menu for PR 2015-04-27 11:35:57 -07:00
Seth Alves
b23427a3c8 hook up menu-items to control debug rendering of collision hulls and owned simulations 2015-04-27 10:32:47 -07:00
Seth Alves
e007617112 hook up menu-items to control debug rendering of collision hulls and owned simulations 2015-04-27 09:56:24 -07:00
Brad Davis
b216689b45 Removing old infoview, testing new dialogs 2015-04-27 00:02:11 -07:00
Brad Davis
198224c4ec Merge branch 'ui-refactor' into menu2 2015-04-25 16:48:05 -07:00
Brad Davis
7c16fd05c1 Merge branch 'master' into ui-refactor 2015-04-25 16:35:43 -07:00
Brad Davis
a96f69a673 Switching to a wrapper mechanism for VR menus 2015-04-25 16:20:15 -07:00
Brad Davis
ee30588fd4 More menu work 2015-04-25 10:41:06 -07:00
Atlante45
ba507cef98 Fix a few warnings 2015-04-25 11:01:02 +02:00
Brad Davis
fbdb9b143e Merge branch 'ui-refactor' into m_and_m 
Conflicts:
	interface/resources/qml/HifiMenu.qml
	interface/resources/qml/MessageDialog.qml
	interface/resources/qml/Root.qml
	interface/resources/qml/TestRoot.qml
	interface/resources/qml/controls/Dialog.qml
	interface/src/Application.cpp
	interface/src/ui/LoginDialog.cpp
	libraries/ui/src/MessageDialog.cpp
	libraries/ui/src/MessageDialog.h
	libraries/ui/src/OffscreenQmlDialog.h
	libraries/ui/src/OffscreenUi.cpp
	libraries/ui/src/OffscreenUi.h
	tests/ui/src/main.cpp
 2015-04-24 18:02:12 -07:00
Brad Davis
dab8761c71 Merge remote-tracking branch 'upstream/master' into ui-refactor 2015-04-24 16:46:48 -07:00
Brad Davis
08d60c6a01 Fixing message dialog 2015-04-24 16:19:39 -07:00
Brad Hefta-Gaub
dbb1e3c820 Merge pull request #4682 from jherico/offscreen 
Attempting to fix backspace issue in new UI
 2015-04-24 16:10:42 -07:00
Andrew Meadows
7cd9023e23 build Avatar shape on SkeletonModel load 2015-04-24 13:26:26 -07:00
Brad Davis
99a6e1f86c Breaking up offscreen UI work 2015-04-24 13:21:21 -07:00
Brad Davis
1ff8c67576 More work on menus and some code cleanup 2015-04-24 12:54:11 -07:00
Atlante45
fb5a0c8b01 Only send touchUpdateEvent if it is one 
ie. not for touchBeginEvent
 2015-04-24 18:50:45 +02:00
Brad Davis
f17387fab4 Working on menus 2015-04-23 21:23:21 -07:00
Brad Davis
8cb298a55b Working on menus 2015-04-23 14:23:15 -07:00
Brad Davis
8269b9925b Adding first pass at message box 2015-04-23 14:23:12 -07:00
Brad Davis
a9d65f168b Working on marketplace dialog 2015-04-23 14:23:11 -07:00
Brad Davis
ae804357d8 Attempting to fix backspace issue in new UI 2015-04-23 14:10:54 -07:00
Brad Hefta-Gaub
82d3302d1b Merge pull request #4644 from jherico/offscreen 
Working on new-UI implementations of address bar and login
 2015-04-23 07:17:45 -07:00
Brad Davis
8d8c4babba Coding standard fixes 2015-04-22 19:06:22 -07:00
David Rowe
35e2b87a70 Rename DDE menu items 2015-04-22 13:15:57 -07:00
David Rowe
649d4736cd Merge branch 'master' into dde-miscellaneous 2015-04-22 13:00:40 -07:00
David Rowe
63d0efcdec Open and close avatar selector with Ctrl-A 2015-04-22 09:48:09 -07:00
Brad Davis
7a33474245 Merge remote-tracking branch 'upstream/master' into offscreen 
Conflicts:
	interface/src/Menu.cpp
 2015-04-21 13:02:38 -07:00
Seth Alves
284215d46a Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol 2015-04-21 09:53:15 -07:00
Seth Alves
64c23b8e8b Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol 2015-04-20 16:56:24 -07:00
David Rowe
1af17fa9e7 Use voice to control DDE mouth 
Add voice blend coefficient values to DDE values.
 2015-04-20 16:14:36 -07:00
Clément Brisset
b64d7fc17c Merge pull request #4662 from birarda/remove-visage 
remove visage support
 2015-04-20 20:06:21 +02:00
David Rowe
8268dc95ac Include DDE reset in sensors reset 2015-04-20 10:28:17 -07:00
Seth Alves
f452e47577 Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol 2015-04-20 08:49:33 -07:00
Brad Davis
16efa2a46f Improving toggle visibility and loading behavior 2015-04-17 16:59:04 -07:00
Stephen Birarda
3055359d4c remove visage references from Application 2015-04-17 13:40:18 -07:00
Sam Gateau
11879f6142 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-04-17 13:04:00 -07:00
Philip Rosedale
3814fbc0c2 Merge pull request #4658 from ctrlaltdavid/dde-filtering 
DO NOT MERGE - DDE filtering
 2015-04-17 15:41:03 -04:00
Seth Alves
292ba20cf3 pull andrew's measure-acceleration branch 2015-04-17 11:35:12 -07:00
Sam Gateau
f1e0d5855e Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-04-17 11:33:39 -07:00
David Rowe
6b085ca668 Move method out of Menu class 2015-04-17 10:53:04 -07:00
Clément Brisset
516acee1c7 Merge pull request #4647 from huffman/fix-multiple-scripts-on-restart 
Fix stop/reload all scripts affecting already-stopped scripts
 2015-04-17 16:29:23 +02:00
Bradley Austin Davis
759acfa175 Working on getting the offscreen UI working on retina 2015-04-16 19:30:31 -07:00
Sam Gateau
b5b146b81b Training Team: improving the sun lighting interface to javascript to enable / disable the earthSkyModel, assign explicitely the SUnDirection and getter, and expose a AmbientINtensity to control the amount of the ambient lighting contribution 
Expose these to javascript
 2015-04-16 17:35:37 -07:00
Brad Davis
ce6b7e7aec Merge branch 'master' into offscreen 
Conflicts:
	interface/src/Menu.cpp
 2015-04-16 14:02:40 -07:00
Andrew Meadows
1acb90e23a merge upstream/master into andrew/isothermal 2015-04-16 13:48:47 -07:00
Bradley Austin Davis
f700607a65 Working on OSX functionality 2015-04-15 23:08:55 -07:00
Sam Gateau
cd1bbb2855 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-04-15 10:16:28 -07:00
Clément Brisset
d6ee1c708d Merge pull request #4642 from ZappoMan/avatarUI 
New Avatar UI
 2015-04-15 19:13:23 +02:00
Brad Davis
1563b05278 Merge branch 'master' into offscreen 2015-04-15 10:01:15 -07:00
Ryan Huffman
f8e4ff8072 Update Application:stopAllScripts to skip finished scripts 2015-04-15 09:54:30 -07:00
Sam Gateau
5ebbdaca05 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-04-15 09:00:50 -07:00
Brad Davis
d14d5f3d29 Working on new-UI implementations of address bar and login 2015-04-15 00:36:04 -07:00
Sam Gateau
fec52f6b10 Removing almost all the QFramebufferObject (instead in overlay layer) in favor of gpu::Framebuffer, eveyrthing seems to work properly 2015-04-14 18:27:24 -07:00
ZappoMan
ae16bab7c2 Merge branch 'master' of https://github.com/highfidelity/hifi into avatarUI 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
 2015-04-14 13:13:15 -07:00
Andrew Meadows
abb40ca080 cleanup: split stats dump out of stepSimulation 2015-04-14 09:00:36 -07:00
Sam Gateau
c34c5f6075 adding the Fremabuffer to be used for shadows and main rendering 2015-04-14 08:47:52 -07:00
David Rowe
3b6a35c38f Merge branch 'master' into 20447 2015-04-13 17:22:34 -07:00
Thijs Wenker
cf403a7ad8 Merge branch 'master' of https://github.com/worklist/hifi into 20367 2015-04-09 23:47:20 +02:00
Thijs Wenker
0cb5ee5bd1 - Scripts JS object renamed to ScriptDiscoveryService. 
- Renamed Example script file for the ScriptDiscoveryService.
- Moved ScriptDiscoveryService functions to the RunningScriptWidget
 2015-04-09 23:46:49 +02:00
Brad Davis
9b34003e2d Merge pull request #4599 from Atlante45/fix_quit_vrmode_on_close 
Quit VRMode before aboutToQuit runs
 2015-04-07 17:06:29 -07:00
Brad Davis
c1a1157df9 Merge branch 'master' into menu 2015-04-07 14:41:17 -07:00
Andrew Meadows
a47170b02c Merge pull request #4601 from samcake/temp1 
Introducing gpu::State and using it in the Model rendering path and more...
 2015-04-07 12:48:42 -07:00
Seth Alves
9014397167 try again without macro 2015-04-07 09:59:04 -07:00
Seth Alves
fc5b442e12 interface is reserved, so use interfaceapp as the logging tag for interface. also experiment with a macro for logging 2015-04-07 09:15:11 -07:00
Thijs Wenker
a783f03025 New scripting functions Scripts.getPublic(), Scripts.getLocal() and Scripts.getRunning() functional. 2015-04-07 16:48:11 +02:00
Seth Alves
fb607e2b26 logging groups for library/shared and interface 2015-04-06 18:45:06 -07:00
Thijs Wenker
484b014fa7 Merge branch 'master' of https://github.com/worklist/hifi into 20367 2015-04-07 01:07:04 +02:00
Thijs Wenker
2b23108e61 ScriptsScripting Interface 2015-04-07 01:06:39 +02:00
David Rowe
ce104e8c40 Merge branch 'master' into 20447 2015-04-06 15:18:19 -07:00
Sam Gateau
ecdffadcb7 trying to debug the indirect sh lighting going wrong, the noraml on avatar is not correct 2015-04-06 10:17:31 -07:00
Sam Gateau
d6f74aa0ad Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-04-06 09:56:16 -07:00
Atlante45
a3f8076641 Quit VRMode before aboutToQuit runs 2015-04-06 17:55:48 +02:00
Sam Gateau
10269bd556 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-04-05 18:37:28 -07:00
Sam Gateau
00817ab64f MErging with origin/orange, brinign the fix for shadows 2015-04-05 18:36:39 -07:00
David Rowe
765d66eee5 Fix running without DDE available 2015-04-04 19:20:44 -07:00
David Rowe
1eb5716ab7 Shut down DDE when Interface shuts down 2015-04-04 19:04:47 -07:00
Seth Alves
e06dada756 Merge pull request #4592 from AndrewMeadows/thermonuclear 
profiling for physics simulation
 2015-04-04 15:00:44 -07:00
David Rowe
f6bf1d4141 Disable DDE code if not Windows or OSX 2015-04-03 17:41:19 -07:00
ZappoMan
0bc1b02895 improvements to tracking model names 2015-04-03 17:24:53 -07:00
ZappoMan
50479d5d5e set name to Default when using default url 2015-04-03 17:06:54 -07:00
ZappoMan
1a463a0256 more work on improved avatar UI adding model names and backward compatible support 2015-04-03 17:03:22 -07:00
ZappoMan
aaf191b6dc first cut at new avatar preferences UI 2015-04-03 14:31:43 -07:00
Sam Gateau
423434af10 FInd one of the issue with shadows for avatars 2015-04-03 12:34:30 -07:00
Sam Gateau
7718680091 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-04-03 10:33:24 -07:00
Bradley Austin Davis
44c9d4a742 Working on removing some of the warnings in the xcode build 2015-04-02 16:12:44 -07:00
Andrew Meadows
2089a8c2dd temporary debug setup: dump physics stats on F key 2015-04-02 15:33:06 -07:00
Andrew Meadows
eaef08abd5 add break to Key_Comma switch case 2015-04-02 15:25:55 -07:00
Sam Gateau
f96079f4f9 fixed the getViewFUrstum warning in DEBUG mode 2015-04-02 14:43:15 -07:00
Brad Davis
605cf19f6f Merge pull request #4565 from ctrlaltdavid/20422 
CR for #20422 - Add the ability to manage friends via Interface
 2015-04-02 14:10:40 -07:00
Andrew Meadows
a824403132 Merge pull request #4582 from sethalves/island 
Comma toggles rendering of collision hulls; more changes to vhacd stuff
 2015-04-02 10:37:17 -07:00
Bradley Austin Davis
8a757a4b6e Further work on menu handling on OSX in fullscreen / VR mode 2015-04-02 10:27:11 -07:00
Seth Alves
41ec2fdbe3 Merge branch 'master' of github.com:highfidelity/hifi into island 2015-04-02 09:19:54 -07:00
Andrew Meadows
fc4e6e9355 merge upstream/master into andrew/bispinor 2015-04-02 09:04:15 -07:00
Clément Brisset
01dc1b058c Merge pull request #4580 from birarda/master 
use non-persistent settings to avoid lobby crash confusion
 2015-04-02 17:37:24 +02:00
David Rowe
49de54de48 Use improved WebWindowClass for friends window 2015-04-01 18:58:59 -07:00
Seth Alves
abf83bcf9e Merge branch 'master' of github.com:highfidelity/hifi into island 2015-04-01 18:26:26 -07:00
Seth Alves
79b1a6aeb0 comma key toggles rendering of collision hulls 2015-04-01 17:45:47 -07:00
Stephen Birarda
b27a86fb25 always render yourself, handle change of render values elsewhere 2015-04-01 17:36:43 -07:00
Andrew Meadows
b537625e59 Merge pull request #4574 from ZappoMan/crashOnExit 
fix crash on shutdown related to entity scripts connecting to signals
 2015-04-01 17:26:33 -07:00
Brad Hefta-Gaub
ad27d7353b Merge pull request #4386 from jherico/oculus_old_renderer 
DO NOT MERGE - Update Oculus SDK integration
 2015-04-01 17:17:32 -07:00
Stephen Birarda
ee088e12f3 leverage scene scripting values to toggle rendering 2015-04-01 17:06:06 -07:00
Sam Gateau
4a6046b07c tweak the default specular value for the Primitive entities (sphere and cubes) so they do not shine so much 2015-04-01 15:50:04 -07:00
Andrew Meadows
b37384d759 exit hover now not quite automatic when over floor 
remove MyAvatar::jump() method for more general API
 2015-04-01 15:13:27 -07:00
David Rowe
96e888864a Merge branch 'master' into 20422 2015-04-01 14:56:48 -07:00
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