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
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
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
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
