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
Stephen Birarda
d48a5dd305
don't force OAuthWebViewHandler to stay on top
2014-05-30 14:54:25 -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
ZappoMan
ac22cebde1
more performance stats debugging
2014-05-29 17:41:40 -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
ZappoMan
e6966c2155
add improved detailed rendering and FPS debugging stats
2014-05-29 12:12:23 -07:00
Mohammed Nafees
2c3784c7d5
Merge branch master of upstream
2014-05-29 22:31:32 +05:30
AndrewMeadows
b849c07faf
Merge pull request #2945 from huffman/19725
...
Code Review for Job #19725
2014-05-29 09:06:43 -07:00
AndrewMeadows
21f045ebe0
Merge pull request #2939 from huffman/19648
...
Code Review for Job #19648
2014-05-29 08:53:31 -07:00
Ryan Huffman
8f6ad2faab
Add 'Load default scripts' button to preferences
2014-05-28 15:27:50 -07:00
Mohammed Nafees
8b0212dc1e
remove all key bindings from running scripts dialog
2014-05-28 23:19:15 +05:30
barnold1953
ebfb11c1ce
Renamed OverlayRenderer to ApplicationOverlay and moved it up a directory
2014-05-28 10:46:46 -07:00
barnold1953
216a73cf60
Fixed coding standard issues
2014-05-27 16:40:51 -07:00
barnold1953
2570c55241
Touched up comments
2014-05-27 16:21:34 -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
Ryan Huffman
6ef8026215
Add console to script editor
2014-05-27 14:10:09 -07:00
Ryan Huffman
44c5e56a4b
Update JSConsole colors
2014-05-27 14:09:53 -07:00
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
Brad Hefta-Gaub
13366d9ba1
Merge pull request #2926 from ctrlaltdavid/chat_window
...
Fix chat window scrolling
2014-05-27 10:07:34 -07:00
Ryan Huffman
4a0a9f8a36
Update console style
2014-05-27 08:57:29 -07:00
Ryan Huffman
9af0269151
Update console style
2014-05-27 08:05:56 -07:00
Ryan Huffman
b9248e0bbf
Update JSConsole to QWidget
2014-05-27 08:03:46 -07:00
Ryan Huffman
099777ef8c
Merge branch 'master' of git://github.com/highfidelity/hifi into 19648
...
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
2014-05-26 10:01:44 -07:00
Ryan Huffman
5a5d5b4983
Add JSConsole
2014-05-26 09:59:28 -07:00
David Rowe
7c3d3976ee
Fix chat window scrolling to stay at bottom
...
Stay at bottom window when:
- There is new chat.
- People come and go from online list.
- Chat window hides and restores when application focus changes.
- Interface is minimized and restored.
2014-05-25 16:42:36 -07:00
David Rowe
97e5c928a4
Fix chat scroll bar widget jumping
...
Hovering over the chat window's scroll bar was causing it to jump
around. Replaced the 12px style spacing that was causing the problem
with a widget-based solution.
2014-05-25 16:41:01 -07:00
Kai Ludwig
78e311f885
separate style handling for chat area and its context menu.
2014-05-25 20:24:15 +02: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
Kai Ludwig
587f60631f
missed a tab
2014-05-24 21:28:03 +02:00
Kai Ludwig
c832df0783
added missing locking against crashing in Overlays::~Overlays()
2014-05-24 21:22:34 +02:00
Stojce Slavkovski
b3b8e2d775
Merge branch 'master' of https://github.com/worklist/hifi into 19705
2014-05-23 20:50:10 +02:00
Stojce Slavkovski
be9aac08ee
add disabled state to Share button on click
2014-05-23 20:49:48 +02:00
ZappoMan
7036233a47
Merge branch 'master' of https://github.com/worklist/hifi into aacube
2014-05-23 11:47:47 -07:00
Brad Hefta-Gaub
10b0471641
Merge pull request #2906 from Barnold1953/master
...
Write thread safety for Overlays QMaps
2014-05-23 11:34:02 -07:00
ZappoMan
ee523ff373
Merge branch 'master' of https://github.com/worklist/hifi into aacube
2014-05-23 11:17:59 -07:00
barnold1953
6817c9682e
Added a new lock specific to deleting, and improved safety
2014-05-23 11:17:55 -07:00
ZappoMan
39ed7f7b65
renaming of AABox to AACube, introduction of actual AABox
2014-05-23 10:45:04 -07:00
barnold1953
9553271fa1
Added some missing locks to make Overlays thread safe for reading as well.
2014-05-23 10:44:40 -07:00
barnold1953
3a45104793
Made overlays thread safe for write operations, which solved a script
...
crash.
2014-05-22 17:55:25 -07:00
Andrzej Kapolka
a32dfdb7bb
We should let people "start" even if the animation is already playing (to
...
start again from the beginning). Fixed an issue with competing priorities.
2014-05-22 17:05:28 -07:00
Andrzej Kapolka
8458477b9f
Fixed a compile warning, provide means to start/stop animations.
2014-05-22 16:15:34 -07:00
Andrzej Kapolka
8717977437
Merge branch 'master' of https://github.com/highfidelity/hifi into animenu
2014-05-22 14:42:23 -07:00
Andrzej Kapolka
d4af39a9f5
Working on handling animation priorities to prevent Hydra move/restore from
...
interfering with scripted animations.
2014-05-22 14:41:46 -07:00
Leonardo Murillo
60dfa08b30
Merge pull request #2902 from birarda/master
...
change node auth URL to data.highfidelity.io
2014-05-22 15:30:44 -06:00
Stephen Birarda
01e8d775f2
change node auth URL to data.highfidelity.io
2014-05-22 14:24:19 -07:00
barnold1953
5013c8c2fa
Fixed script editor crash when script calls Script.stop(). Also made the
...
processEraseMessage wait until it can lock to ensure particles are
deleted.
2014-05-22 12:45:36 -07:00
Andrzej Kapolka
de7c05cb2d
More animation controls.
2014-05-21 15:30:50 -07:00
Andrzej Kapolka
709a9d75f6
Provide an option for the masked joints in the scriptable method, fix a couple
...
of annoying warnings.
2014-05-21 12:03:47 -07:00
