Ryan Huffman
21819ce3b4
Merge branch '19630' of github.com:huffman/hifi into 19630
...
Conflicts:
interface/src/Menu.h
2014-05-15 14:37:05 -07:00
Ryan Huffman
7a3826b72a
Add Node border display
2014-05-15 14:35:01 -07:00
Andrzej Kapolka
498f9e73ac
Merge branch 'master' of https://github.com/highfidelity/hifi into priority
...
Conflicts:
interface/src/avatar/SkeletonModel.cpp
2014-05-14 10:23:44 -07:00
Ryan Huffman
146b9958cb
Fix style issue
2014-05-14 09:41:13 -07:00
Ryan Huffman
d59bedfa96
Fix running scripts not properly updated when done programmatically
...
Add a slot to Application to receive ScriptEngine::finished signals.
Notify the Running scripts widget of stopped scripts so it can properly
move them to the recent scripts list.
2014-05-13 22:25:08 -07:00
Andrzej Kapolka
eceb600de7
More work on PrioVR integration.
2014-05-13 14:44:24 -07:00
Andrzej Kapolka
f2ba2a48f2
Merge branch 'master' of https://github.com/highfidelity/hifi into priority
2014-05-13 11:38:51 -07:00
Kai Ludwig
90d577a48c
Stats area is now always right of mirror display, regardless if mirror display is enabled or not as there is always a remaining audio meter.
...
Display, resize and click cases have been adapted by removing the condition for checking display status of mirror.
2014-05-13 00:37:36 +02:00
Andrzej Kapolka
e0486b2654
Starting on PrioVR integration.
2014-05-12 15:25:25 -07:00
Stojce Slavkovski
ac8d27ee3a
Merge branch 'master' of https://github.com/worklist/hifi into 19507
2014-05-11 09:53:22 +02:00
Philip Rosedale
6a5affba3d
Merge pull request #2826 from ey6es/master
...
Fix for scripts' not correctly removing/reattaching on restart, don't render head attachments in first person mode.
2014-05-09 15:32:50 -07:00
Philip Rosedale
e1717b1c53
Fix bug with mirror settings not initialized
2014-05-09 15:02:47 -07:00
Andrzej Kapolka
b9fecb8b92
Wait for scripts to finish before restarting them.
2014-05-09 14:34:13 -07:00
Stojce Slavkovski
863a8887d3
Merge branch 'master' of https://github.com/worklist/hifi into 19507
2014-05-08 20:29:26 +02:00
Stojce Slavkovski
a1c31522ba
Merge branch 'master' of https://github.com/worklist/hifi into 19507
2014-05-08 20:09:36 +02:00
Philip Rosedale
2797d0ab3b
removed hand trying to follow mouse and other cruft
2014-05-08 00:09:07 -07:00
Philip Rosedale
538e785208
Merge pull request #2815 from ZappoMan/modelserver
...
More Model Improvements & some other tweaks
2014-05-07 20:59:04 -07:00
Philip Rosedale
e6a8c79f9f
Added more arrow controls to move camera when in mirror mode, new guitar chords.
2014-05-07 16:51:22 -07:00
ZappoMan
37ca6efc7c
correctly handle SHADOW_RENDER_MODE in a bunch of places that were drawing shadows when they shouldn't
2014-05-07 11:48:32 -07:00
Philip Rosedale
fc962749c0
Arrow keys adjust distance from camera in mirror mode, air guitar script
2014-05-06 22:41:08 -07:00
Stojce Slavkovski
490ec23d8c
Merge branch 'master' of https://github.com/worklist/hifi into 19507
2014-05-07 07:38:48 +02:00
Stojce Slavkovski
8ee282e7d2
Merge branch 'master' of https://github.com/worklist/hifi into 19507
2014-05-06 22:01:48 +02:00
Andrzej Kapolka
9421af9f10
Fix for attachments' not appearing in rear view mirror head mode.
2014-05-06 11:14:48 -07:00
Andrzej Kapolka
2a32700a30
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-05-05 17:03:31 -07:00
Stojce Slavkovski
7f96f81c24
Merge branch 'master' of https://github.com/worklist/hifi into 19507
2014-05-05 00:55:37 +02:00
Andrzej Kapolka
e0400dbd9c
Working on allowing attachment models to be uploaded.
2014-05-04 15:23:31 -07:00
Andrzej Kapolka
2bc605e193
Merge pull request #2779 from PhilipRosedale/master
...
Remove dead ‘play slaps’ code
2014-05-04 13:33:03 -07:00
Stojce Slavkovski
d93480458f
Posting Image to forum
2014-05-04 18:30:58 +02:00
Stojce Slavkovski
cec3ce78b9
Merge branch 'master' of https://github.com/worklist/hifi into 19507
2014-05-03 21:12:39 +02:00
Philip Rosedale
ab0e854336
Removed session UUID from interface title bar
2014-05-03 11:33:39 -07:00
Stojce Slavkovski
b2c1afe1bd
Merge branch 'master' of https://github.com/worklist/hifi into 19507
2014-05-03 09:52:19 +02:00
Andrzej Kapolka
93cb5fc330
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-05-02 17:21:51 -07:00
Philip Rosedale
9aac74035c
Merge pull request #2771 from birarda/oauth-ds
...
restrict access to domains using user roles retreived from data-web
2014-05-02 17:09:52 -07:00
Andrzej Kapolka
6f3b3acc86
Remove pushback entirely for other avatars.
2014-05-02 16:27:39 -07:00
Stephen Birarda
53eddab43c
fix typo for OAuth header include
2014-05-02 15:52:50 -07:00
Andrzej Kapolka
f3948d5e62
If "collide with avatars" is off, don't attempt camera pushback.
2014-05-02 15:02:40 -07:00
Stephen Birarda
aa2931d9bb
resolve conflicts on merge with upstream/master
2014-05-02 10:39:17 -07:00
Stephen Birarda
4936fb3857
expose access token from AccountManager
2014-05-02 10:34:29 -07:00
Stojce Slavkovski
852756e84d
Merge branch 'master' of https://github.com/worklist/hifi into 19507
2014-05-02 19:03:11 +02:00
AndrewMeadows
ac549977be
Merge pull request #2770 from ZappoMan/modelserver
...
Fix a couple bugs in Models
2014-05-02 10:01:44 -07:00
ZappoMan
b8eb441468
removed debugging
2014-05-02 09:31:28 -07:00
ZappoMan
715e6b8e60
debugging model editing
2014-05-02 09:10:30 -07:00
Philip Rosedale
69f0611a06
Correction to actually pick closest
2014-05-02 09:05:09 -07:00
Philip Rosedale
03b59055fd
merge conflict fix
2014-05-02 07:10:43 -07:00
Philip Rosedale
4089d54389
Avatar makes eye contact with the person nearest to gaze direction
2014-05-02 00:21:14 -07:00
AndrewMeadows
05e5277084
Merge pull request #2764 from ZappoMan/modelserver
...
Model Server, Renderer, Scripting, etc
2014-05-01 15:39:12 -07:00
Stephen Birarda
d942054015
cleanup re-display of OAuthWebView
2014-05-01 12:44:42 -07:00
Thijs Wenker
df6df759a3
Merge branch 'master' of https://github.com/highfidelity/hifi into 19561
2014-05-01 21:08:20 +02:00
Thijs Wenker
9667748156
- Style fixes
...
- ScriptHightlighting qouting RegEx fix ( "hello" + " " + "world" // the text between two quote entities isn't red anymore )
2014-05-01 21:07:46 +02:00
Stephen Birarda
7d3157b1a0
trust high fidelity root CA cert for OAuth redirect
2014-05-01 11:54:51 -07:00
