Commit graph

131 commits

Author SHA1 Message Date
kaetemi
8fa42c1f32 Visual Studio 2013 compilation support for NLMISC 2015-02-20 16:24:19 +01:00
dfighter1985
7d88d84a5c Unfortunately on Windows argc and argv parameters are unreliable inside a Qt application, so I had to hardcode the report file name. :( 2015-02-20 02:35:11 +01:00
dfighter1985
021b034e97 Unfortunately on Windows argc and argv parameters are unreliable inside a Qt application, so I had to hardcode the report file name. :( 2015-02-20 02:35:11 +01:00
dfighter1985
c1da7d663e Probably a good idea to look for rcerror as rcerror.exe on Windows. 2015-02-20 02:03:33 +01:00
dfighter1985
271fbb8013 Probably a good idea to look for rcerror as rcerror.exe on Windows. 2015-02-20 02:03:33 +01:00
dfighter1985
9825a77b79 CMsgBoxDisplayer should not present a dialog now, but write the report to a file then attempt to launch the error reporter application. Which ofc doesn't exist yet in this commit. 2015-02-17 03:12:26 +01:00
dfighter1985
c649dce53b CMsgBoxDisplayer should not present a dialog now, but write the report to a file then attempt to launch the error reporter application. Which ofc doesn't exist yet in this commit. 2015-02-17 03:12:26 +01:00
kervala
ab4669a76f Merge with hotfix 2015-02-14 19:29:36 +01:00
kervala
4ee76e6182 Fixed: Unnamed semaphores are deprecated under OS X 2015-02-14 17:52:15 +01:00
kervala
9cb149e17e Merge with hotfix 2015-02-14 14:31:19 +01:00
kervala
4b5bad763c Fixed: Warning with multichars to int conversion 2015-02-14 14:25:50 +01:00
kervala
fc68f4da14 Fixed: Compilation 2015-02-14 13:57:06 +01:00
kervala
2ad2fea0bc Changed: Replaced atoi and atof by NLMISC::fromString 2015-02-14 13:46:21 +01:00
kervala
3b38f01d5f Changed: Minor changes 2015-02-14 12:47:03 +01:00
kervala
c510dcde2e Fixed: Compilation warnings 2015-02-14 12:41:59 +01:00
dfighter1985
8a34288795 Merged in hotfix (pull request #114)
Merging hotfix branch
2015-02-13 19:48:42 +01:00
dfighter1985
2fadeccaf1 Handle relative paths when loading .worldedit files in World Editor. 2015-02-08 00:24:29 +01:00
dfighter1985
ad8d9fa391 Merged in hotfix (pull request #111)
Merge hotfix
2015-02-06 02:32:03 +01:00
dfighter1985
eca3a92a08 Erm. Initialize Nel3D on other platforms too... 2015-02-06 02:29:33 +01:00
dfighter1985
14acd08260 Merged hotfix 2015-02-02 03:54:50 +01:00
dfighter1985
afde74cbbe Merged mainline 2015-02-02 02:03:00 +01:00
dfighter1985
b7104c8d57 Initialize Nel3D in the Object Viewer plugin too. 2015-02-01 20:29:26 +01:00
kervala
0ebca0834b Changed: Optimize sorting of files (instead of doing it several times for each directory, do it only once) 2015-01-23 21:11:15 +01:00
kervala
713dcf97ee Changed: Replaced atoi and atof by NLMISC::fromString 2015-01-13 19:47:14 +01:00
kervala
09e7fe8f3f Changed: Minor changes 2015-01-13 14:11:07 +01:00
kervala
0b6bfe2abd Fixed: Compilation with OS X SDK 10.10 2015-01-10 20:33:02 +01:00
kervala
0a6f13de74 Fixed: Removed raw mouse mode for OS X too 2015-01-10 19:55:05 +01:00
kervala
6ec23c8a0e Fixed: OpenGL driver compilation 2015-01-10 19:53:27 +01:00
kervala
7c0fe6703b Merge 2015-01-10 19:08:55 +01:00
kervala
c3def674ba Changed: Minor changes 2015-01-10 18:45:14 +01:00
kervala
3047e92d38 Fixed: OpenGL ES driver compilation 2015-01-10 18:41:54 +01:00
kervala
ba4522f4b9 Changed: More aliases for OpenGL ES functions and defines to simplify code 2015-01-10 18:41:18 +01:00
Jan Boon
a593a79989 Merged in nimetu/ryzomcore/fix-issue-225 (pull request #98)
CGroupEditBox: ignore enter key when ctrl is pressed (ctrl+m combo) (issue #225)
2015-01-09 18:09:17 +01:00
Nimetu
94a967381e Fix html submit button value that is included with form data (issue #226) 2015-01-09 13:11:20 +02:00
Nimetu
07c99a4b3d CGroupEditBox: ignore enter key when ctrl is pressed (ctrl+m combo) (issue #225) 2015-01-09 12:59:53 +02:00
kervala
1e03bedc78 Changed: Give priority to Luabind library filenames with specific Lua version 2014-12-26 13:43:20 +01:00
kervala
935ee947a6 Changed: Minor changes 2014-12-26 13:38:02 +01:00
kaetemi
4b05cce7e4 Merge with default 2014-12-22 14:26:26 +01:00
kaetemi
44d9130a68 ryzomcore/v0.11.2 2014-12-22 14:21:54 +01:00
kaetemi
d715518f70 Move to hotfix: 287c1142e5ea 2014-12-22 14:08:29 +01:00
dfighter1985
6418129fd2 Ported changeset 9878ab4: CCtrlTextbutton checkcoords should call it's text's checkcoords method. Fix #219. 2014-12-22 01:26:04 +01:00
dfighter1985
d80b8ef4f9 CCtrlTextbutton checkcoords should call it's text's checkcoords method. Fix #219. 2014-12-21 22:55:27 +01:00
kaetemi
370a5f5e84 Merge 2014-12-09 23:10:27 +01:00
botanicvelious
8df694b94e Update with added Domain_Auto_Add settings 2014-12-07 05:01:05 -08:00
kaetemi
fd73b48d36 Fix bug causing patch painter fail to open more than once 2014-11-19 16:30:14 +01:00
dfighter1985
836e2814d8 CDBViewQuantity shouldn't crash in the editor. 2014-10-20 22:49:46 +02:00
dfighter1985
d2dbcfa2eb it's not a bad idea to store the value in the right variable... 2014-10-20 22:21:59 +02:00
dfighter1985
796cccab19 DBViewNumber shouldn't crash anymore. 2014-10-20 20:57:08 +02:00
dfighter1985
3c26e7a981 When setting the Id of the decorated edit box, set the Id of the text as well. 2014-10-20 18:51:53 +02:00
Jan Boon
bee43e31bb Merged in nimetu/ryzomcore/html-table-rendering (pull request #92)
Some improvements to table rendering
2014-10-18 04:44:34 +02:00
Nimetu
ea2e8d1b92 Fix html img not showing on some cases, clean up addImage method 2014-10-18 01:20:56 +03:00
Nimetu
e9256d3b0b Fix crash when using textarea without form 2014-10-18 00:15:51 +03:00
dfighter1985
f79cf8a3bc set the Id of the text properly when loading the decorated edit box. 2014-10-17 22:25:30 +02:00
dfighter1985
5d35829335 Create the viewtext of the decorated edit box when the box is created, also adjust it so the text is drawn to the right of the left texture. 2014-10-17 21:18:26 +02:00
dfighter1985
1a39ae61c5 Fixed a typo that messed up the textures of decorated editbox. 2014-10-17 16:01:50 +02:00
dfighter1985
7bc7a63317 Save decorated edit box as such. 2014-10-16 21:03:58 +02:00
dfighter1985
ea42036580 Update decorated edit box decoration coords while dragging. 2014-10-16 20:58:47 +02:00
dfighter1985
28d2b27ac6 Allow selection of CGroupEditBox. 2014-10-16 20:29:36 +02:00
dfighter1985
2e06c88f71 Implemented CGroupEditBoxDecor a decorated CGroupEditBox. 2014-10-16 20:25:19 +02:00
dfighter1985
2a8345ef9f TEMPORARILY add the login texture map to new project by default. 2014-10-15 19:54:35 +02:00
Nimetu
2020d49352 Change table defaults valign=middle, cellpadding=1, cellspacing=2 2014-10-15 00:02:38 +03:00
Nimetu
56852c5a6b Render table with rowspan, colspan.
Borders, if enabled, adds +1 to cell padding.
2014-10-14 15:29:06 +03:00
Nimetu
1af765330d Add rowspan and colspan attributes 2014-10-14 15:26:14 +03:00
Nimetu
36ba6552c0 Render table and cell borders 2014-10-13 01:59:20 +03:00
Nimetu
8ffde79912 Add bordercolor attribute to table tag 2014-10-13 01:10:46 +03:00
Nimetu
49eb6711cd Fix table cellpadding 2014-10-12 17:43:18 +03:00
dfighter1985
33beeeca82 Added limits to pch, should fix Linux build. 2014-10-11 13:04:03 +02:00
Laszlo Kis-Adam
f90fecf5bd Merged in dfighter1985/ryzomcore/dfighter-tools (pull request #94)
Just too lazy to push directly
2014-10-15 19:48:23 +02:00
dfighter1985
8066656c09 Fix parent pos and size parsing. 2014-10-15 19:46:43 +02:00
kaetemi
c7cd777479 Don't use I18N when the required ui prefix is not in the tooltip text (convention actually dictates uitt as tooltip prefix) 2014-10-14 23:45:08 +02:00
kaetemi
a1cdd16bd4 Shadow should not be taken into account for font height, breaks vertical centering 2014-10-14 23:45:08 +02:00
Laszlo Kis-Adam
0876456a22 Merged in dfighter1985/ryzomcore/dfighter-tools (pull request #93)
Further GUI Editor improvements
2014-10-13 20:17:57 +02:00
dfighter1985
b1f81229d0 When creating a new GUI set the base color to white. 2014-10-13 17:47:42 +02:00
dfighter1985
78e64abd69 Pos and Size parent setters should now use the widget directly as well. 2014-10-13 15:43:10 +02:00
dfighter1985
6b3e8d3766 Size parent is now queried directly from the widget. 2014-10-13 15:26:47 +02:00
dfighter1985
c8dd68418f GUI Editor should show the right parent position. 2014-10-12 23:07:08 +02:00
dfighter1985
085f500557 Parent positions should now be saved right again. 2014-10-12 23:05:22 +02:00
dfighter1985
d46ad7c2d0 Implemented new action. 2014-10-11 21:43:28 +02:00
dfighter1985
fe179823c0 Moved CRootGroup out of CInterfaceParser. 2014-10-11 19:30:30 +02:00
dfighter1985
0038ae03c4 CInterfaceParser in editor mode should look for files in the working directory first. 2014-10-11 16:26:38 +02:00
dfighter1985
dec5d7fe2d Restored lost class names 2014-10-11 14:44:16 +02:00