Commit graph

4825 commits

Author SHA1 Message Date
dfighter1985
b2d137eb07 Merged hotfix to compatibility.
--HG--
branch : compatibility
2015-02-02 02:53:15 +01:00
dfighter1985
f902bf6ed6 Merged mainline
--HG--
branch : hotfix
2015-02-02 02:03:00 +01:00
dfighter1985
e311547a39 Initialize Nel3D in the Object Viewer plugin too.
--HG--
branch : hotfix
2015-02-01 20:29:26 +01:00
kaetemi
bb8eb7dcec Fix mirror type sizes
--HG--
branch : hotfix
2014-12-22 16:39:54 +01:00
kaetemi
79b6fcae28 Merge with default
--HG--
branch : compatibility
2014-12-22 14:24:13 +01:00
kaetemi
0d1c319b2f Added tag ryzomcore/v0.11.2 for changeset 9e583b717fd6 2014-12-22 14:22:12 +01:00
kaetemi
cc59df1c14 ryzomcore/v0.11.2 2014-12-22 14:21:54 +01:00
kaetemi
f9c81f3740 ryzomcore/v0.11.2
--HG--
branch : hotfix
2014-12-22 14:21:01 +01:00
kaetemi
2095646575 Move to hotfix: 9878ab4ebe5e
--HG--
branch : compatibility
2014-12-22 14:15:38 +01:00
dfighter1985
4d67a41f94 CCtrlTextbutton checkcoords should call it's text's checkcoords method. Fix #219.
--HG--
branch : hotfix
2014-12-21 22:55:27 +01:00
dfighter1985
d62f7a21a7 CCtrlTextbutton checkcoords should call it's text's checkcoords method. Fix #219.
--HG--
branch : compatibility
2014-12-21 22:55:27 +01:00
kaetemi
59a5cb7e6b Fix crash with patch mesh attach
--HG--
branch : hotfix
2014-12-04 13:21:12 +01:00
kaetemi
358f19acae Merge with ryzomcore/v0.11.1
--HG--
branch : compatibility
2014-11-24 15:03:07 +01:00
kaetemi
33c1dcc93d Added tag ryzomcore/v0.11.1 for changeset e3fe4855f22c 2014-11-24 15:02:00 +01:00
kaetemi
a64c4b962c Merge with v0.11 2014-11-24 15:01:48 +01:00
kaetemi
9087228100 Merge with hotfix
--HG--
branch : v0.11
2014-11-24 15:01:17 +01:00
kaetemi
6b1ea30f9c ryzomcore/v0.11.1
--HG--
branch : hotfix
2014-11-24 14:57:36 +01:00
kaetemi
1676b3b46f Fix #218 erratic mouse behaviour
--HG--
branch : hotfix
2014-11-24 14:53:28 +01:00
kaetemi
0a765bde8c Fix bug causing patch painter fail to open more than once
--HG--
branch : hotfix
2014-11-19 16:30:14 +01:00
kaetemi
e27a155270 Create hotfix branch
--HG--
branch : hotfix
2014-11-24 14:51:35 +01:00
kaetemi
53b3a51b54 Merge with ryzomcore/v0.11.0
--HG--
branch : compatibility
2014-11-10 23:47:23 +01:00
kaetemi
d65a1cbd81 Added tag ryzomcore/v0.11.0 for changeset edaa3624a564 2014-11-10 23:41:33 +01:00
kaetemi
6b8762a7f5 Merge with v0.11 2014-11-10 23:41:11 +01:00
kaetemi
8789f9c83c Branch v0.11
--HG--
branch : v0.11
2014-11-10 23:36:01 +01:00
kaetemi
0c1ff0df2a ryzomcore/v0.11.0
--HG--
branch : develop
2014-11-10 23:34:41 +01:00
kaetemi
2df9cb5f87 Fix PHP error "Only variables should be passed by reference"
--HG--
branch : develop
2014-11-08 00:29:50 +01:00
kaetemi
ef2415257b Fix PHP error "Only variables should be passed by reference"
--HG--
branch : develop
2014-11-07 23:51:42 +01:00
kaetemi
70ace8b7d4 Print callstack
--HG--
branch : develop
2014-11-07 23:37:39 +01:00
kaetemi
91ad193104 Fix patchman scripts
--HG--
branch : develop
2014-11-07 19:32:18 +01:00
kaetemi
ee92cb0702 Update default path
--HG--
branch : develop
2014-11-07 19:21:05 +01:00
kaetemi
d30cca34f0 Backed out merge changeset: 361eb082ec5e
Does not compile. FindLibLZMA missing on Ubunty 12.04 LTS

--HG--
branch : develop
2014-11-07 19:17:43 +01:00
kaetemi
c3cf5c7af4 Update default patchman cfg
--HG--
branch : develop
2014-11-07 19:16:45 +01:00
kaetemi
933420690b Change patchman example domain
--HG--
branch : develop
2014-11-07 19:02:50 +01:00
Jan Boon
e2eb5d739c Merged in nimetu/ryzomcore/html-table-rendering (pull request #92)
Some improvements to table rendering

--HG--
branch : develop
2014-10-18 04:44:34 +02:00
Nimetu
78e1bb6147 Fix html img not showing on some cases, clean up addImage method
--HG--
branch : develop
2014-10-18 01:20:56 +03:00
Nimetu
48b346fed8 Fix crash when using textarea without form
--HG--
branch : develop
2014-10-18 00:15:51 +03:00
Nimetu
0a1a1244ae Change table defaults valign=middle, cellpadding=1, cellspacing=2
--HG--
branch : html-table-rendering
2014-10-15 00:02:38 +03:00
Nimetu
799705b7ed Render table with rowspan, colspan.
Borders, if enabled, adds +1 to cell padding.

--HG--
branch : html-table-rendering
2014-10-14 15:29:06 +03:00
Nimetu
a53b9305a2 Add rowspan and colspan attributes
--HG--
branch : html-table-rendering
2014-10-14 15:26:14 +03:00
Nimetu
11927cca93 Render table and cell borders
--HG--
branch : html-table-rendering
2014-10-13 01:59:20 +03:00
Nimetu
283cbe8092 Add bordercolor attribute to table tag
--HG--
branch : html-table-rendering
2014-10-13 01:10:46 +03:00
Nimetu
2de4315027 Fix table cellpadding
--HG--
branch : html-table-rendering
2014-10-12 17:43:18 +03:00
Laszlo Kis-Adam
a898d833eb Merged in dfighter1985/ryzomcore/dfighter-tools (pull request #91)
Added limits to pch, should fix Linux build.

--HG--
branch : develop
2014-10-11 13:05:57 +02:00
dfighter1985
fe89e8f77c Added limits to pch, should fix Linux build.
--HG--
branch : dfighter-tools
2014-10-11 13:04:03 +02:00
Laszlo Kis-Adam
df82b02723 Merged in dfighter1985/ryzomcore/dfighter-tools (pull request #90)
GUI Editor improvements
Widget dragging, group selection, multiple selection, grouping, ungrouping.

--HG--
branch : develop
2014-10-11 02:18:33 +02:00
dfighter1985
481298b9f1 Merged develop
--HG--
branch : dfighter-tools
2014-10-11 02:15:07 +02:00
dfighter1985
7b45a05562 Added support for grouping widgets.
--HG--
branch : dfighter-tools
2014-10-11 00:42:43 +02:00
dfighter1985
aac2fd41a1 Allow multiselection.
--HG--
branch : dfighter-tools
2014-10-10 20:25:25 +02:00
dfighter1985
8cec8de3a0 Unselect selection when clicking 'nothing'.
--HG--
branch : dfighter-tools
2014-10-10 17:33:57 +02:00
kervala
e34ba83f26 Minor changes
--HG--
branch : develop
2014-10-10 13:08:14 +02:00