Andrzej Kapolka
f6395435cf
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-06-04 11:51:11 -07:00
Andrzej Kapolka
74afcf5626
Allow floating point start/end frames and negative play speeds.
2014-06-04 11:47:53 -07:00
Andrew Meadows
aea517af46
fix for partial hand restore after hydra inactive
2014-06-04 10:19:27 -07:00
barnold1953
edf5d5bda1
Fixed bug that disabled cursor for windows
2014-06-04 08:38:01 -07:00
barnold1953
d4fd1e9515
Stopped Oculus UI from glowing.
2014-06-03 16:01:47 -07:00
barnold1953
036bdf5d07
Removed pointless 1.0f
2014-06-03 15:26:12 -07:00
barnold1953
611c68d0d8
Merge branch 'master' of https://github.com/highfidelity/hifi into OculusOverlay
2014-06-03 15:23:58 -07:00
barnold1953
d1b7882c6f
Mouse input and magnification for Oculus Overlay
2014-06-03 15:23:17 -07:00
Brad Hefta-Gaub
03f0ff111f
Merge pull request #2976 from talentraspel/19751
...
dynamically malloc/free arrays to avoid stack overflow on windows.
2014-06-03 12:10:44 -07:00
Kai Ludwig
23b56bf174
start timer BEFORE moving it to another thread, because Qt otherwise will protest and the timer does not run at all - at least on windows.
...
this fixes restarted servers not getting properly recognized by the interface - at least on windows.
2014-06-03 20:10:55 +02:00
barnold1953
75bee69ef8
Fixed coding standard
2014-06-03 10:49:54 -07:00
Kai Ludwig
162939fda1
dynamically malloc/free arrays to avoid stack overflow on windows.
...
starting with 0 for array index will give a reasonable value for 'first'.
2014-06-03 19:11:53 +02:00
Brad Hefta-Gaub
6061330826
Merge pull request #2973 from matsukaze/master
...
Job #19700 BUG: Crash in NodeBounds::draw() fixed.
2014-06-02 22:41:02 -07:00
barnold1953
f4391bcdbe
_distance variable
2014-06-02 17:23:32 -07:00
barnold1953
10d0b6af03
Fixed Oculus overlay color bug
2014-06-02 16:47:51 -07:00
barnold1953
4ed03e996a
Added Oculus Options menu
2014-06-02 16:15:51 -07:00
barnold1953
90754e320d
Curved Oculus overlay around camera as a semicircle
2014-06-02 16:05:07 -07:00
Brad Hefta-Gaub
6f5d2ba233
Merge pull request #2970 from Barnold1953/master
...
Mirror mode fix, particleBirds.js
2014-06-02 13:02:05 -07:00
Andrew Meadows
8e7daed2b3
Merge upsrtream/master into andrew/inertia
...
Conflicts:
interface/src/renderer/Model.cpp
2014-06-02 11:32:23 -07:00
barnold1953
863e2c56ae
Fixed mirror mode for non-headless models.
2014-06-02 10:41:10 -07:00
matsukaze
46d45a2d43
Job #19700 BUG: Crash in NodeBounds::draw() fixed.
...
QMap and QReadWriteLock are orthogonal. Combined them into a wrapper
class called NodeToJurisdictionMap, replacing typedef. This allows us to
avoid changing method signatures wherever NodeToJurisdictionMap is used.
The lock is bound with the map and is available to all clients of the
NodeToJurisdictionMap. The lock allows multi-threaded access to the map.
Fixed compiler warning in NodeBounds.cpp regarding loss of precision
during conversion of double to GLfloat.
2014-06-02 05:55:58 -04:00
ZappoMan
8b51cd0d8a
fix bug in Menu::removeAction() where we weren't removing the action key from the hash, memory leak, and other problems
2014-05-31 14:04:33 -07:00
ZappoMan
22a8f88195
add support for Menu.menuExists() and menu.menuItemExists()
2014-05-31 13:24:07 -07:00
Andrzej Kapolka
70afda6f86
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-05-30 15:19:34 -07:00
Stephen Birarda
d48a5dd305
don't force OAuthWebViewHandler to stay on top
2014-05-30 14:54:25 -07:00
Andrzej Kapolka
164192fb50
If the skeleton doesn't have eye joints (as with the Fuse models), make up
...
some positions based on the head and neck joints.
2014-05-30 11:03:46 -07:00
Andrew Meadows
4eb4334ed8
replace Model::setJointRotation() with JointState::setRotation()
2014-05-30 09:57:32 -07:00
Andrew Meadows
557d7d428b
minor rename and formatting
2014-05-30 08:28:15 -07:00
Andrew Meadows
e21dbd8726
rename updateWorldTransforms to computeTransforms
2014-05-30 08:20:11 -07:00
Andrzej Kapolka
b93b009cd8
Merge pull request #2953 from PhilipRosedale/master
...
Fixes having large yaw movements get head and body out of alignment with oculus
2014-05-29 19:00:37 -07:00
AndrewMeadows
5b74829318
Merge pull request #2955 from ey6es/cascade
...
Basic cascaded shadow maps for increased shadow draw distance.
2014-05-29 18:57:44 -07:00
Andrzej Kapolka
f42199b3e1
Merge pull request #2952 from Atlante45/click_drag_attach
...
Click drag attach!
2014-05-29 18:55:33 -07:00
AndrewMeadows
eed2cd28ef
Merge pull request #2956 from ZappoMan/perfstats
...
Fix Ray Intersection bug that was causing low FPS... also added more performance debugging
2014-05-29 18:48:38 -07:00
Atlante45
17e3bd6110
CR comments
2014-05-29 18:24:21 -07:00
Andrzej Kapolka
1eace78e47
Hide distances; they no longer need to be publicly visible.
2014-05-29 17:46:25 -07:00
ZappoMan
ac22cebde1
more performance stats debugging
2014-05-29 17:41:40 -07:00
Andrzej Kapolka
34091128d8
Distance tweak.
2014-05-29 17:22:59 -07:00
Andrzej Kapolka
67921c474e
Merge branch 'master' of https://github.com/highfidelity/hifi into cascade
2014-05-29 17:09:09 -07:00
Andrzej Kapolka
12beef7fec
Apply the new shadow distances to the models, too.
2014-05-29 17:08:36 -07:00
Philip Rosedale
d17eeaf35b
remove old oculus yaw offset, expand limit on head yaw
2014-05-29 16:50:13 -07:00
Andrzej Kapolka
0b4484a153
Trying a different way of determining the cascade threshold distances.
2014-05-29 16:49:51 -07:00
Andrew Meadows
6efa851104
minor cleanup + use 'fraction' instead of 'percent'
2014-05-29 15:44:27 -07:00
Atlante45
73f7390eaa
Merge branch 'master' of https://github.com/highfidelity/hifi into click_drag_attach
2014-05-29 15:37:22 -07:00
Clément Brisset
6864fc3b99
Merge pull request #2951 from ZappoMan/perfstats
...
add improved detailed rendering and FPS debugging stats
2014-05-29 15:37:07 -07:00
ZappoMan
7e3ef34e6c
CR feedback
2014-05-29 15:34:20 -07:00
Andrzej Kapolka
391902f79b
Cascaded shadow maps for models.
2014-05-29 15:30:40 -07:00
Atlante45
0eb56000ef
Merge branch 'master' of https://github.com/highfidelity/hifi into click_drag_attach
2014-05-29 15:02:21 -07:00
Clément Brisset
21d1a18bd5
Merge pull request #2949 from AndrewMeadows/inertia
...
safe copy of JointState data
2014-05-29 14:44:05 -07:00
Brad Hefta-Gaub
2c8da2bda7
Merge pull request #2950 from wangyix/flighttime_fix_pull
...
Fix for unreasonable flight times
2014-05-29 14:43:15 -07:00
Atlante45
9c38beb4bc
Merge branch 'master' of https://github.com/highfidelity/hifi into click_drag_attach
2014-05-29 14:34:18 -07:00
