Ryan Huffman
8f6ad2faab
Add 'Load default scripts' button to preferences
2014-05-28 15:27:50 -07:00
barnold1953
ebfb11c1ce
Renamed OverlayRenderer to ApplicationOverlay and moved it up a directory
2014-05-28 10:46:46 -07:00
barnold1953
35e63757ed
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-05-28 09:25:55 -07:00
Andrzej Kapolka
62eeeaa1c6
Fix for Windows build failure.
2014-05-27 18:12:15 -07:00
barnold1953
5665e4d278
Merge branch 'master' of https://github.com/highfidelity/hifi
...
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
2014-05-27 16:16:27 -07:00
barnold1953
75580cfd0f
Made Overlay appear as flat image in front of camera in Oculus Rift. It
...
needs to be a curved surface instead.
2014-05-27 16:13:56 -07:00
Andrzej Kapolka
2b54d627c0
Try rounding to nearest texel unit to reduce shimmer.
2014-05-27 14:25:27 -07:00
Andrzej Kapolka
3f478b1939
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-05-27 12:31:12 -07:00
Andrzej Kapolka
edaa251e5f
Provide option to disable avatar shadowing.
2014-05-27 11:43:34 -07:00
Mohammed Nafees
5055b18a4b
Merge branch master from upstream
2014-05-28 00:02:15 +05:30
barnold1953
d1a4192ac5
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-05-27 11:20:23 -07:00
barnold1953
d4f66a4a3d
Added OverlayRenderer class and moved displayOverlay from Application to
...
OverlayRenderer.
2014-05-27 11:19:45 -07:00
Andrzej Kapolka
70ab33b65b
Some tricks to avoid shadow artifacts: render back faces to shadow buffer,
...
use polygon offset.
2014-05-27 10:54:18 -07:00
Clément Brisset
6bb933996f
Merge pull request #2920 from ZappoMan/aacube
...
Add RayPick support for models
2014-05-24 17:03:59 -07:00
Stephen Birarda
fe05beb88d
remove an unneeded debug
2014-05-23 17:41:58 -07:00
Stephen Birarda
714e29c887
fix credit amount in window title
2014-05-23 17:37:36 -07:00
Stephen Birarda
1e9589c19e
fix an implicit cast to float
2014-05-23 16:18:21 -07:00
Stephen Birarda
1b00cda068
don't use powf for credit conversions
2014-05-23 16:12:34 -07:00
Brad Hefta-Gaub
50e812a82b
Merge pull request #2913 from talentraspel/19680
...
locking against crash
2014-05-23 15:08:20 -07:00
Kai Ludwig
7fb9e3a7e6
spaces instead of tabs.
2014-05-23 20:25:20 +02:00
Kai Ludwig
107c142532
_voxelFades needs locking.
2014-05-23 20:21:00 +02:00
ZappoMan
ee523ff373
Merge branch 'master' of https://github.com/worklist/hifi into aacube
2014-05-23 11:17:59 -07:00
ZappoMan
39ed7f7b65
renaming of AABox to AACube, introduction of actual AABox
2014-05-23 10:45:04 -07:00
Stephen Birarda
164d3c5fb3
make sure balance is cleared on logout and re-launch
2014-05-22 15:06:16 -07:00
Stephen Birarda
79f09605d5
show credit balance in window title
2014-05-22 14:55:43 -07:00
Atlante45
ea1359c10f
Clean up log
2014-05-22 11:11:22 -07:00
Mohammed Nafees
ad49b5c2e1
Show OS notification when user is not logged in
2014-05-22 16:53:07 +05:30
barnold1953
5b366fe714
Merge branch 'master' of https://github.com/highfidelity/hifi
...
Conflicts:
interface/src/Application.cpp
2014-05-21 16:01:28 -07:00
barnold1953
97c0a2fc98
Made mirror view remain constant no matter what the avatar scale is set to.
2014-05-21 15:32:23 -07:00
barnold1953
21f03a4fb5
Made oculus camera modes only active when AllowOculusCameraModeChange is checked.
2014-05-21 12:43:44 -07:00
barnold1953
3bc8e0f726
Made third person work with oculus
2014-05-21 11:21:12 -07:00
Brad Hefta-Gaub
a88de84b1e
Merge pull request #2875 from binaryking/19666
...
Code Review for Job #19666
2014-05-21 11:02:29 -07:00
Mohammed Nafees
1714f7fb27
Merge branch master from upstream
2014-05-21 11:29:19 +05:30
barnold1953
eb5b0c4ddf
Made OR work with different camera modes.
2014-05-20 17:43:46 -07:00
Stephen Birarda
e3dd6509d8
remove dependency on GnuTLS for later replacement with OpenSSL
2014-05-20 10:47:11 -07:00
Andrzej Kapolka
5ebb2659a4
Fixed initialization order warning.
2014-05-17 19:02:14 -07:00
Andrzej Kapolka
c8f2dae7bd
Fix for stopping scripts on Windows.
2014-05-17 18:45:54 -07:00
Philip Rosedale
d54ff7a2cf
Merge pull request #2869 from huffman/19630
...
Code Review for Job #19630
2014-05-16 16:00:05 -07:00
Andrzej Kapolka
956c5d2eb6
More joystick fixes.
2014-05-16 14:24:49 -07:00
Andrzej Kapolka
a7234fd8d3
Stuff the joystick and position bits into the palms.
2014-05-16 12:10:21 -07:00
Ryan Huffman
b48b8aab12
Merge branch 'master' of git://github.com/highfidelity/hifi into 19630
...
Conflicts:
interface/src/Application.cpp
2014-05-16 11:48:58 -07:00
Mohammed Nafees
c7acc80ad0
Fixes the log window to prevent halting of Interface when the log is long and the window is opened
2014-05-16 08:36:56 +05:30
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
Stephen Birarda
8e9defad3e
send an updated address to data-server with domain (when changed)
2014-05-15 12:18:24 -07:00
Brad Hefta-Gaub
4c05f4f374
Merge pull request #2857 from ctrlaltdavid/interface_log_dir
...
Fix interface log file location
2014-05-15 08:58:53 -07:00
David Rowe
dbfa60ff1b
Fix interface log file location
...
Put in \High Fidelity\Interface\Logs rather than \interface\Logs.
2014-05-14 14:46:48 -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
