Commit graph

5213 commits

Author SHA1 Message Date
kervala
c561bd8d82 Merge with hotfix
--HG--
branch : compatibility
2015-02-14 15:20:19 +01:00
kervala
e9b5cc4410 Merge with hotfix
--HG--
branch : develop
2015-02-14 15:19:49 +01:00
kervala
4b397f3e5b Changed: Improved User Agent management
--HG--
branch : hotfix
2015-02-14 15:18:53 +01:00
kervala
47051791fa Changed: Added RYZOM_COMPATIBILITY_VERSION version string for compatibility branch
--HG--
branch : compatibility
2015-02-14 15:09:18 +01:00
kervala
eb05c962de Merge with develop
--HG--
branch : compatibility
2015-02-14 14:36:37 +01:00
kervala
49b18b72b5 Merge with hotfix
--HG--
branch : compatibility
2015-02-14 14:32:44 +01:00
kervala
e8b0765e7c Merge with hotfix
--HG--
branch : develop
2015-02-14 14:31:19 +01:00
kervala
cdd35f58a1 Fixed: Warning with multichars to int conversion
--HG--
branch : hotfix
2015-02-14 14:25:50 +01:00
kervala
8472a6ff7f Fixed: Compilation
--HG--
branch : hotfix
2015-02-14 13:57:06 +01:00
kervala
e0c95a74af Changed: Updated CMale modules
--HG--
branch : hotfix
2015-02-14 13:47:37 +01:00
kervala
943131b802 Changed: Replaced atoi and atof by NLMISC::fromString
--HG--
branch : hotfix
2015-02-14 13:46:21 +01:00
kervala
1742997984 Changed: Minor changes
--HG--
branch : hotfix
2015-02-14 13:34:45 +01:00
kervala
d774dcac3e Changed: Use Ryzom user agent for CURL
--HG--
branch : hotfix
2015-02-14 13:19:53 +01:00
kervala
49bbb10b58 Fixed: Missing namespace
--HG--
branch : hotfix
2015-02-14 13:19:09 +01:00
kervala
1960f5c448 Changed: std::string already initialized to en empty string
--HG--
branch : hotfix
2015-02-14 13:18:51 +01:00
kervala
76e64fcb42 Changed: Used INVALID_AI_INSTANCE in CUsedContinent::getInstanceForContinent
--HG--
branch : hotfix
2015-02-14 13:03:27 +01:00
kervala
ee7008ae02 Changed: Possible bug if string not found
--HG--
branch : hotfix
2015-02-14 12:54:17 +01:00
kervala
6e1abd80d3 Fixed: Unable to patch when Ryzom was located on a mounted FS
--HG--
branch : hotfix
2015-02-14 12:52:57 +01:00
kervala
165524d1df Changed: Used PCH for admin_modules
--HG--
branch : hotfix
2015-02-14 12:48:29 +01:00
kervala
4de072865b Changed: Check getSpawn() before calling its methods
--HG--
branch : hotfix
2015-02-14 12:47:54 +01:00
kervala
b0937ec02b Changed: Minor changes
--HG--
branch : hotfix
2015-02-14 12:47:03 +01:00
kervala
6853497593 Changed: Replaced atof by NLMISC::fromString
--HG--
branch : hotfix
2015-02-14 12:43:29 +01:00
kervala
3039428094 Fixed: Compilation warnings
--HG--
branch : hotfix
2015-02-14 12:41:59 +01:00
kervala
eb5fecf8ce Fixed: Only keep Release and Debug configurations in CMake
--HG--
branch : hotfix
2015-02-14 12:06:19 +01:00
dfighter1985
ab2a455db2 Merged in hotfix (pull request #115)
Merging hotfix branch

--HG--
branch : compatibility
2015-02-13 19:49:33 +01:00
dfighter1985
225d786e7f Merged in hotfix (pull request #114)
Merging hotfix branch

--HG--
branch : develop
2015-02-13 19:48:42 +01:00
dfighter1985
b381ef6fae Add the data directory to the search path.
--HG--
branch : hotfix
2015-02-11 20:42:31 +01:00
dfighter1985
26f1cc6fac Added ryzom.ttf, it will be installed to the data directory.
--HG--
branch : hotfix
2015-02-11 19:55:16 +01:00
dfighter1985
79cd6bfaee Include rgba.h in libwww.h. Thanks Nimetu!
--HG--
branch : hotfix
2015-02-09 20:07:35 +01:00
dfighter1985
28b0a0a040 Change the cursor to a wait cursor when applying settings in the settings dialog.
--HG--
branch : hotfix
2015-02-09 19:55:27 +01:00
dfighter1985
44c6f93b26 We can now set whether to use OpenGL in WE in the WE settings page. For whatever reason VMware despises the OpenGL viewport so it's a good idea to turn it off inside VMware.
--HG--
branch : hotfix
2015-02-09 19:49:16 +01:00
dfighter1985
b530d99bf1 Renamed the studio startup settings dialog to avoid name conflict with the core plugin's settings dialog.
--HG--
branch : hotfix
2015-02-09 17:54:27 +01:00
dfighter1985
b881f9558b Read the GUI Editor widget and expression definition XML files from the right directory.
--HG--
branch : hotfix
2015-02-09 01:48:39 +01:00
dfighter1985
a2c96c3053 Install the GUI Editor widget and expression definition files to the data dir.
--HG--
branch : hotfix
2015-02-08 23:46:33 +01:00
dfighter1985
46cc31d0d0 Handle relative paths when loading .worldedit files in World Editor.
--HG--
branch : hotfix
2015-02-08 00:24:29 +01:00
dfighter1985
9ca3370dd4 Merged in hotfix (pull request #112)
Merge hotfix

--HG--
branch : compatibility
2015-02-06 02:32:37 +01:00
dfighter1985
7f35c5959a Merged in hotfix (pull request #111)
Merge hotfix

--HG--
branch : develop
2015-02-06 02:32:03 +01:00
dfighter1985
5e55a7b7bb Erm. Initialize Nel3D on other platforms too...
--HG--
branch : hotfix
2015-02-06 02:29:33 +01:00
dfighter1985
18c2e7ff0e Merged in hotfix (pull request #109)
Merge hotfix branch

--HG--
branch : compatibility
2015-02-06 00:46:23 +01:00
dfighter1985
c85b83fcdb Merged in hotfix (pull request #108)
Merge hotfix branch.

--HG--
branch : develop
2015-02-06 00:45:36 +01:00
dfighter1985
6c153a30b4 CPack should use the install prefix.
--HG--
branch : hotfix
2015-02-06 00:31:51 +01:00
dfighter1985
ea3b16069b We need the LIGO config file, not directory in the first start settings dialog.
--HG--
branch : hotfix
2015-02-05 23:50:38 +01:00
dfighter1985
9073cf72df Merged in hotfix (pull request #106)
Merge hotfix

--HG--
branch : compatibility
2015-02-02 23:32:55 +01:00
dfighter1985
972d270bfc Merged in hotfix (pull request #105)
Merge hotfix

--HG--
branch : develop
2015-02-02 23:32:08 +01:00
dfighter1985
bdb633cf83 Use release squish if debug not found. Fixes s3tc compressor tool build.
--HG--
branch : hotfix
2015-02-02 23:25:11 +01:00
dfighter1985
e7066c1384 Some CPack renames.
--HG--
branch : hotfix
2015-02-02 22:51:43 +01:00
dfighter1985
35c870c793 Install tile editor's plugin spec to the right directory.
--HG--
branch : hotfix
2015-02-02 22:41:29 +01:00
dfighter1985
2d308dc6e7 Fixed build of Object Viewer Widget Qt ( old, not part of Studio ).
--HG--
branch : hotfix
2015-02-02 22:01:16 +01:00
dfighter1985
e21d926336 Merged hotfix
--HG--
branch : develop
2015-02-02 03:54:50 +01:00
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
kervala
6205b16fbf Changed: Optimize sorting of files (instead of doing it several times for each directory, do it only once)
--HG--
branch : develop
2015-01-23 21:11:15 +01:00
kervala
eea09d8893 Fixed: Guilds with same characters and not same spaces
--HG--
branch : develop
2015-01-21 13:20:56 +01:00
Nimetu
53f6adb041 Include chat message channel/type to chatlog file
--HG--
branch : issue-221
2015-01-15 20:08:28 +02:00
kervala
b26e7f4c1b Fixed: Compilation
--HG--
branch : develop
2015-01-13 20:35:34 +01:00
kervala
3aa448ba24 Changed: Replaced atoi and atof by NLMISC::fromString
--HG--
branch : develop
2015-01-13 19:47:14 +01:00
kervala
b70e8d3e7b Fixed: Compilation
--HG--
branch : develop
2015-01-13 15:15:07 +01:00
kervala
5ee2864491 Fixed: Compilation
--HG--
branch : develop
2015-01-13 15:08:13 +01:00
kervala
303f7d2e79 Changed: Minor changes
--HG--
branch : develop
2015-01-13 14:11:07 +01:00
kervala
704610668d Changed: Replaced ~0 by corresponding std::numeric_limits<T>::max()
--HG--
branch : develop
2015-01-13 13:47:19 +01:00
kaetemi
dade81e02e Lightmap debug message
--HG--
branch : develop
2015-01-13 13:21:56 +01:00
kaetemi
1ab170b7d8 Unhide layers in max export
--HG--
branch : develop
2015-01-13 13:21:56 +01:00
kervala
bc78734602 Changed: Fixed a wrong copy-paste
--HG--
branch : develop
2015-01-11 18:27:06 +01:00
kervala
8fc8c3aa39 Changed: Use defined directories prefixed by a default directory
--HG--
branch : develop
2015-01-11 18:01:32 +01:00
kervala
08c557ae76 Changed: Allow to use a readable and writable data path for IG patch (usefull when data are read only)
--HG--
branch : develop
2015-01-11 15:06:02 +01:00
kervala
3367eb3205 Changed: Append getAppBundlePath() to search paths under OS X
--HG--
branch : develop
2015-01-11 14:59:15 +01:00
kervala
acf677e635 Changed: Don't use replaceApplicationDirToken anymore
--HG--
branch : develop
2015-01-11 14:57:40 +01:00
kervala
3bca3f41cc Changed: Typo
--HG--
branch : develop
2015-01-11 14:56:51 +01:00
kervala
fad0e9af4e Fixed: Compilation with OS X SDK 10.10
--HG--
branch : develop
2015-01-10 20:33:02 +01:00
kervala
e8ff07fe7d Fixed: Removed raw mouse mode for OS X too
--HG--
branch : develop
2015-01-10 19:55:05 +01:00
kervala
5b9ac59f49 Fixed: OpenGL driver compilation
--HG--
branch : develop
2015-01-10 19:53:27 +01:00
kervala
418e0ee7b7 Merge
--HG--
branch : develop
2015-01-10 19:08:55 +01:00
kervala
99c88bd515 Changed: Minor changes
--HG--
branch : develop
2015-01-10 18:45:14 +01:00
kervala
2869d5f1ac Fixed: OpenGL ES driver compilation
--HG--
branch : develop
2015-01-10 18:41:54 +01:00
kervala
0f22ea7777 Changed: More aliases for OpenGL ES functions and defines to simplify code
--HG--
branch : develop
2015-01-10 18:41:18 +01:00
Jan Boon
d360f78a1c Merged in nimetu/ryzomcore/fix-issue-225 (pull request #98)
CGroupEditBox: ignore enter key when ctrl is pressed (ctrl+m combo) (issue #225)

--HG--
branch : develop
2015-01-09 18:09:17 +01:00
Nimetu
85f63b7db3 Fix html submit button value that is included with form data (issue #226)
--HG--
branch : fix-issue-226
2015-01-09 13:11:20 +02:00
Nimetu
fbea1d2173 CGroupEditBox: ignore enter key when ctrl is pressed (ctrl+m combo) (issue #225)
--HG--
branch : fix-issue-225
2015-01-09 12:59:53 +02:00
kervala
4fc639671c Changed: Check for string length
--HG--
branch : develop
2014-12-26 13:44:35 +01:00
kervala
ec12e6a75e Changed: Allow to enable UAC for Windows client
--HG--
branch : develop
2014-12-26 13:44:03 +01:00
kervala
f745f82455 Changed: Give priority to Luabind library filenames with specific Lua version
--HG--
branch : develop
2014-12-26 13:43:20 +01:00
kervala
6596af9682 Changed: Minor changes
--HG--
branch : develop
2014-12-26 13:38:02 +01:00
kervala
3bfcd8644d Changed: Minor changes
--HG--
branch : develop
2014-12-26 13:12:56 +01:00
kaetemi
0a7462f7e1 Merge with hotfix
--HG--
branch : develop
2014-12-22 16:40:12 +01:00
kaetemi
bb8eb7dcec Fix mirror type sizes
--HG--
branch : hotfix
2014-12-22 16:39:54 +01:00
kaetemi
c03c0f532b Merge with default
--HG--
branch : develop
2014-12-22 14:26:26 +01:00
kaetemi
79b6fcae28 Merge with default
--HG--
branch : compatibility
2014-12-22 14:24:13 +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
kaetemi
11ae94ab21 Move to feature-light_cycle: c5207e1f862a
--HG--
branch : develop
2014-12-22 14:10:37 +01:00
kaetemi
b9d372b144 Backed out changeset: 3694176c26bf
--HG--
branch : develop
2014-12-22 14:08:54 +01:00
kaetemi
a43fb4dba8 Move to hotfix: 287c1142e5ea
--HG--
branch : develop
2014-12-22 14:08:29 +01:00
dfighter1985
f189a98422 Ported changeset 9878ab4: CCtrlTextbutton checkcoords should call it's text's checkcoords method. Fix #219.
--HG--
branch : develop
2014-12-22 01:26:04 +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
93d5ffddb6 Override sun direction from sky dome [breaks packed sheets]
--HG--
branch : develop
2014-12-12 21:17:13 +01:00
kaetemi
eb2f4555b1 Also export non-root shapes
--HG--
branch : develop
2014-12-12 21:17:13 +01:00
kaetemi
5346da559e Merge
--HG--
branch : develop
2014-12-12 01:24:56 +01:00
kaetemi
0c77c91e95 Adjust sky batch
--HG--
branch : develop
2014-12-12 01:22:19 +01:00
kaetemi
c3df884b13 Allow different light cycle for different continents [breaks packed sheets]
--HG--
branch : develop
2014-12-12 01:22:19 +01:00
kaetemi
44286f7ade Add sky batch script
--HG--
branch : develop
2014-12-12 01:22:18 +01:00
kaetemi
f411d2b230 Fix choppy sky animation
--HG--
branch : develop
2014-12-12 01:22:18 +01:00
kaetemi
7fbe24f27f Merge
--HG--
branch : develop
2014-12-09 23:10:27 +01:00
kaetemi
7cb61f8796 Merge
--HG--
branch : develop
2014-12-09 23:07:58 +01:00
kaetemi
da166c81db Add zone snapshot script example
--HG--
branch : develop
2014-12-09 23:06:08 +01:00
kaetemi
4c4b96bcfd Fix NeLLigoMakeSnapShot
--HG--
branch : develop
2014-12-09 23:06:08 +01:00
kaetemi
58590a9e7e Fix offscreen rendering mode
--HG--
branch : develop
2014-12-09 23:06:08 +01:00
kaetemi
6db29c375a Add script to generate zone names
--HG--
branch : develop
2014-12-09 23:06:07 +01:00
kaetemi
56339c6f93 Handle window close message in painter
--HG--
branch : develop
2014-12-09 23:06:07 +01:00
botanicvelious
1df52a45ad add some additional checking for database errors
--HG--
branch : develop
2014-12-07 06:42:57 -08:00
botanicvelious
a79e141193 Update with added Domain_Auto_Add settings
--HG--
branch : develop
2014-12-07 05:01:05 -08:00
kaetemi
07286c14d1 Adjust patch orientation script
--HG--
branch : develop
2014-12-04 13:28:30 +01:00
kaetemi
90f1234ed0 Add key in patch painter to reset a patch mesh
--HG--
branch : develop
2014-12-04 13:21:45 +01:00
kaetemi
b762356a16 Merge with hotfix
--HG--
branch : develop
2014-12-04 13:21:40 +01:00
kaetemi
59a5cb7e6b Fix crash with patch mesh attach
--HG--
branch : hotfix
2014-12-04 13:21:12 +01:00
kaetemi
39c776ec30 Add script to orient zone patches automatically
--HG--
branch : develop
2014-12-03 15:16:39 +01:00
kaetemi
ff283f5070 Increase patch painter distance
--HG--
branch : develop
2014-12-03 15:16:39 +01:00
kaetemi
dfe0b2977a Separate version string
--HG--
branch : develop
2014-11-24 16:07:17 +01:00
kaetemi
7bdf719cb9 Adjust version
--HG--
branch : develop
2014-11-24 15:04:53 +01:00
kaetemi
91a4207f93 Merge with hotfix
--HG--
branch : develop
2014-11-24 15:04:16 +01:00
kaetemi
358f19acae Merge with ryzomcore/v0.11.1
--HG--
branch : compatibility
2014-11-24 15:03:07 +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
fef6543e0c Fix bug causing patch painter fail to open more than once
--HG--
branch : develop
2014-11-19 16:30:14 +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
f05c52aa0b Remove PIC library
--HG--
branch : develop
2014-11-19 16:20:14 +01:00
kaetemi
53b3a51b54 Merge with ryzomcore/v0.11.0
--HG--
branch : compatibility
2014-11-10 23:47:23 +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
dfighter1985
0ac94e3e72 CDBViewQuantity shouldn't crash in the editor.
--HG--
branch : dfighter-tools
2014-10-20 22:49:46 +02:00
dfighter1985
d2ca66c574 Default text for DBViewNumber.
--HG--
branch : dfighter-tools
2014-10-20 22:27:33 +02:00
dfighter1985
8c5ad81199 it's not a bad idea to store the value in the right variable...
--HG--
branch : dfighter-tools
2014-10-20 22:21:59 +02:00
dfighter1985
b6d9e3285f DBViewNumber shouldn't crash anymore.
--HG--
branch : dfighter-tools
2014-10-20 20:57:08 +02:00
dfighter1985
2fe2077170 When setting the Id of the decorated edit box, set the Id of the text as well.
--HG--
branch : dfighter-tools
2014-10-20 18:51:53 +02: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
dfighter1985
67aa7a50d2 set the Id of the text properly when loading the decorated edit box.
--HG--
branch : dfighter-tools
2014-10-17 22:25:30 +02:00
dfighter1985
fd5a1a6834 Don't add non-selectable widgets to the hierarchy tree.
--HG--
branch : dfighter-tools
2014-10-17 21:23:00 +02:00
dfighter1985
923b36f0e5 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.
--HG--
branch : dfighter-tools
2014-10-17 21:18:26 +02:00
dfighter1985
ba1e3c9919 Fixed a typo that messed up the textures of decorated editbox.
--HG--
branch : dfighter-tools
2014-10-17 16:01:50 +02:00
dfighter1985
210f93a4f2 Save decorated edit box as such.
--HG--
branch : dfighter-tools
2014-10-16 21:03:58 +02:00
dfighter1985
18866c88af Update decorated edit box decoration coords while dragging.
--HG--
branch : dfighter-tools
2014-10-16 20:58:47 +02:00
dfighter1985
274efe6798 Allow selection of CGroupEditBox.
--HG--
branch : dfighter-tools
2014-10-16 20:29:36 +02:00
dfighter1985
42ebad94f6 Implemented CGroupEditBoxDecor a decorated CGroupEditBox.
--HG--
branch : dfighter-tools
2014-10-16 20:25:19 +02:00
dfighter1985
f7f74b5398 Render every 25ms instead of 200ms
--HG--
branch : dfighter-tools
2014-10-15 23:30:36 +02:00
dfighter1985
66fe76fc06 A Kami will be the default texture for Bitmaps.
--HG--
branch : dfighter-tools
2014-10-15 20:20:44 +02:00
dfighter1985
c9b528081e CtrlButton textures should be selectable in the texture chooser!
--HG--
branch : dfighter-tools
2014-10-15 20:07:13 +02:00
dfighter1985
cfa4129754 Default texture for CtrlButton.
--HG--
branch : dfighter-tools
2014-10-15 20:03:46 +02:00
dfighter1985
bd942ba62b TEMPORARILY add the login texture map to new project by default.
--HG--
branch : dfighter-tools
2014-10-15 19:54:35 +02:00
dfighter1985
f91846c970 Fix parent pos and size parsing.
--HG--
branch : dfighter-tools
2014-10-15 19:46:43 +02:00
dfighter1985
3209f48daa Don't drop the texture property just because there's no texture assigned...
--HG--
branch : dfighter-tools
2014-10-15 12:09:57 +02: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
dfighter1985
2b5898565f Don't disable the active group before serializing.
--HG--
branch : dfighter-tools
2014-10-13 20:15:41 +02:00
dfighter1985
ab76b7ed85 It's not a bad idea to actually retrieve the version if we load it...
--HG--
branch : dfighter-tools
2014-10-13 19:15:59 +02:00
dfighter1985
fae1e39039 Don't reject an action property just because it's empty...
--HG--
branch : dfighter-tools
2014-10-13 18:55:17 +02:00
dfighter1985
22a1d39ac7 Map files can now be specified when creating a new GUI project.
--HG--
branch : dfighter-tools
2014-10-13 18:53:26 +02:00
dfighter1985
c5cd6990fe When creating a new GUI set the base color to white.
--HG--
branch : dfighter-tools
2014-10-13 17:47:42 +02:00
dfighter1985
8066717aa2 Pos and Size parent setters should now use the widget directly as well.
--HG--
branch : dfighter-tools
2014-10-13 15:43:10 +02:00
dfighter1985
2dd6278771 Size parent is now queried directly from the widget.
--HG--
branch : dfighter-tools
2014-10-13 15:26:47 +02: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
dfighter1985
487c6a3440 GUI Editor should show the right parent position.
--HG--
branch : dfighter-tools
2014-10-12 23:07:08 +02:00
dfighter1985
b3dd26e01c Parent positions should now be saved right again.
--HG--
branch : dfighter-tools
2014-10-12 23:05:22 +02:00
dfighter1985
b587acb135 Some refactoring regarding saving.
--HG--
branch : dfighter-tools
2014-10-12 21:15:13 +02:00
dfighter1985
2c5617cea7 When creating a new project, save it right away.
--HG--
branch : dfighter-tools
2014-10-12 20:09:42 +02:00
Nimetu
2de4315027 Fix table cellpadding
--HG--
branch : html-table-rendering
2014-10-12 17:43:18 +03:00
dfighter1985
ded18b266c Implemented new action.
--HG--
branch : dfighter-tools
2014-10-11 21:43:28 +02:00
dfighter1985
e5d2e9293d Moved CRootGroup out of CInterfaceParser.
--HG--
branch : dfighter-tools
2014-10-11 19:30:30 +02:00
dfighter1985
03c041310e Added dialog for the new GUI action.
--HG--
branch : dfighter-tools
2014-10-11 18:56:24 +02:00
dfighter1985
5217b38f58 Some defaults.
--HG--
branch : dfighter-tools
2014-10-11 16:47:39 +02:00
dfighter1985
816e89c967 Another classname.
--HG--
branch : dfighter-tools
2014-10-11 16:40:41 +02:00
dfighter1985
7e16e95c35 CInterfaceParser in editor mode should look for files in the working directory first.
--HG--
branch : dfighter-tools
2014-10-11 16:26:38 +02:00
dfighter1985
99a3b93703 Restored lost class names
--HG--
branch : dfighter-tools
2014-10-11 14:44:16 +02:00
dfighter1985
fe89e8f77c Added limits to pch, should fix Linux build.
--HG--
branch : dfighter-tools
2014-10-11 13:04:03 +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
kervala
aaa044203e Fix some warnings
--HG--
branch : develop
2014-10-10 13:07:54 +02:00
kaetemi
5fd4f96a59 Configure shadow outline in applications
--HG--
branch : develop
2014-10-08 23:20:35 +02:00
kaetemi
74827a1808 Handle shadow outline in gui
--HG--
branch : develop
2014-10-08 23:20:35 +02:00
kaetemi
3edfd56c75 Implement text shade outline
--HG--
branch : develop
2014-10-08 23:20:34 +02:00
dfighter1985
a1e2c5667a A little crash fix.
--HG--
branch : dfighter-tools
2014-10-08 21:28:20 +02:00
dfighter1985
bec078af25 Sizes should remain the same when ungrouping.
--HG--
branch : dfighter-tools
2014-10-08 21:00:56 +02:00
dfighter1985
3ffe56b862 Added support for ungrouping.
--HG--
branch : dfighter-tools
2014-10-08 20:36:16 +02:00
dfighter1985
d7d62e690c Make group selection optional.
--HG--
branch : dfighter-tools
2014-10-08 18:45:17 +02:00
dfighter1985
08b6675b3d Only select a group first in editor mode.
--HG--
branch : dfighter-tools
2014-10-08 18:00:54 +02:00
dfighter1985
ad9e9839fb Don't try to handle the right mouse button actions in editor mode.
--HG--
branch : dfighter-tools
2014-10-08 17:59:39 +02:00
dfighter1985
64571abd47 When moving a group draw it's children too.
--HG--
branch : dfighter-tools
2014-10-08 17:52:56 +02:00
dfighter1985
5d5bf860d4 Reparent items in widget hierarchy instead of deleting and creating a new item...
--HG--
branch : dfighter-tools
2014-10-08 17:42:18 +02:00
dfighter1985
97ddd3573d Select groups first.
--HG--
branch : dfighter-tools
2014-10-08 17:37:05 +02:00
kaetemi
dc3238b111 Disable dumb loading strings
--HG--
branch : develop
2014-10-08 09:31:45 +02:00
kaetemi
ec68d2c317 Fix rendering of specially sized window highlights
--HG--
branch : develop
2014-10-08 09:31:13 +02:00
kaetemi
ec6ea26323 Fix when tx_b and tx_b_open have different heights
--HG--
branch : develop
2014-10-08 09:30:59 +02:00
kaetemi
025d7b6260 Fix crypt
--HG--
branch : sha512-auth
2014-10-07 03:00:34 +02:00
kaetemi
e6c0c70fc9 Compile fixes
--HG--
branch : sha512-auth
2014-10-07 01:44:43 +02:00
kaetemi
650dba5c51 Require setup upgrade
--HG--
branch : sha512-auth
2014-10-07 01:20:57 +02:00
kaetemi
f900f80b36 Merge with develop
--HG--
branch : sha512-auth
2014-10-07 01:15:35 +02:00
Jan Boon
944b048356 Merged in rodolphe_breard/ryzomcore/sha512-auth (pull request #89)
ref #206 : windows compilation stuff

--HG--
branch : sha512-auth
2014-10-07 01:14:31 +02:00
kaetemi
b98c6f6a59 Set version
--HG--
branch : develop
2014-10-07 01:14:03 +02:00
kaetemi
88a9a809a9 Add inset_t parameter to layer options, allows putting header graphics in top texture
--HG--
branch : develop
2014-10-04 01:43:27 +02:00
kaetemi
25f1aa6247 Fix a bad copy paste in NLGUI
--HG--
branch : develop
2014-10-04 01:43:13 +02:00
Rodolphe Breard
4c2be7ea1f ref #206 : hacking the types so it may compile on windows
--HG--
branch : sha512-auth
2014-10-02 19:14:25 +02:00
Rodolphe Breard
81d5294fc3 ref #206 : removing unused crypt lib reference
--HG--
branch : sha512-auth
2014-10-02 18:21:56 +02:00
kaetemi
bb9d0d91d3 Fix #207, FXAA orientation under D3D
--HG--
branch : develop
2014-10-01 23:24:56 +02:00
kaetemi
ff7450a22e Merge with develop
--HG--
branch : sha512-auth
2014-10-01 23:23:06 +02:00
Jan Boon
7549ab8b7f Merged in rodolphe_breard/ryzomcore/sha512-auth (pull request #88)
rolling back to include a crypt(3) implementation and adding sha512 support

--HG--
branch : sha512-auth
2014-10-01 23:20:52 +02:00
Jan Boon
7729c3b65c Merged in nimetu/ryzomcore-2/nimetu/find-lua-version-for-luabind-under-fedor-1412076128442 (pull request #87)
find lua version for luabind under fedora

--HG--
branch : develop
2014-10-01 23:19:21 +02:00
Jan Boon
782f08f137 Merged in nimetu/ryzomcore-1/nimetu/static-libxml2-under-linux-requires-lzma-1412075714030 (pull request #86)
static libxml2 under linux requires lzma (tested on fedora/debian)

--HG--
branch : develop
2014-10-01 23:19:04 +02:00
Jan Boon
980b855de9 Merged in nimetu/ryzomcore/html-maxlength-attr (pull request #84)
Add maxlength attribute to input and textarea tags

--HG--
branch : develop
2014-10-01 23:18:33 +02:00
Rodolphe Breard
65b902970a ref #206 : rolling back to include a crypt(3) implementation and adding sha512 support
--HG--
branch : sha512-auth
2014-10-01 21:29:10 +02:00
nimetu
dcf2906b94 find lua version for luabind under fedora
--HG--
branch : nimetu/find-lua-version-for-luabind-under-fedor-1412076128442
2014-09-30 11:23:16 +00:00
nimetu
3e209147b0 static libxml2 under linux requires lzma (tested on fedora/debian)
--HG--
branch : nimetu/static-libxml2-under-linux-requires-lzma-1412075714030
2014-09-30 11:16:28 +00:00
dfighter1985
d2587df8c1 From now on dragged widgets will be re-aligned on drop. They will find the nearest hotspot of the group they are dropped into, and calculate an offset so they will align to the hotspot and yet remain where they were dropped.
--HG--
branch : dfighter-tools
2014-09-29 20:29:04 +02:00
dfighter1985
4571038fa6 Update CCtrlTextButton's CViewText's coords after updating it's own coords.
--HG--
branch : dfighter-tools
2014-09-29 17:38:24 +02:00
dfighter1985
86007c9156 Posref changes in the editor should apply...
--HG--
branch : dfighter-tools
2014-09-29 17:23:22 +02:00
dfighter1985
2603ad3a2b Refactoring. Added CInterfaceFactory.
--HG--
branch : dfighter-tools
2014-09-27 21:48:51 +02:00
dfighter1985
22d9accae6 When moving a widget, save the reference to the hierarchy lookup map...
--HG--
branch : dfighter-tools
2014-09-27 20:54:44 +02:00
dfighter1985
0055e2dd91 A little refactoring.
--HG--
branch : dfighter-tools
2014-09-27 20:15:46 +02:00
dfighter1985
4797b150d8 Move the text too with the text button.
--HG--
branch : dfighter-tools
2014-09-27 19:54:19 +02:00
dfighter1985
d053bb51c2 Merged develop
--HG--
branch : dfighter-tools
2014-09-27 18:22:44 +02:00
dfighter1985
c6df57adf1 Initialize struct member before use...
--HG--
branch : develop
2014-09-27 18:20:29 +02:00
Nimetu
0d62650159 Add maxlength attribute to input and textarea tags
--HG--
branch : html-maxlength-attr
2014-09-27 15:55:57 +03:00
dfighter1985
0af278e50a A little bit of refactoring.
--HG--
branch : dfighter-tools
2014-09-27 01:04:49 +02:00
dfighter1985
8c3702f826 Update coords when changing something.
--HG--
branch : dfighter-tools
2014-09-27 01:00:52 +02:00
dfighter1985
c92d084600 Merged develop.
--HG--
branch : dfighter-tools
2014-09-27 00:08:06 +02:00
dfighter1985
938c36027d Editbox selection should be stopped when the mouse button goes up, even if it happens outside of the box.
--HG--
branch : develop
2014-09-26 23:29:38 +02:00
dfighter1985
4ec13e57e4 Collapse the tree, and only expand the items that are needed to get to the selected items.
--HG--
branch : dfighter-tools
2014-09-25 00:37:25 +02:00
dfighter1985
9cae0c1793 When repareting a widget, remove the old item from the hierarchy and add a new one at the right place.
--HG--
branch : dfighter-tools
2014-09-24 23:56:11 +02:00
dfighter1985
006f87278b Refactored IWidgetAdditionWatcher, now it's called IWidgetWatcher and it also reports widget moves.
--HG--
branch : dfighter-tools
2014-09-24 23:32:24 +02:00
dfighter1985
a658be39b7 No need for free floating elements when we can simply reparent to the top window...
--HG--
branch : dfighter-tools
2014-09-24 22:59:40 +02:00
dfighter1985
e7ab56beea Orphaned widgets won't get stuck.
--HG--
branch : dfighter-tools
2014-09-24 20:40:37 +02:00
dfighter1985
bd7cb1eea3 Add widget to a new parent when the widget being dragged is dropped, otherwise add it to the orphanlist so that it's drawn anyways. NOTE: The dropped widget can be clipped. If it is clipped, it never shows up even tho it's there.
--HG--
branch : dfighter-tools
2014-09-24 18:45:52 +02:00
dfighter1985
f9dbef7df7 Set dragged widgets' coordinates based on the move rather than the mouse pointer's coords.
--HG--
branch : dfighter-tools
2014-09-24 16:31:26 +02:00
dfighter1985
62744db86d Dragged elements will no longer disappear.
--HG--
branch : dfighter-tools
2014-09-24 16:20:25 +02:00
kaetemi
3bd552ebb0 Add useful default config variables to dev client
--HG--
branch : develop
2014-09-24 12:34:40 +02:00
kaetemi
27cbd59a0f Add some more practical data build batch scripts
--HG--
branch : develop
2014-09-24 01:07:12 +02:00
kaetemi
6551881171 Handle GUI event only once
--HG--
branch : develop
2014-09-23 19:47:06 +02:00
kaetemi
cb022c6bbb Remove debug message
--HG--
branch : develop
2014-09-23 18:18:14 +02:00
kaetemi
e714e37c4c Fix EGS sheet rebuild crashes
--HG--
branch : develop
2014-09-23 13:54:02 +02:00
dfighter1985
7ef9920bac Instantiate the Wold Editor window after the LIGO setup.
--HG--
branch : dfighter-tools
2014-09-23 00:16:57 +02:00
dfighter1985
9b989a2dc0 Merged develop.
--HG--
branch : dfighter-tools
2014-09-22 23:58:48 +02:00
dfighter1985
e67e9594e1 Call the onActivate method of the current context after all plugins are initialized.
--HG--
branch : dfighter-tools
2014-09-22 23:41:55 +02:00
dfighter1985
f61438d7d9 Studio should no longer crash when multiple plugins that use LIGO are loaded. LIGO classes are now guarded against multiple registrations. If it's tried log messages are generated. Mission Compiler and World Editor will now apply their own LIGO configs when the user switches to their tab.
--HG--
branch : dfighter-tools
2014-09-22 23:24:48 +02:00
kaetemi
eff07ebbf9 Add an assert
--HG--
branch : develop
2014-09-21 13:24:33 +02:00
kaetemi
cec992c4a5 Fix double delete
--HG--
branch : develop
2014-09-21 12:31:02 +02:00
dfighter1985
648b2cb46b oups
--HG--
branch : dfighter-tools
2014-09-20 20:55:30 +02:00
dfighter1985
5b7bc8cc54 GUI Editor should no longer crash on Linux
--HG--
branch : dfighter-tools
2014-09-20 20:51:08 +02:00
dfighter1985
447aac5821 Merged develop
--HG--
branch : dfighter-tools
2014-09-19 20:10:00 +02:00
kaetemi
779b0c22bc Add extra search paths
--HG--
branch : develop
2014-09-19 19:48:17 +02:00
kaetemi
0ed6e8111b Increment web version
--HG--
branch : sha512-auth
2014-09-18 21:55:34 +02:00
kaetemi
b6df4cac4f Merge with develop
--HG--
branch : sha512-auth
2014-09-18 21:54:34 +02:00
kaetemi
0275d0fe29 It works on my machine
--HG--
branch : develop
2014-09-18 21:02:14 +02:00
kaetemi
902a873e78 Add resave scripts
--HG--
branch : develop
2014-09-18 17:40:07 +02:00
kaetemi
5e9c3b82fc Add particle system path fixing script
--HG--
branch : develop
2014-09-18 14:10:03 +02:00
kaetemi
027860be16 Fix missing include
--HG--
branch : develop
2014-09-18 13:02:32 +02:00
kaetemi
c1b8ea9bd0 Backed out incomplete changes to GL driver
--HG--
branch : develop
2014-09-18 11:31:19 +02:00
dfighter1985
780394f989 Fixed Object Viewer build.
--HG--
branch : dfighter-tools
2014-09-17 22:36:58 +02:00
dfighter1985
7a4d9e2cdc Merged the gui-editor branch.
--HG--
branch : dfighter-tools
2014-09-17 21:12:14 +02:00
dfighter1985
012fae0ef6 don't evaluate the child-nodes when there are none, directly just return ()
--HG--
branch : dfighter-tools
2014-09-17 20:54:16 +02:00
dfighter1985
4d760c7515 When removing the root node, don't retain the pointer to it...
--HG--
branch : dfighter-tools
2014-09-17 20:51:45 +02:00
dfighter1985
0c354f436d Added the rest of the expression files.
--HG--
branch : dfighter-tools
2014-09-17 20:49:26 +02:00
dfighter1985
d90d3cd227 Merged develop.
--HG--
branch : dfighter-tools
2014-09-17 19:51:14 +02:00
dfighter1985
4059547835 Added support for clearing the Expression Editor scene.
--HG--
branch : dfighter-tools
2014-09-17 19:27:06 +02:00
dfighter1985
e77fed3c3d Texture Chooser shouldn't have been left in the main menu...
--HG--
branch : dfighter-tools
2014-09-17 19:21:39 +02:00
dfighter1985
df98492b1c Moved the Expression Editor to it's right place.
--HG--
branch : dfighter-tools
2014-09-17 19:19:43 +02:00
dfighter1985
a9cd538786 Instead of mouse move event, use the itemChange handler to move the links.
--HG--
branch : dfighter-tools
2014-09-17 16:17:41 +02:00
dfighter1985
315e43a469 ExpressionNode flags are now set in it's constructor.
--HG--
branch : dfighter-tools
2014-09-17 16:02:28 +02:00
dfighter1985
bf12cbc53c Links shouldn't be selectable.
--HG--
branch : dfighter-tools
2014-09-17 16:01:23 +02:00
dfighter1985
b715b6eaf6 This is the GUI Editor not Georges...
--HG--
branch : dfighter-tools
2014-09-17 15:50:12 +02:00
dfighter1985
83859cdd82 Save expression.
--HG--
branch : dfighter-tools
2014-09-17 15:47:49 +02:00
dfighter1985
5f47f74431 Expression can now be built.
--HG--
branch : dfighter-tools
2014-09-17 15:31:54 +02:00
dfighter1985
cbca49fcc0 A root node can now be set. The root node is where the evaluation will start.
--HG--
branch : dfighter-tools
2014-09-17 14:41:57 +02:00
Rodolphe Breard
5c2cc95dc9 Fixing the database migration system for issue #206
--HG--
branch : sha512-auth
2014-09-16 22:43:36 +02:00
Rodolphe Breard
094a23bd09 fixing #206 : passwords are now stored using SHA-512 instead of traditional DES
--HG--
branch : sha512-auth
2014-09-16 20:34:26 +02:00
dfighter1985
cc071e5048 Added sample expression files.
--HG--
branch : dfighter-tools
2014-09-16 15:54:53 +02:00
dfighter1985
5e91c2f374 When changing the value of a node, change the size the node if needed.
--HG--
branch : dfighter-tools
2014-09-16 15:31:06 +02:00
dfighter1985
f0e78b5fbb Allow to set and change values of value nodes.
--HG--
branch : dfighter-tools
2014-09-16 15:15:31 +02:00
dfighter1985
142d82d788 Only allow variable nodes to have their number of slots changed.
--HG--
branch : dfighter-tools
2014-09-16 03:45:26 +02:00
dfighter1985
89aaa52703 Set the number of slots and their names from the data loaded from XMLs.
--HG--
branch : dfighter-tools
2014-09-16 03:38:21 +02:00
dfighter1985
af74411104 Parse expression files, and build the expression tree from the expressions parsed from these files.
--HG--
branch : dfighter-tools
2014-09-16 02:32:10 +02:00
kaetemi
c789a22155 Fix r2ed
--HG--
branch : develop
2014-09-15 18:15:40 +02:00
kaetemi
74e9aac960 Fix r2ed
--HG--
branch : develop
2014-09-15 17:42:24 +02:00
kaetemi
9283a74a22 Fix r2ed
--HG--
branch : develop
2014-09-15 16:59:12 +02:00
kaetemi
84046c8db4 Fix r2ed
--HG--
branch : develop
2014-09-15 14:33:07 +02:00
kaetemi
07caf402c2 Fix bad type passed to sscanf
--HG--
branch : develop
2014-09-15 12:49:13 +02:00
dfighter1985
5e5fb49f12 Slot count can now be changed.
--HG--
branch : dfighter-tools
2014-09-15 01:25:01 +02:00
botanic
89604dbba4 Fix #194
--HG--
branch : develop
2014-09-14 15:52:40 -07:00
botanic
ba3f48a9e2 FIX #205
--HG--
branch : develop
2014-09-14 13:09:00 -07:00
dfighter1985
7f2091d6c9 Expression Editor is now a QMainWindow subclass. Also added an expression tree, with some sample nodes.
--HG--
branch : dfighter-tools
2014-09-14 21:00:40 +02:00
botanic
9ceeed138e change to 256 characters
--HG--
branch : develop
2014-09-14 10:13:30 -07:00
botanic
34acdf0d94 Merge
--HG--
branch : develop
2014-09-14 09:46:59 -07:00
botanic
38810a8c0f Update domain settings
--HG--
branch : develop
2014-09-14 09:46:12 -07:00
dfighter1985
65382b45b7 Show the node names as title, in the link dialog.
--HG--
branch : dfighter-tools
2014-09-14 17:19:11 +02:00
dfighter1985
eb0693cd27 Add serial number to nodes.
--HG--
branch : dfighter-tools
2014-09-14 17:04:42 +02:00
dfighter1985
99ebe16c03 Allow painting of arbitrary number of connection slots.
--HG--
branch : dfighter-tools
2014-09-14 16:57:56 +02:00
dfighter1985
40b4bce729 A little refactoring.
--HG--
branch : dfighter-tools
2014-09-14 16:43:45 +02:00
kaetemi
adb717052a Add cartographer
--HG--
branch : develop
2014-09-14 16:37:24 +02:00
dfighter1985
42cd76c768 Support for adding nodes with different slot count.
--HG--
branch : dfighter-tools
2014-09-14 16:37:17 +02:00
dfighter1985
aa67011381 Added unlinking support.
--HG--
branch : dfighter-tools
2014-09-14 15:36:41 +02:00
dfighter1985
875cad3f72 Improved linking
--HG--
branch : dfighter-tools
2014-09-14 15:15:20 +02:00
kaetemi
b5a95d725b Add pz process
--HG--
branch : develop
2014-09-14 15:02:44 +02:00
dfighter1985
2e6a5bb1d6 There are more than 1 slots available now.
--HG--
branch : dfighter-tools
2014-09-13 23:54:25 +02:00
dfighter1985
275095107b More refactoring.
--HG--
branch : dfighter-tools
2014-09-13 22:54:50 +02:00
dfighter1985
5fc392623b More refactoring.
--HG--
branch : dfighter-tools
2014-09-13 22:39:00 +02:00
dfighter1985
c63f22fe92 Refactoring
--HG--
branch : dfighter-tools
2014-09-13 22:31:48 +02:00
dfighter1985
4cf4440a97 Connection slots are now managed by their own object, and linking is now done to their positions.
--HG--
branch : dfighter-tools
2014-09-13 22:26:11 +02:00
botanic
07933bf52c Update smarty for admin to 2.6.28
--HG--
branch : develop
2014-09-13 13:09:48 -07:00
dfighter1985
7c930366de Paint the connection text, boxes separately.
--HG--
branch : dfighter-tools
2014-09-13 21:34:47 +02:00
botanic
53ea877a50 update lib sql version
--HG--
branch : develop
2014-09-13 10:40:47 -07:00
botanic
3c01c5c811 disable debug mode
--HG--
branch : develop
2014-09-13 10:35:21 -07:00
botanic
9be68e3326 Merge
--HG--
branch : develop
2014-09-13 10:31:22 -07:00
botanic
9b813a5e4c Fix #122
--HG--
branch : develop
2014-09-13 10:31:12 -07:00
botanic
765e614c23 Fix #122
--HG--
branch : develop
2014-09-13 10:30:58 -07:00
dfighter1985
aef69eef64 Add a little style.
--HG--
branch : dfighter-tools
2014-09-13 18:03:02 +02:00
kaetemi
433d83e2fc Increase texturing limits (*4), ref #203 (TODO: Update config translations)
--HG--
branch : develop
2014-09-13 12:14:45 +02:00
kaetemi
7fed632c54 Fix includes
--HG--
branch : develop
2014-09-13 12:02:47 +02:00
kaetemi
9678b56ed5 Fix strange code
--HG--
branch : develop
2014-09-13 11:13:25 +02:00
kaetemi
fe4c2becf8 File name, fix #202
--HG--
branch : compatibility
2014-09-13 10:08:44 +02:00
dfighter1985
af550acd62 Throw an error message when trying to link nodes that are already linked.
--HG--
branch : dfighter-tools
2014-09-13 00:54:37 +02:00
dfighter1985
d2c396bc84 Link nodes and remove and delete the link too when deleting one of the nodes.
--HG--
branch : dfighter-tools
2014-09-13 00:43:00 +02:00
dfighter1985
adece7564a Subclassed QGraphicsItem and QGraphicsItemLine.
--HG--
branch : dfighter-tools
2014-09-12 23:45:57 +02:00
dfighter1985
83566116d9 Added link action.
--HG--
branch : dfighter-tools
2014-09-12 21:01:29 +02:00
kaetemi
6bb136dca9 Change cfg name
--HG--
branch : develop
2014-09-12 20:33:20 +02:00
kaetemi
07ee9a4469 Add missing r2_islands_textures tool
--HG--
branch : develop
2014-09-12 20:29:50 +02:00
dfighter1985
e2ea5a74b8 We can select multiple items
--HG--
branch : dfighter-tools
2014-09-12 19:47:28 +02:00
dfighter1985
cc7e93c96e Added GUI for expression editor.
--HG--
branch : dfighter-tools
2014-09-12 19:19:51 +02:00
kaetemi
d12ccf194e Merge with develop
--HG--
branch : multipass-stereo
2014-09-12 15:19:12 +02:00
kaetemi
0fe2401260 Backed out changeset: eae58a811aa5
--HG--
branch : compatibility
2014-09-12 11:20:36 +02:00
kaetemi
04528999c8 Backed out changeset: cd8e80e4b0d6
--HG--
branch : compatibility
2014-09-12 11:19:33 +02:00
kaetemi
b698c10475 Merge with ryzomcore/v0.10.0
--HG--
branch : compatibility
2014-09-12 11:19:09 +02:00
kaetemi
e347b2a97f ryzomcore/v0.10.0 2014-09-12 10:57:31 +02:00
kaetemi
9fd8338849 Add data_common to executables_dev batch 2014-09-12 10:50:19 +02:00
kaetemi
8a3994d95a Replace some hardcoded urls 2014-09-12 10:49:40 +02:00
kaetemi
50f05a2bb9 Remove hardcoded urls 2014-09-12 10:42:42 +02:00
kaetemi
927ecb3dae Remove dead code (CCharacterAchievements, CKnownBrickInfo) 2014-09-12 08:35:49 +02:00
botanic
dcd09e034b Merge 2014-09-11 20:29:14 -07:00
botanic
92afe8e76a FIX #200
dont crash when neldb is missing
2014-09-11 10:50:34 -07:00
kaetemi
2abe431675 Regenerate PLR cpp and header 2014-09-11 17:40:53 +02:00
kaetemi
14fda8a39a Add missing leaf 2014-09-11 15:13:17 +02:00
kaetemi
47368e78f9 Remove dead code 2014-09-11 12:12:17 +02:00
kaetemi
0d7c9fd4bf When in Rome, do as the Romans do 2014-09-11 10:36:41 +02:00
kaetemi
6b2b633fed Merge 2014-09-11 10:01:05 +02:00
kaetemi
a9ee3c6b37 Admin web fix 2014-09-11 10:00:10 +02:00
kaetemi
1bf482adc9 Small database adjustment 2014-09-11 09:31:59 +02:00
dfighter1985
1ca2b634ee Merged default.
--HG--
branch : dfighter-tools
2014-09-10 20:18:00 +02:00
dfighter1985
52963260a8 Offer to save changes when closing a dialog.
--HG--
branch : dfighter-tools
2014-09-10 19:59:38 +02:00
dfighter1985
09ccd8613d When closing a dialog, remove it from the docked dialogs, and delete it.
--HG--
branch : dfighter-tools
2014-09-10 19:52:35 +02:00
dfighter1985
97d7fbe6e8 Allow editing of the comment section, and save comments when saving.
--HG--
branch : dfighter-tools
2014-09-10 19:14:26 +02:00
dfighter1985
104506a717 Raise the widget after adding.
--HG--
branch : dfighter-tools
2014-09-10 18:50:07 +02:00
dfighter1985
78a65459f0 WTF?
--HG--
branch : dfighter-tools
2014-09-10 18:49:34 +02:00
dfighter1985
7abd407bc5 oups
--HG--
branch : dfighter-tools
2014-09-10 18:04:55 +02:00
dfighter1985
1d028c759c Use a file browser for setting files.
--HG--
branch : dfighter-tools
2014-09-10 17:59:22 +02:00
dfighter1985
946685dfac A little refactoring
--HG--
branch : dfighter-tools
2014-09-10 17:02:51 +02:00
dfighter1985
c44d910434 Store the filename only in the Dfn value.
--HG--
branch : dfighter-tools
2014-09-10 16:44:49 +02:00
kaetemi
fceb2927f4 Add script for installing worldedit data 2014-09-10 16:38:19 +02:00
dfighter1985
e89cde4b93 Properly support color types.
--HG--
branch : dfighter-tools
2014-09-10 16:22:08 +02:00
kaetemi
d03c2dcfcd Nice try 2014-09-10 16:00:13 +02:00
nimetu
1a4c2169c5 Fix #161 fix craft success rate display on client 2014-09-10 15:40:32 +02:00
nimetu
ca79af60c6 Fix #143 /muteUniverse on dyn universe channels 2014-09-10 15:38:57 +02:00
nimetu
0cd3ea8d3b Fix #199 Studio object viewer plugin font 2014-09-10 12:19:11 +02:00
kaetemi
9e74156181 Move islands entry points to data 2014-09-10 08:25:45 +02:00
kaetemi
f5fb98764f Remove unused mirror dataset 2014-09-10 08:18:05 +02:00
kaetemi
22fc641666 Merge 2014-09-10 05:28:14 +02:00
kaetemi
89db6c78a7 Use the correct ring database 2014-09-10 05:25:00 +02:00
botanic
cafe41fa24 FIX #192 2014-09-09 17:29:59 -07:00
botanic
74df36b179 FIX #197
Added default config values that should work for mail config settings in case people are lazy
2014-09-09 17:26:20 -07:00
botanic
dfdd7698c3 fix windows warnings in sync 2014-09-09 17:20:23 -07:00
dfighter1985
0587d6a687 Create vstruct node when needed.
--HG--
branch : dfighter-tools
2014-09-10 00:36:55 +02:00
dfighter1985
e47d480170 Instead of storing the node, store the name and the node type.
--HG--
branch : dfighter-tools
2014-09-10 00:28:03 +02:00
dfighter1985
53357ca9ec Don't add Virtual Structs to the property browser!
--HG--
branch : dfighter-tools
2014-09-09 22:01:52 +02:00
dfighter1985
821ec6cfad Added support for Virtual Structs.
--HG--
branch : dfighter-tools
2014-09-09 21:57:30 +02:00
kaetemi
328eaf592a Use correct AES cfg 2014-09-09 18:58:05 +02:00
kaetemi
55ca1e7a2a Crashfix 2014-09-09 15:50:12 +02:00
kaetemi
7c40248728 Bugfix 2014-09-09 12:39:35 +02:00
kaetemi
0445c3138c Typo 2014-09-09 08:23:37 +02:00
kaetemi
a8f8fa7b63 Don't use magic numbers for the LCT 2014-09-09 08:16:44 +02:00
kaetemi
ea9cf3db93 Typo 2014-09-09 08:15:05 +02:00
kaetemi
f0ac4705d8 Cleanup the AMS theme a bit, improve layouting of user settings 2014-09-09 04:02:15 +02:00
kaetemi
d863ed8a10 Mask database connection error 2014-09-09 02:52:24 +02:00
kaetemi
7cd21d48b4 Merge 2014-09-09 02:30:24 +02:00
botanic
6a36f1f433 fix sync 2014-09-08 17:29:43 -07:00
kaetemi
be78a1cd0b Cache PDO connections and connection failures in a single page load 2014-09-09 02:15:25 +02:00
kaetemi
c4d4587830 Disable APC page caching 2014-09-09 02:14:49 +02:00
botanic
e1c70eb423 dont cache $#1t 2014-09-08 16:23:04 -07:00
botanic
0b579f6306 attachment error checking 2014-09-08 11:59:49 -07:00
botanic
efadbb3f58 make the random generation more secure 2014-09-08 11:46:43 -07:00
botanic
6f1037f829 fix some unset warnings 2014-09-08 05:54:34 -07:00
botanic
2a8ff51169 change some div's so it looks proper 2014-09-08 05:20:28 -07:00
botanic
8be65ec64c turn debugging off 2014-09-08 04:56:13 -07:00
botanic
32745a132b properly display permissions 2014-09-08 04:55:05 -07:00
botanic
4f907c30e6 display the correct plugin page 2014-09-08 03:55:59 -07:00
botanic
7fc83ccd37 set template permissions 2014-09-08 03:29:30 -07:00
botanic
b20008b520 fix menu plugin display 2014-09-08 03:19:13 -07:00
botanic
c3c319944c fix notice 2014-09-08 03:04:34 -07:00
botanic
76dc593a1c fix plugin template 2014-09-08 03:02:11 -07:00
botanic
8d49355c9f fix index issue 2014-09-08 02:57:09 -07:00
botanic
4009772907 Fix smarty issues 2014-09-08 02:36:38 -07:00
botanic
371f666dea Cleanup Domain management code 2014-09-08 02:36:31 -07:00
botanic
1b9986063e Merge 2014-09-08 02:08:26 -07:00
botanic
b58f365473 upgrade smarty to 3.1.19 2014-09-08 02:07:42 -07:00
botanic
52885f20e0 Fix for stupid loop 2014-09-08 02:05:49 -07:00
kaetemi
3e476a9376 Install fix 2014-09-08 10:42:38 +02:00
kaetemi
d651eff10b Cleanup some RYZOMID code 2014-09-08 09:48:28 +02:00
kaetemi
3baf60ad1d Remove dead code in game item manager 2014-09-08 09:37:14 +02:00
kaetemi
e0a1d27dc8 Bugfix in distance prioritizer 2014-09-08 09:09:42 +02:00
botanic
ab06a6ce08 remove testing errorlog 2014-09-07 23:57:31 -07:00
kaetemi
4dda4099de Remove dead code 2014-09-08 08:04:09 +02:00
botanic
4ff51bf600 Merge 2014-09-07 22:27:32 -07:00
botanic
876afdf018 Domain management plugin updates 2014-09-07 22:26:34 -07:00
kaetemi
034c5d7982 Better use this 2014-09-08 07:16:07 +02:00
kaetemi
6031e8666d Enable PHP APC cache for AMS smarty 2014-09-08 07:10:28 +02:00
kaetemi
7448ec51a7 Remove dead declarations in DSS 2014-09-08 05:34:14 +02:00
kaetemi
bde283e8cb Fix SU RSM UAP SQL query 2014-09-08 05:28:09 +02:00
kaetemi
af1b9ed495 Make this extra clear 2014-09-08 01:41:33 +02:00
kaetemi
c902392de3 Enable ring database installation and upgrade in the setup script... 2014-09-08 01:35:47 +02:00
kaetemi
01735e86ad Translation fix 2014-09-08 01:27:46 +02:00
kaetemi
58d2c8be86 Adjust plugin description 2014-09-08 00:42:07 +02:00
kaetemi
8a875b3bab Don't put fixed row id's in insert queries for upgrades 2014-09-08 00:26:54 +02:00
kaetemi
5ec2db090d Bugfix 2014-09-08 00:23:07 +02:00
kaetemi
795b5a9aa0 Don't write version if upgrade failed 2014-09-08 00:21:30 +02:00
kaetemi
fed7dc17ac Bugfix 2014-09-08 00:16:36 +02:00
kaetemi
ed0f753fa9 Fix 2014-09-08 00:11:48 +02:00
kaetemi
f4956721ff Typo 2014-09-08 00:09:12 +02:00
kaetemi
d7c1249b6b Setup adjust 2014-09-08 00:06:13 +02:00
Dylan Geels
6a3d59f6f5 The setup was showing a error from it. 2014-09-07 13:18:32 +00:00
Dylan Geels
fc43595faf Function split() is deprecated 2014-09-07 13:06:24 +00:00
Dylan Geels
1a1aa68ebc Function split() is deprecated
--HG--
branch : Geels/join_shardphp-edited-online-with-bitbuck-1410094877054
2014-09-07 13:01:42 +00:00
botanic
d3606149e8 upgrade nel lib version 2014-09-07 05:41:35 -07:00
botanic
b89faeb75b Merge 2014-09-07 05:40:29 -07:00
botanic
6e0c7ef5ca setup modifications 2014-09-07 05:40:02 -07:00
botanic
3601eae39b Initial Domain Management Plugin 2014-09-07 05:39:48 -07:00
botanic
6a47cda484 added initial domain_management plugin, also fixed potental conflicting hook names 2014-09-07 03:17:20 -07:00
kaetemi
57564a8ab0 Cleanup shard table 2014-09-07 09:10:23 +02:00
kaetemi
b0c0439b39 Change ClientApplication to DomainId in permission table 2014-09-07 08:53:10 +02:00
kaetemi
00b394603d Cleanup some English AMS translations 2014-09-07 04:21:08 +02:00
kaetemi
70eb2d7bee Cleanup some English AMS translations 2014-09-07 04:16:07 +02:00
kaetemi
c938c18f35 Bugfix 2014-09-07 03:51:10 +02:00
kaetemi
aebcf606ed Bugfix 2014-09-07 03:47:55 +02:00
kaetemi
b4f4eddd12 Add login configuration 2014-09-07 03:43:00 +02:00
kaetemi
82d9103263 This might fix #193 2014-09-06 21:25:07 +02:00
kaetemi
500aa9fbfc Syntax styling 2014-09-06 20:59:21 +02:00
kaetemi
667fa78aab This should fix #193 2014-09-06 20:56:06 +02:00
botanic
83d9dc9f69 Merge 2014-09-05 22:24:41 -07:00
botanic
9211037a54 fix missing pcntl_fork func 2014-09-05 22:24:09 -07:00
kaetemi
6763d96992 Add more paranoia 2014-09-06 06:49:42 +02:00
kaetemi
67d5ec373e Now really, don't execute any scripts here 2014-09-06 06:40:33 +02:00
kaetemi
186da3c0fa Saner behaviour to show Forbidden error 2014-09-06 04:55:17 +02:00
kaetemi
d132e5ebb1 Add upgrade script 2014-09-06 04:44:08 +02:00
botanic
d34f884d32 fixed sync to be more robust 2014-09-05 19:38:53 -07:00
botanic
72711ab92e throw error on non-writable file 2014-09-05 19:26:12 -07:00
botanic
702320a0ce forgot $AMS_TMPDIR 2014-09-05 19:18:17 -07:00
botanic
cbabab3e80 Merge 2014-09-05 18:46:33 -07:00
botanic
afa6787100 Fix #189 2014-09-05 18:46:13 -07:00
kaetemi
3ee17121f9 Make files folder safe to use 2014-09-06 03:44:58 +02:00
kaetemi
1448007193 Make files folder safe to use 2014-09-06 03:43:31 +02:00
kaetemi
1cec88b78b Protect shard admin auth SQL queries 2014-09-06 01:40:37 +02:00
kaetemi
07eff64df5 Fix version number 2014-09-06 00:38:20 +02:00
kaetemi
17e921c8e4 Merge 2014-09-06 00:37:29 +02:00
kaetemi
9be5bfb5d7 Create shard admin user in setup 2014-09-06 00:35:28 +02:00
dfighter1985
46e3242557 Merged default.
--HG--
branch : dfighter-tools
2014-09-05 22:28:11 +02:00
dfighter1985
3a94909a92 Get type info from DFN.
--HG--
branch : dfighter-tools
2014-09-05 21:42:14 +02:00
dfighter1985
ff0df2bf50 Added support for manipulating atoms.
--HG--
branch : dfighter-tools
2014-09-05 20:28:43 +02:00
dfighter1985
b63f73b1b6 Appending, resizing arrays, deleting array members should now create the proper new nodes.
--HG--
branch : dfighter-tools
2014-09-05 19:41:51 +02:00
dfighter1985
6233c25461 Added support for adding atoms and virtual structs in the treeview.
--HG--
branch : dfighter-tools
2014-09-05 18:58:47 +02:00
kervala
ff370bb49f Changed: Code formatting 2014-09-05 15:42:53 +02:00
dfighter1985
0ac5d7c9ee Do the same when readding items after a deletion.
--HG--
branch : dfighter-tools
2014-09-05 15:20:22 +02:00
dfighter1985
683efde803 Add new array entries with all their children.
--HG--
branch : dfighter-tools
2014-09-05 15:13:58 +02:00
botanic
ea366fcce9 Merge 2014-09-05 02:31:56 -07:00
botanic
1908d6967c only show powered by and version when admin 2014-09-05 02:30:50 -07:00
botanic
884357c705 added version number to ams 2014-09-05 02:27:08 -07:00
kaetemi
1acf0bf3ca Merge 2014-09-05 11:22:47 +02:00
kaetemi
9163bf4afa Merge 2014-09-05 11:22:18 +02:00
kaetemi
98735ea86e Validate setup password 2014-09-05 11:21:21 +02:00
botanic
ab29777062 remove unecessery printing 2014-09-05 02:21:00 -07:00
botanic
72cfe723e1 fixed some caching 2014-09-05 02:17:19 -07:00
botanic
f27cd046a0 remove errolog 2014-09-05 02:10:32 -07:00
botanic
f46de3129e fix sync 2014-09-05 02:10:09 -07:00
kaetemi
fbee858ae9 Add basis for database upgrades 2014-09-05 11:07:25 +02:00
botanic
e99c43095e Made filesize friendly 2014-09-05 01:30:54 -07:00
botanic
5ae905d317 remove old file 2014-09-05 01:22:39 -07:00
botanic
bd442c9854 added placeholder 2014-09-05 01:22:19 -07:00
botanic
4293518dcf added placeholder 2014-09-05 01:21:59 -07:00
botanic
58be0a2b8e Merge 2014-09-05 01:20:39 -07:00
botanic
8a1a88d48c Fix #190 2014-09-05 01:20:00 -07:00
kaetemi
38a900d4f4 Alternative redirect script 2014-09-05 10:11:50 +02:00
kaetemi
e3a519fad8 Merge 2014-09-05 10:01:20 +02:00
kaetemi
8c57fb88ab Modularize web setup 2014-09-05 09:57:06 +02:00