barnold1953
3052996a9e
Pressing trigger and bumper at same time toggles UI
2014-06-17 10:37:15 -07:00
Brad Hefta-Gaub
e8ba3c8bb1
Merge pull request #3019 from ctrlaltdavid/19769
...
Code Review for Job #19769
2014-06-12 17:31:53 -07:00
barnold1953
762751ef6a
Store the last mouse move input type for application overlay
2014-06-12 10:47:11 -07:00
barnold1953
84e01e6b25
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-06-11 17:22:30 -07:00
barnold1953
eff097638c
Implementd sixense mouse emulation
2014-06-11 17:02:08 -07:00
Brad Hefta-Gaub
107fbf8c29
Merge pull request #3012 from wangyix/master
...
added OctreePacketProcessor::nodeKilled to Application::nodeKilled instead of connecting it to NodeList::nodeKilled
2014-06-11 16:00:59 -07:00
wangyix
ac0b037f0f
removed connect(); put call into Application::nodeKilled
...
OctreePacketReceiver::nodeKilled() doesn't get called when
NodeList::nodeKilled() is emitted for some unknown reason
2014-06-11 15:25:00 -07:00
wangyix
a8c9780004
updated connect() to qt5 format
2014-06-11 12:13:27 -07:00
Brad Hefta-Gaub
62f85d0794
Merge pull request #3004 from matsukaze/master
...
Job #19766 BUG: Stop or reload all scripts crashes interface
2014-06-11 11:51:03 -07:00
wangyix
fc07ceb412
added killNode() slot for _packetCounts garbage collection
2014-06-11 10:54:44 -07:00
matsukaze
679846267e
Job #19766 BUG: Stop or reload all scripts crashes interface fixed, part 3
...
Same comments as before, but without the local files changes mistakenly
checked in.
2014-06-10 22:42:01 -04:00
matsukaze
1e1cc69287
Revert "Job #19766 BUG: Stop or reload all scripts crashes interface fixed, part 3"
...
This reverts commit 46f2ab73bc
2014-06-10 22:37:34 -04:00
matsukaze
46f2ab73bc
Job #19766 BUG: Stop or reload all scripts crashes interface fixed, part 3
...
Move the conversion of scriptName to QUrl to the beginning of
Application::loadScript. Use the scriptURLString to query the
_scriptEngineHash map.
2014-06-10 22:29:58 -04:00
matsukaze
a48f38b1d2
Revert "Job #19766 BUG: Stop or reload all scripts crashes interface fix, part 2."
...
This reverts commit b4e9840865
2014-06-10 21:32:23 -04:00
David Rowe
39e3deb9b9
Add menu item that toggles VR display mode
...
Toggles the display mode if a Rift is found connected at program start.
2014-06-10 15:03:07 -07:00
wangyix
b96b6c9857
added default constructor for NetworkPacket
...
updated param comments in ReceivedPacketProcessor
2014-06-10 12:24:47 -07:00
wangyix
d84beee3e4
VoxelPacketProcessor -> OctreePacketProcessor
...
added nodes bookkeeping in ReceivedPacketProcessor; added check in
sendNack() to not send NACKs to nodes that have sent packets that are
waiting in the message queue.
2014-06-10 11:05:51 -07:00
matsukaze
b4e9840865
Job #19766 BUG: Stop or reload all scripts crashes interface fix, part 2.
...
Keep the scriptUrl internal to the ScriptEngine class and refer to it
externally by the file name string.
Change the ScriptEngine constructor to accept a filename QString,
instead of a QUrl. Resolve constructor ambiguity in Particle, which
creates anonymous ScriptEngine.
2014-06-09 23:15:45 -04:00
wangyix
ffda98fe0b
var name change again
2014-06-09 17:50:29 -07:00
wangyix
4665df4d1f
nackdisable to disablenack
2014-06-09 17:41:20 -07:00
wangyix
de61029f05
Added dev menu option to disable nack packets
2014-06-09 17:30:09 -07:00
matsukaze
c8c8bccbf3
Job #19766 BUG: Stop or reload all scripts crashes interface fixed.
...
QUrl(name).toString() does not equal name, therefore removing name from
ScriptEngineHash was failing, and a dangling pointer was left in the
script engine hash map.
2014-06-09 17:52:50 -04:00
wangyix
e45f2fed4b
changed writelock to readlock
...
plus a coding standard fix
2014-06-09 13:42:45 -07:00
wangyix
aa694d6967
removed debug code
2014-06-09 12:35:26 -07:00
wangyix
529dd827a2
moved around code in sendNack() a bit
2014-06-09 12:00:19 -07:00
wangyix
3bc457d4d2
added octree scene stats locking and unlocking
2014-06-09 11:14:02 -07:00
wangyix
5286090812
removed interface print statements
2014-06-06 17:52:48 -07:00
wangyix
b39559d860
packet recovery seems to be working
...
Seems to impact FPS a lot. OctreeSceneStats is not being locked (causes
freezing, need to find out why).
2014-06-06 17:44:30 -07:00
wangyix
d21a8e73ff
Merge remote-tracking branch 'upstream/master' into packet_recovery_pull
2014-06-06 15:05:29 -07:00
wangyix
0b1bffa83c
added random packet drops; ready to test
2014-06-06 15:03:54 -07:00
wangyix
bd2148d4b7
added write lock/unlock
...
...for _octreeSceneStatsLock
2014-06-06 14:33:53 -07:00
wangyix
5c47485562
client-side nack sending complete; ready to test
2014-06-06 14:27:51 -07:00
wangyix
8cd5ec3b54
started work on sending nack packets from client
2014-06-06 11:50:34 -07:00
barnold1953
f0f7d0c55f
Merge branch 'master' of https://github.com/highfidelity/hifi into OculusOverlay
...
Conflicts:
interface/src/ui/ApplicationOverlay.cpp
2014-06-05 12:17:09 -07:00
barnold1953
e60c671c05
Switched Oculus UI to hemisphere. Added curved semicircle UI
2014-06-04 17:24:20 -07:00
Andrew Meadows
7807388b08
merge upstream/master into andrew/inertia
...
Conflicts:
interface/src/renderer/Model.cpp
2014-06-04 14:28:23 -07:00
Andrew Meadows
d3f51fe38e
FinalOrientation -> FinalOrientationInWorldFrame
2014-06-04 10:41:17 -07:00
barnold1953
edf5d5bda1
Fixed bug that disabled cursor for windows
2014-06-04 08:38:01 -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
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
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
90754e320d
Curved Oculus overlay around camera as a semicircle
2014-06-02 16:05:07 -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
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
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
