godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,409 Commits 15 Branches 59 Tags 2.2 GiB
e13e343c9c
Commit Graph

384 Commits

Author SHA1 Message Date
Juan Linietsky
a1142225bf -split view of property editor and editor settings 2015-12-15 23:39:36 -03:00
Juan Linietsky
b12a2f456c -fixes to theora video ending sooner than expected, fixes #3066 2015-12-15 09:17:32 -03:00
Juan Linietsky
83e0e97214 -implement arrows on tabs, when too many tabs are present, fixes #2806 2015-12-14 10:24:28 -03:00
Rémi Verschelde
4018ea63c7 Merge pull request #3050 from eska014/fix-tree-cell-slider 
Fix editor for TreeItem cells in range mode
 2015-12-13 10:10:33 +01:00
Rémi Verschelde
75e88b8b9e Merge pull request #3049 from eska014/fix-exp-slider 
Fix setting Sliders in exponential mode
 2015-12-13 10:10:25 +01:00
Juan Linietsky
709de124c1 ability to export scene to zip 2015-12-13 01:08:36 -03:00
Juan Linietsky
11eaf019b3 ability to get video player texture 2015-12-12 20:05:26 -03:00
Juan Linietsky
890b462ffb added rotation and scale support to gui controls 2015-12-12 13:54:26 -03:00
Juan Linietsky
9a7ff65751 make popup emit index when id is not defined 2015-12-12 09:07:43 -03:00
eska
a028840ea5 Fix editing TreeItem cells in range mode 
- Show slider when editing range mode tree cells per mouse input
- Hide slider after using keyboard controls to edit range mode tree cells
 2015-12-10 23:53:19 +01:00
eska
5b03af6b73 Fix exponential sliders 2015-12-10 23:48:03 +01:00
Rémi Verschelde
5f3c87691e Merge pull request #3019 from neikeq/spinbox_timer 
Spinbox update range on mouse held
 2015-12-10 15:48:23 +01:00
neikeq
d4051e6eb9 Spinbox: increase/decrease with mouse held 2015-12-10 15:44:16 +01:00
neikeq
5f739a2660 TextEdit: Scroll while selecting with mouse idle 2015-12-09 19:56:47 +01:00
Rémi Verschelde
2cc60386d8 Merge pull request #3005 from TheHX/pr-file-dialog 
Better hidden folders display preferences for editor file dialogs
 2015-12-07 20:40:58 +01:00
neikeq
f499fb6fcf Fix LineEdit cursor 2015-12-07 20:31:21 +01:00
Franklin Sobrinho
42eef3cdc6 Better hidden folders display preferences for editor file dialogs 2015-12-06 19:35:31 -03:00
neikeq
71eaa2d547 Add refresh button to file dialogs 2015-12-04 19:33:30 +01:00
Rémi Verschelde
68d3438a93 Merge pull request #2975 from neikeq/help_scroll_top 
Fix help view not scrolling to the top
 2015-12-02 16:16:18 +01:00
neikeq
11b560d6d4 Fix help view not scrolling to the top 2015-12-02 14:01:46 +01:00
neikeq
c5698fc28e Fix RichTextLabel copy never called 2015-12-02 08:19:33 +01:00
koalefant
c93a005fb6 Script Editor: automatic indentation after a colon 2015-11-29 17:13:29 +01:00
Franklin Sobrinho
43e1b879d0 Add container automatic update when moving a child node 2015-11-28 13:05:39 -03:00
Franklin Sobrinho
493d3c22ca Fix editor help scroll to result 2015-11-27 20:11:49 -03:00
Juan Linietsky
b987d2113b 0theora compilation fixes 2015-11-25 00:28:03 -03:00
Rémi Verschelde
2fbc1445a5 Merge pull request #2870 from neikeq/submenu_pos_fix 
Popup submenu position enhancement
 2015-11-23 11:53:30 +01:00
neikeq
9797b6374b Popup submenu position enhancement 2015-11-22 15:53:22 +01:00
Franklin Sobrinho
5ef23812ac Add more properties to AcceptDialog 2015-11-20 18:25:01 -03:00
Franklin Sobrinho
bc3b5847b0 Fix SplitContainer bool properties 2015-11-19 09:56:04 -03:00
Juan Linietsky
b6084a8a62 Merge pull request #2364 from neikeq/textedit_select 
Some TextEdit selection improvements
 2015-11-19 00:30:39 -03:00
Juan Linietsky
0c3386b2ed Merge pull request #2707 from akien-mga/master 
Cosmetic fixes to SCons buildsystem
 2015-11-18 19:43:28 -03:00
Juan Linietsky
75922c57d6 Merge pull request #2635 from StraToN/tabs-buttons 
Fixed bug : both tab buttons appearing hovered
 2015-11-18 19:15:13 -03:00
Juan Linietsky
762a76630c Merge pull request #2638 from MarianoGnu/master 
add missing default value
 2015-11-18 19:14:37 -03:00
Juan Linietsky
a8f18e1bae Merge pull request #2639 from MarianoGnu/origin 
Fix ButtonGroup broken layout
 2015-11-18 19:14:25 -03:00
Juan Linietsky
b0d3c27d31 Merge pull request #2725 from SaracenOne/line_edit_alignment 
nice!
 2015-11-18 19:01:04 -03:00
Juan Linietsky
8bbde9e6cc Merge pull request #2730 from TheHX/fix_exp_property 
Fix Range exp_edit property
 2015-11-18 19:00:19 -03:00
Juan Linietsky
ee944e0da2 Merge pull request #2734 from neikeq/popupmenu_imp 
Small PopupMenu behaviour changes
 2015-11-18 18:59:56 -03:00
Juan Linietsky
b4f88eb4b6 Merge pull request #2735 from TheHX/fix_tree_checkbox 
Fix Tree checkbox check/uncheck behavior
 2015-11-18 18:59:02 -03:00
Juan Linietsky
ef6fab88be Merge pull request #2747 from MarianoGnu/line_edit 
Add <Select All>(Ctrl+A) shortcut to LineEdit. Fixes #1094
 2015-11-18 18:55:59 -03:00
Juan Linietsky
f2b43e3ec0 Merge pull request #2769 from TheHX/text_edit_improvements 
Implement Ctrl + backspace/delete to delete words
 2015-11-18 18:42:37 -03:00
Juan Linietsky
0bbe1e1657 Merge pull request #2779 from bojidar-bg/patch-5 
Change popup_menu.cpp to deselect on .clear
 2015-11-18 18:36:39 -03:00
Juan Linietsky
3974fbb852 -fixed tabs 2015-11-18 04:47:41 -03:00
Juan Linietsky
081a236c67 -Merged Script and Help tabs 
-Help tabs can be opened many at the same time
-Color temperatures for opened scripts
-Dominant script opening when switching scene tab
 2015-11-17 09:46:08 -03:00
Juan Linietsky
8420c24f7f -better integration of ndee's theme 2015-11-13 20:56:44 -03:00
neikeq
ae65dfa4ec Small PopupMenu changes 2015-11-13 22:03:17 +01:00
Bojidar Marinov
bff8b04f52 Change popup_menu.cpp as proposed in #2011 
Closes #2011
 2015-11-13 12:16:55 +02:00
Franklin Sobrinho
222d112f49 Implement Ctrl + backspace/delete to delete words 2015-11-12 13:35:48 -03:00
neikeq
b70e2b754d TextEdit: Properly scroll vertically when selecting text with mouse drag 2015-11-07 16:04:32 +01:00
MarianoGNU
7828986b1c Add <Select All>(Ctrl+A) shortcut to LineEdit. 2015-11-06 19:02:57 -03:00
Franklin Sobrinho
8d48cf95b9 Add Tree checkbox check/uncheck behavior when pressing enter 2015-11-05 12:20:45 -03:00
Franklin Sobrinho
467ee040c4 Fix Range exp_edit property 2015-11-04 15:38:02 -03:00
Juan Linietsky
dde6396f22 more fixes 2015-11-04 09:54:23 -03:00
Saracen
e3c50ac63d Aligned line edit fix. 2015-11-02 17:37:49 +00:00
Saracen
0006f035eb Added alignment to LineEdit GUI control. 2015-11-02 17:37:47 +00:00
Rémi Verschelde
399b1b0474 Cosmetic fixes to SCons buildsystem 
- Removed trailing spaces
- Made sure all indentation is done using tabs (fixes #39)
- Potentially fixed an identation issue for openssl check
 2015-11-01 20:53:26 +01:00
Juan Linietsky
8f84f4117c -Fixed a bug in scrollcontainer not respecting expand flag 
If you relied on this, make sure the children of your scrollcontainer
is set to expand with the expand flag in either vertical or horizontal axis
 2015-10-25 20:08:18 -03:00
Juan Linietsky
f6a790d58c Merge branch 'master' of https://github.com/okamstudio/godot 2015-10-20 23:55:08 -03:00
Juan Linietsky
d241b2ec1b -work in progress implementation of NDEE's theme It's NOT DONE YET 2015-10-20 23:54:24 -03:00
MarianoGNU
6df7d92379 Fix ButtonGroup broken layout 2015-10-19 17:46:13 -03:00
MarianoGNU
bf4bb3e17b Clamp filling angle instead of normalize 2015-10-19 15:26:00 -03:00
MarianoGNU
4345009a0e add missing default value 2015-10-19 12:21:19 -03:00
Julian Murgia - StraToN
f256e421b5 Fixed minor bug : quicklty pointing alternatively Script button and Close button on a tab showed both buttons as hovered 2015-10-19 12:26:19 +02:00
MarianoGNU
ede0cf20bb Add fill_degrees to limitate radial filling 2015-10-18 01:21:53 -03:00
MarianoGNU
4452e26253 Merge branch 'master' of https://github.com/okamstudio/godot 2015-10-17 23:38:33 -03:00
MarianoGNU
68fb30aaea Add fill modes. Clockwise, Counter-CW and center-offset 2015-10-17 23:37:39 -03:00
Juan Linietsky
7d8f187c33 Merge branch 'master' of https://github.com/okamstudio/godot 2015-10-17 15:49:27 -03:00
Juan Linietsky
1db523d0bb Merge pull request #2274 from MarianoGnu/master 
Improve Visual Shader Editor responsiveness
 2015-10-17 15:31:23 -03:00
Juan Linietsky
6f9631fc51 Merge branch 'master' of https://github.com/okamstudio/godot 2015-10-17 12:48:47 -03:00
Juan Linietsky
be0f7563fb Merge pull request #1899 from guilhermefelipecgs/fix_#1897 
Fix for scroll_to_line and search functions, fix #1897
 2015-10-17 12:14:07 -03:00
Juan Linietsky
c22b627ee3 Merge pull request #2362 from AlexHolly/update-scene-tab-fix 
[UI-FIX] - Update scene tabs on save
 2015-10-17 10:51:45 -03:00
Juan Linietsky
c9ff40e140 Merge pull request #2380 from StraToN/tabs-buttons 
Tab close button + display policies + application on Scenes Tabs
 2015-10-17 10:46:32 -03:00
Juan Linietsky
63033aa646 Merge branch 'master' of https://github.com/okamstudio/godot 2015-10-17 10:30:08 -03:00
Juan Linietsky
ab22203791 misc cleanup 2015-10-17 10:29:54 -03:00
Juan Linietsky
0d2b28377f Merge pull request #2455 from firefly2442/hide-menu-fix 
[UI fix] Hide opened menu when click on menu button
 2015-10-17 10:28:20 -03:00
Juan Linietsky
7060eaaa1b Merge pull request #2481 from firefly2442/cppcheck-arrayindexthencheck 
ran cppcheck, fixed cases where array index is used before limits check
 2015-10-17 10:23:15 -03:00
MarianoGNU
a5ebb52500 Merge branch 'master' of https://github.com/okamstudio/godot 
# Solved Conflicts:
#	tools/editor/property_editor.cpp
 2015-10-16 23:21:39 -03:00
Juan Linietsky
b3cda43a0f Merge branch 'master' of https://github.com/okamstudio/godot 
Conflicts:
	platform/windows/detect.py
 2015-10-13 01:19:32 -03:00
Juan Linietsky
52e756752e ability to change audio track in theora video 2015-10-13 01:17:54 -03:00
firefly2442
692216b86a ran cppcheck, fixed cases where array index is used before limits check 2015-10-12 09:45:44 -05:00
Juan Linietsky
c858515785 Fixed theora playback. Removed theoraplayer. 
Still need to get proper audio output latency in some platforms.
 2015-09-26 14:50:42 -03:00
Juan Linietsky
d5579b1506 Merge pull request #2458 from TheHX/text_edit_hscroll 
Fix HScrollBar of TextEdit
 2015-09-26 08:49:47 -03:00
eska
ce2faae2c5 Fix BaseButtons remaining pressed when hiding them while pressing them down 2015-09-26 03:06:42 +02:00
Juan Linietsky
52eebdc001 Merge pull request #2449 from leezh/label-valign-fix 
reworked Label class
 2015-09-25 11:29:49 -03:00
Juan Linietsky
447c319f2c Merge pull request #2502 from vnen/fix-itemlist-typo 
Fix ItemList typo in binding
 2015-09-25 11:27:50 -03:00
Zher Huei Lee
c38808b5b1 added alignment to BoxContainer 
Allows aligning contents of VBoxContainer and HBoxcontainer without
having to insert expanding spacers.
 2015-09-24 14:07:53 +01:00
George Marques
e6e9e83c2e
Fix typo in ItemList bindings 2015-09-21 14:08:10 -03:00
Franklin Sobrinho
26a715298e Fix HScrollBar of TextEdit, closes #2355 2015-09-09 13:44:31 -03:00
firefly2442
930cb97c7d hide opened menu when click on menu button 2015-09-08 22:48:22 -05:00
Zher Huei Lee
564f3e0302 fix minsize-related issues with Label 
- fixed end of string adding to Label minsize
 - exposed set_clip_text() and is_clipping_text() to the script side
 - text would now never stick outside its boundaries
 - label min-height is now restricted by max_lines_visible
 2015-09-08 10:17:28 +01:00
Zher Huei Lee
a0ba134643 added get_visible_characters() to Label 2015-09-07 22:56:16 +01:00
Zher Huei Lee
7c5cd0c296 reworked Label class 
- no longer inherits Range - instead, more sensible
   function names controlling lines visible
 - more accurate vertical alignment
 - percent_visible preserved even after setting new text
 2015-09-07 19:56:17 +01:00
Juan Linietsky
688047a4c9 -removed resources dock, good bye old friend 2015-09-01 00:49:47 -03:00
Mariano Javier Suligoy
553edf1f25 Merge branch 'master' of https://github.com/okamstudio/godot 
# Solved Conflicts:
#	scene/gui/spin_box.cpp
#	scene/gui/tree.cpp
 2015-08-30 19:39:36 -03:00
Mariano Javier Suligoy
680402cebf Add missing icons, also make MSVC2010 happy 2015-08-30 19:37:23 -03:00
Juan Linietsky
947b283248 -fix compile issue (pow) 
-ask user for track to call nodes when adding call track
 2015-08-30 10:10:51 -03:00
Mariano Javier Suligoy
c688b55019 Merge branch 'master' of https://github.com/okamstudio/godot 
# Solved Conflicts:
#	tools/editor/property_editor.cpp
#	tools/editor/property_editor.h
 2015-08-30 02:48:45 -03:00
Juan Linietsky
7bc9846f16 -multi-selection (shift-click) working in scene tree 2015-08-29 23:46:32 -03:00
Juan Linietsky
3a59747c62 -fixes to capture mode 
-ability to drag spinboxes and tree ranges to change values, like in Unity or Unreal
 2015-08-29 01:43:21 -03:00
Mariano Javier Suligoy
54291c655d Merge branch 'master' of https://github.com/okamstudio/godot 2015-08-24 21:33:00 -03:00
Juan Linietsky
f6e17e37e8 Added new NinePatch control (could be done before with Panel and Stylebox but this is easier) 
Will you be brave enough to try it? :)
 2015-08-24 09:39:16 -03:00
Juan Linietsky
07e9741425 **WARNING BEFORE PULLING** 
This push changes the binary and XML formats and bumps the major version to 2.0. As such, files saved in this version WILL NO LONGER WORK IN PREVIOUS VERSIONS. This compatibility breakage with older versions was required in order to properly provide project refactoring tools.
If I were you, unless you are brave, I would wait a week or two before pulling, in case of bugs :)

Summary of Changes

-New Filesystem dock, with filesystem & tree view modes.
-New refactoring tools, to change or fix dependencies.
-Quick search dialog, to quickly search any file
 2015-08-23 20:15:56 -03:00
Julian Murgia - StraToN
17fbd20673 Added close button to tab. Added 4 display policies for this close button (show always, show never, show active tab only, show hover). Set the scene tabs in editor to follow the hover policy. 2015-08-18 20:27:01 +02:00
neikeq
51fa997cb5 textedit selection improvements 
allows using shift and pointer selection together, and selecting text while scrolling.
tried to make it as similar as possible to most editors.
 2015-08-13 00:34:07 +02:00
Alexander Holland
cff2509ecd close all parent PopupMenus fix 2015-08-12 22:24:21 +02:00
Mariano Javier Suligoy
c88038228a Merge branch 'master' of https://github.com/okamstudio/godot 2015-08-03 17:28:33 -03:00
Mariano Javier Suligoy
d7279ddaf2 Delete selected nodes with the Delete key 2015-07-26 21:57:27 -03:00
Juan Linietsky
07c99e11f5 QOL, script buttons in scene tabs 2015-07-26 10:44:35 -03:00
Mariano Javier Suligoy
5ffd818fb1 Duplicate GraphNode(s) [Control+D] 2015-07-25 21:16:07 -03:00
Mariano Javier Suligoy
bdde79a3f4 Box selection for GraphNodes 2015-07-24 21:59:48 -03:00
Juan Linietsky
d50ebbb441 -added icons for root node types on tabs 2015-07-24 14:18:02 -03:00
Mariano Javier Suligoy
2a43778793 Fix tab indent 2015-07-20 22:15:06 -03:00
Mariano Javier Suligoy
bdd12744fe Select and move multiple nodes at once 2015-07-19 01:48:46 -03:00
Mariano Javier Suligoy
5b71fc45b7 Use popup menu to add new nodes to the shader graph editor in the last clicked location. 2015-07-16 22:38:12 -03:00
Juan Linietsky
95047562d7 Several performance improvements, mainly in loading and instancing scenes and resources. 
A general speedup should be apparent, with even more peformance increase when compiling optimized.

WARNING: Tested and it seems to work, but if something breaks, please report.
 2015-06-29 00:29:49 -03:00
Juan Linietsky
2b64f73b04 more code completion improvements 
-calltip dissapears with more types of keypresses or when pressing ')'
-properly looks into autoloaded scripts or nodes with another script for
script functions/variables/etc.
 2015-06-27 15:52:39 -03:00
Juan Linietsky
a67486a39e improved get_node(), connect(), etc code completion. 
-properly completes text arguments
-includes the "/root" autoloads
 2015-06-26 01:14:49 -03:00
Juan Linietsky
8b61a3c358 Merge pull request #1907 from tommy3/show-hidden-files 
set initial flag 'show_hidden_files' for file dialogs in project manager initialization
 2015-06-23 00:01:55 -03:00
Juan Linietsky
46692cccf2 Merge pull request #2068 from Krzycho666/color_ramp 
ColorRamp new features
 2015-06-23 00:01:01 -03:00
Juan Linietsky
e9bbb97acc Multiple scene editing *POTENTIALLY UNSTABLE* 
-ability to edit multiple scenes at the same time
-resource internal IDs are now persistent, this makes multiple scene
editing possible but maaaaay result in file corruption bugs (tested and
could not find anything but possibility exists because core code
changed, report immediately if you find this).
-properly save settings, layout, etc when edited
-script editing is independent from scene editing now
-show a yellow box when a script belongs to the scene
 2015-06-22 00:04:15 -03:00
Juan Linietsky
8228fea02f missing changes 2015-06-14 02:13:47 -03:00
Juan Linietsky
9a58960d28 some editor window changes 
-ability to make dock position configurable, and it gets saved
-editor starts maximized default
 2015-06-13 22:12:53 -03:00
krzycho
936b6e69f6 founded and fixed a bug that freezed godot when deleting while grabbing color in ColorRamp 2015-06-11 05:18:13 +02:00
krzycho
394276c45f ColorRamp new features: 
- hold alt and left-click to duplicate color
- hold shift while grabbing color node to snap selected one to the nearest one if close enough
 2015-06-11 04:36:11 +02:00
Juan Linietsky
c76900beb8 draw button focus before text and icon 
closes #2047
 2015-06-08 10:36:27 -03:00
Juan Linietsky
7590f3db21 grid container supports separate h and v spacing 
closes #2049
 2015-06-08 10:36:26 -03:00
Juan Linietsky
c7af3146c8 Merge pull request #2007 from Krzycho666/master 
Fixed ui_accept problem
 2015-06-07 00:29:35 -03:00
Juan Linietsky
143265d4cb Merge pull request #1973 from Biliogadafr/ColorRamp 
Replace color phases with color ramp for Particles2D. (need some review/guidance)
 2015-06-07 00:26:35 -03:00
Juan Linietsky
b524b40fdc -fixed many memory initialization issues 
-fixed deadlock on previews thread
-fixed compilation errors on unix
 2015-06-06 22:06:58 -03:00
Juan Linietsky
6974823288 Merge remote-tracking branch 'origin/master' 
Conflicts:
	tools/editor/io_plugins/editor_texture_import_plugin.cpp
 2015-06-06 10:12:09 -03:00
Juan Linietsky
9acab32daa new file dialog! 
-ItemList control for easier lists/thumbnails
-New file dialog, with support for thumbnails, favorites, recent places,
etc
-Moved .fscache out of the project, no more bugs due to committed/pulled
.fscache!
-Dir dialog now sorts directories
 2015-06-06 09:44:38 -03:00
Juan Linietsky
ab99671bb8 -fixes to navigation, so edge-merging is more flexible on conflict 
-add tab support to richtextlabel
-some click fixes to audio stream resampled
-ability to import largetextures (dialog)
 2015-06-01 19:42:34 -03:00
krzycho
14c63565ec Fixed ui_accept problem. It's possible now to make a custom ui_accept action event and pull it. 2015-05-29 23:37:23 +02:00
Biliogadafr
df9d48d9b5 Replace color phases with color ramp for Particles2D. 2015-05-24 21:18:52 +03:00
Juan Linietsky
fec6aaffd8 more fixes 
fix ctrl-a for some cases, mentioned in #1704
fix toggling visibility not updating, fixes #1923
 2015-05-19 23:07:11 -03:00
Juan Linietsky
9f686563d0 fixed latin separation in label, broke it? for cjk 
changed non-separatable character detection so latin works properly.
This is probably incorrect. If you speak chinese, korean or japanese,
please help me fix it.  closes #1935
 2015-05-19 22:26:25 -03:00
Juan Linietsky
221443c5a2 more fixes 
-only refuse to load an older file if version major is different, fixes
#1944
-fix drive letter default value, fixes #1939
 2015-05-19 21:36:35 -03:00
Juan Linietsky
f220183e40 fix a crash situation when starting a thread and other small fixes 2015-05-18 12:45:53 -03:00
tommy3
282c392466 set initial flag 'show_hidden_files' for file dialogs in project manager initialization 2015-05-14 23:50:15 +02:00
Guilherme Felipe
53541c69d4 Fix for scroll_to_line and search functions, fix #1897 
The function scroll_to_line(0) should return ERR_FAIL_INDEX because
the first line is 1.
 2015-05-13 23:35:00 -03:00
Juan Linietsky
d1e4d6e997 -fix clip+center alignment on Button, fixes #1865 2015-05-09 18:29:55 -03:00
Juan Linietsky
65d48d6d39 -Added prints() function, fixes #1132, #1859 
-Tabs work inside built-in log window, fixes #1867
 2015-05-09 18:09:58 -03:00
Juan Linietsky
c99813dc38 Merge pull request #1826 from eehrich/master 
Reviewed compiler warnings: fixed some bugs and formal stuff. (2nd try)
 2015-05-07 20:02:54 -03:00
Juan Linietsky
9de37817bc -removed dynamic_cast on CheckBox, fixes #1830 2015-05-06 09:45:25 -03:00
ehriche
ac9263c680 clearified parenthesis of if construct 2015-05-06 01:39:42 +02:00
ehriche
897a1aade5 optional formal changes 2015-05-06 01:22:31 +02:00
Juan Linietsky
36932a0065 avoid crash on some cases of richtextlabel fill, but odd behavior persists, #1803 2015-05-05 00:37:06 -03:00
Juan Linietsky
74b0e0c296 fix crash in editor when using alt+arrows to indent, thanks adolson and romulox_x 2015-05-05 00:17:22 -03:00
Juan Linietsky
dce8a6c251 Merge pull request #1804 from ricpelo/ricpelo-patch-2 
Wrong use of | instead of ||
 2015-05-04 21:49:12 -03:00
Juan Linietsky
2a02d3f96f fix font import path on windows, closes #1675 2015-05-04 15:06:41 -03:00
Ricardo Pérez
f3542ff838 Wrong use of | instead of || 2015-05-04 19:54:17 +02:00