Andrzej Kapolka
0b4484a153
Trying a different way of determining the cascade threshold distances.
2014-05-29 16:49:51 -07:00
Andrzej Kapolka
09231f01f3
Retain "simple" shadows, supply cascaded as option.
2014-05-29 12:48:41 -07:00
Andrzej Kapolka
ff77644caa
Progress on selecting cascades.
2014-05-28 18:35:30 -07:00
Andrzej Kapolka
c3f6cab199
Working on cascading shadow maps.
2014-05-28 15:20:09 -07:00
barnold1953
ebfb11c1ce
Renamed OverlayRenderer to ApplicationOverlay and moved it up a directory
2014-05-28 10:46:46 -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
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
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
Mohammed Nafees
ad49b5c2e1
Show OS notification when user is not logged in
2014-05-22 16:53:07 +05:30
Andrzej Kapolka
62e7a31602
More work on animation configuration.
2014-05-19 18:09:33 -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
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
Andrzej Kapolka
6dd08ca1bf
Working on joystick support using SDL.
2014-05-15 17:09:28 -07:00
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
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
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
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
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
e6a8c79f9f
Added more arrow controls to move camera when in mirror mode, new guitar chords.
2014-05-07 16:51:22 -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
8ee282e7d2
Merge branch 'master' of https://github.com/worklist/hifi into 19507
2014-05-06 22:01:48 +02:00
Andrzej Kapolka
e0400dbd9c
Working on allowing attachment models to be uploaded.
2014-05-04 15:23:31 -07:00
Stojce Slavkovski
852756e84d
Merge branch 'master' of https://github.com/worklist/hifi into 19507
2014-05-02 19:03:11 +02:00
ZappoMan
715e6b8e60
debugging model editing
2014-05-02 09:10:30 -07:00
AndrewMeadows
05e5277084
Merge pull request #2764 from ZappoMan/modelserver
...
Model Server, Renderer, Scripting, etc
2014-05-01 15:39:12 -07: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
ZappoMan
0182a6d895
models working end to end
2014-04-30 11:12:49 -07:00
Thijs Wenker
7125b6ab8e
Merge branch 'master' of https://github.com/highfidelity/hifi into 19561
...
Conflicts:
interface/src/Application.cpp
2014-04-30 20:08:11 +02:00
ZappoMan
58c852d210
Merge branch 'master' of https://github.com/worklist/hifi into modelserver
2014-04-30 09:29:06 -07:00
ZappoMan
aac42058ac
first cut at modelserver
2014-04-30 09:25:52 -07:00
Thijs Wenker
2ba39f951a
Merge branch '19561' of https://github.com/thoys/hifi into 19561
...
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
2014-04-29 22:07:03 +02:00
Thijs Wenker
fc2ed9f9fb
Use same load/save dialog behavior as in main application for ScriptEditor, this will keep track of the last directory that was used to load a script.
2014-04-29 22:03:51 +02:00
Thijs Wenker
df14e1e6e4
Use same load/save dialog behavior as in main application for ScriptEditor, this will keep track of the last directory that was used to load a script.
2014-04-29 21:51:20 +02:00
Ryan Huffman
84e7b1598c
Merge remote-tracking branch 'upstream/master' into RunningScripts
2014-04-25 08:45:54 -07:00
Clément Brisset
fd8ec9b5c2
Merge pull request #2723 from huffman/19554-2
...
19554 - Chat Updates
2014-04-24 16:44:22 -07:00
Ryan Huffman
d88897ccc7
Add error box when going to user/location that doesn't exist
2014-04-24 15:55:34 -07:00
Stojce Slavkovski
fc6d1b6575
Merge branch 'master' of https://github.com/worklist/hifi into 19507
2014-04-24 22:48:57 +02:00
Mohammed Nafees
29d64373b4
Merge branch master
2014-04-24 18:52:59 +05:30
Stojce Slavkovski
e9962241be
Merge branch 'master' of https://github.com/worklist/hifi into 19507
2014-04-23 18:12:49 +02:00
