Commit graph

21802 commits

Author SHA1 Message Date
Brad Hefta-Gaub
a4c1a116e7 Merge pull request #4240 from birarda/master
remove the text comparisons from examples dir
2015-02-06 10:03:22 -08:00
Stephen Birarda
65418b8b67 remove the text comparisons from images dir 2015-02-06 10:02:44 -08:00
Stephen Birarda
219e78425b resolve conflicts on merge with upstream master 2015-02-06 09:49:46 -08:00
Seth Alves
839b622a05 formatting 2015-02-06 09:20:16 -08:00
Seth Alves
6d5d6b9085 Merge branch 'master' of github.com:highfidelity/hifi into allowed-editors 2015-02-06 09:15:41 -08:00
Seth Alves
60a4f48985 rather than a list of allowed editors, a list of allowed lockers/unlockers 2015-02-06 09:14:40 -08:00
Andrew Meadows
5ea785f4ad Merge pull request #4232 from thoys/cursor_is_visible_and_oculus_cursor_visibility
Ability to make cursor invisible again (both OS-cursor and oculus rectile) and js-interface to cursorVisible boolean
2015-02-06 08:58:14 -08:00
Thijs Wenker
27147fde2a add Write function to the Window.cursurVisible property 2015-02-06 14:45:22 +01:00
Brad Hefta-Gaub
f8d62d332a Merge pull request #4222 from jherico/text-renderer
Text renderer refactor to use signed distance field font rendering
2015-02-05 21:58:41 -08:00
Brad Davis
9b7743c6d3 making test code identical on old and new renderer 2015-02-05 21:25:16 -08:00
Brad Davis
39794a7a40 Getting rid of some warnings 2015-02-05 21:00:34 -08:00
David Rowe
9e34b36839 Send hifi command line url to other instance 2015-02-05 17:17:31 -08:00
David Rowe
ab758648c7 Show and focus on the other Interface instance 2015-02-05 16:44:26 -08:00
Seth Alves
46bf6ea5da coding standard 2015-02-05 16:37:37 -08:00
Seth Alves
bad44c540a also guard deleteEntity and getEntityProperties with canEdit. make canEdit available to javascript 2015-02-05 16:22:52 -08:00
Seth Alves
d19ab4c36f formatting 2015-02-05 15:46:40 -08:00
Seth Alves
ccc8662732 formatting 2015-02-05 15:46:23 -08:00
Seth Alves
80cf571d7d formatting 2015-02-05 15:43:27 -08:00
Seth Alves
6bad141004 formatting 2015-02-05 15:42:42 -08:00
Seth Alves
810e7549d1 formatting 2015-02-05 15:41:04 -08:00
Seth Alves
485785be7f Allowed Editors setting in DomainServer; domain-list wire protocol includes "you can edit" boolean after uuid; entity server checks canEdit flag of node who sends edit requests; interface does not attempt to do edits if DomainServer sent false for "you can edit" 2015-02-05 15:37:14 -08:00
Brad Davis
be3cca2d04 Working on performance test 2015-02-05 13:11:35 -08:00
David Rowe
1fa50fa54d Run only one instance of Windows Interface at a time
OSX automatically does this.
2015-02-05 13:09:06 -08:00
Brad Davis
dc1cc84c1c Working on porting to mac compatible shaders 2015-02-05 12:58:09 -08:00
Brad Hefta-Gaub
9058e9116a Merge pull request #4233 from ctrlaltdavid/fix-lookwithmouse
Don't hide mouse events from C++ GUI
2015-02-05 11:38:04 -08:00
Brad Hefta-Gaub
16717b322e Merge pull request #4237 from huffman/edit-user-data
Edit user data
2015-02-05 11:37:30 -08:00
Brad Hefta-Gaub
dda0a8a811 Merge pull request #4235 from huffman/edit-drag-drop-entities
Add drag-drop functionality for placing entities
2015-02-05 11:37:15 -08:00
Brad Hefta-Gaub
d76ede624c Merge pull request #4234 from AndrewMeadows/bispinor
fix physics crash on disconnect from domain-server
2015-02-05 11:36:02 -08:00
Ryan Huffman
6863895533 Remove value from animation settings textarea 2015-02-05 11:19:18 -08:00
Ryan Huffman
850de6e67e Add User Data to entity properties panel 2015-02-05 11:19:01 -08:00
Brad Davis
230d761ec3 fix display name scaling 2015-02-05 10:47:35 -08:00
Ryan Huffman
1e11e658a8 Update drag/drop distance to be based on cameraManager.enabled rather than camera mode 2015-02-05 10:18:34 -08:00
Ryan Huffman
2343da0a8a Update drag/drop distance while in non-independent mode 2015-02-05 10:16:51 -08:00
Ryan Huffman
41720dbc4b Add drag-drop functionality for placing entities 2015-02-05 10:07:31 -08:00
David Rowe
3ceb1123b3 Cater for ellipses in circle3d overlay intersection 2015-02-05 09:39:16 -08:00
David Rowe
2f6749ff69 Implement dimensions test for 3D planar overlay intersection 2015-02-05 09:38:45 -08:00
David Rowe
056365932b Make circle3d dimension property specify overall size not half size 2015-02-05 09:37:08 -08:00
Andrew Meadows
b4da2ddd52 fix physics crash on disconnect from domainserver 2015-02-05 09:13:32 -08:00
David Rowe
c0ac9333e9 Don't hide mouse events from C++ GUI 2015-02-04 23:04:06 -08:00
Brad Davis
da05c26aad Moving shaders to standard format, adding bounding box support and using it in text node 2015-02-04 21:32:05 -08:00
Brad Davis
e1af9f8126 Merge remote-tracking branch 'upstream/master' into text-renderer 2015-02-04 21:04:47 -08:00
Seth Alves
35430a4c7a Merge branch 'master' of github.com:highfidelity/hifi into allowed-editors 2015-02-04 16:31:49 -08:00
Seth Alves
afea5f3534 added allowed_editors to settings json 2015-02-04 16:31:36 -08:00
Clément Brisset
6a4577b6a5 Merge pull request #4231 from ZappoMan/crashonexit
BUG FIXES: Crash on Exit with partially loaded scene & (near)-infinite loop in skipForward physics
2015-02-04 16:16:56 -08:00
Brad Hefta-Gaub
af91eee5a0 Merge pull request #4220 from sethalves/rework-bandwidth-meter
fix several signed/unsigned comps, avoid sprintf in overlay code
2015-02-04 16:06:22 -08:00
Thijs Wenker
de3afa0637 keep a boolean for cursorHidden state, so we know when to hide the VR-mode-cursor while the normal cursor is hidden 2015-02-05 00:19:45 +01:00
Stephen Birarda
93a3158153 Merge branch 'master' of https://github.com/highfidelity/hifi into android 2015-02-04 15:16:23 -08:00
ZappoMan
8fd11e70cc clamp dt for skipTimeForward to prevent near infinite loops 2015-02-04 15:16:18 -08:00
Stephen Birarda
c9c53453c3 repairs to local audio injector cleanup 2015-02-04 14:47:18 -08:00
Brad Davis
02f2f1c1bf Fixing header order and code style 2015-02-04 14:36:03 -08:00