Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity
7061 commits 14 branches 1 tag 255 MiB
Commit graph

1211 commits

Author SHA1 Message Date
kervala
89532b2afb Fixed: Compilation (missing NLMISC namespaces for nlfopen) 
--HG--
branch : develop
 2016-03-20 17:27:25 +01:00
kervala
0d773e3e79 Fixed: Use nlfopen in tools and servers 
--HG--
branch : develop
 2016-03-19 16:21:06 +01:00
kervala
f698c31aa1 Changed: Allow to compile WITH_NEL_TESTS without compiling tools 
--HG--
branch : develop
 2016-02-21 13:20:49 +01:00
kervala
aaecf96b67 Use new wrapper insteaf of fopen, issue #261 
--HG--
branch : develop
 2016-02-20 17:56:25 +01:00
Gary Preston
7281c40577 Update indentation of tiles_model::data to match coding standard use of tabs. 
--HG--
branch : develop
 2016-02-17 14:07:19 +00:00
Gary Preston
48e86eedee Fix qt4 build error. 
--HG--
branch : develop
 2016-02-17 14:03:57 +00:00
kaetemi
1fbc179bc3 Centralized project directory configuration mechanism 
--HG--
branch : feature-material-editor
 2016-02-16 02:28:03 +01:00
kaetemi
874ac2c921 Move pipeline utilities into new pipeline library 
--HG--
branch : feature-material-editor
 2016-02-16 00:28:24 +01:00
kervala
9913ec7e72 Fixed: Don't try to convert next meshes if an error occurs 
--HG--
branch : develop
 2016-02-13 13:58:21 +01:00
kervala
7ed708eae8 Fixed: Display an error if unable to find database.cfg 
--HG--
branch : develop
 2016-02-12 16:04:55 +01:00
kervala
fd1344a12e Fixed: NeL unit test with GCC 
--HG--
branch : develop
 2016-02-05 12:29:42 +01:00
kervala
e5a601c109 Changed: Unit tests for bytesToHumanReadableUnits 
--HG--
branch : develop
 2016-02-02 12:37:20 +01:00
kervala
b692b78718 Fixed: Tests for fromStringwith a boolean 
--HG--
branch : develop
 2016-02-02 11:38:08 +01:00
kervala
285965fe76 Added: New unit tests for common.h 
--HG--
branch : develop
 2016-02-02 11:37:46 +01:00
kervala
20c7c342ca Fixed: Don't display logs in console for unit tests 
--HG--
branch : develop
 2016-02-02 11:34:16 +01:00
Gary Preston
963ee5a66e Allow bnp_make to process "if" and "ifnot" argumenets multiple times instead of 
accepting only one instance or each.

--HG--
branch : develop
 2016-01-31 18:02:47 +00:00
Cédric OCHS
c2e444774e Merged in BWGaryP/ryzomcore/fix/bnp_make_call (pull request #134) 
Update BnpMake arguements to output bnp files to target folder/name using -o switch.

--HG--
branch : develop
 2016-01-31 14:57:54 +01:00
Gary Preston
45755dd86f Update BnpMake arguements to output bnp files to target folder/name 
using -o switch.

Exclude first element from package[1] which was used to build the targetBnp file
rather than a file to be included within the bnp.

--HG--
branch : fix/bnp_make_call
 2016-01-31 13:35:27 +00:00
kervala
63a36fc2f8 Changed: Removed libxml2 dependencies from other targets 
--HG--
branch : develop
 2016-01-27 12:56:16 +01:00
kervala
4c96c5a608 Fixed: Remove inherited dependency on libxml2 for all projects 
--HG--
branch : develop
 2016-01-26 23:42:55 +01:00
kervala
af2f38612a Fixed: Remove inherited dependency on libxml2 for all projects 
--HG--
branch : develop
 2016-01-26 22:30:13 +01:00
kervala
222544f902 Fixed: Display an error if adding more than once the same filename in BNP 
--HG--
branch : develop
 2016-01-23 18:49:10 +01:00
kervala
5892fb8c1c Fixed: -o option of tga2dds for directory output 
--HG--
branch : develop
 2016-01-23 13:02:29 +01:00
kervala
1ca826cda9 Changed: Use CBigFile to manage BNP and CCmdArgs for command-line in bnp_make 
--HG--
branch : develop
 2016-01-23 12:30:01 +01:00
kervala
f8d45d01dc Changed: Replace tabs by spaces 
--HG--
branch : develop
 2016-01-23 12:28:40 +01:00
kervala
7f69309e39 Fixed: Link to Qt ICO plugin 
--HG--
branch : develop
 2016-01-23 10:59:30 +01:00
kervala
12d87b4914 Changed: Use CCmdArgs for tga2dds 
--HG--
branch : develop
 2016-01-23 10:27:34 +01:00
kervala
a08cdce803 Fixed: Use icon under Windows 
--HG--
branch : develop
 2016-01-21 10:05:26 +01:00
kervala
5fb0c5d279 Removed: Binary file generated by VC++ 
--HG--
branch : develop
 2016-01-19 20:35:59 +01:00
kervala
1864ad70db Fixed: Some unit tests with fromString 
--HG--
branch : develop
 2016-01-19 13:12:53 +01:00
kervala
e01f706ccc Fixed: Updated with new changes 
--HG--
branch : develop
 2016-01-18 21:48:00 +01:00
kervala
c379c61ab7 Changed: Don't need to create it on heap 
--HG--
branch : develop
 2016-01-18 13:27:48 +01:00
kervala
fc645a5668 Fixed: Import static platform plugin 
--HG--
branch : develop
 2016-01-18 13:27:23 +01:00
kaetemi
fd950a692b Faster Qt startup 
--HG--
branch : develop
 2016-01-18 11:27:14 +01:00
Tobias Peters
48c7404c74 Merged github:zerotacg/ryzomcore/issue/fix-failing-unit-tests 
--HG--
branch : issue/fix-failing-unit-tests
 2016-01-17 20:05:02 +01:00
kervala
58d23bbe97 Fixed: Compilation with static Qt 5 
--HG--
branch : develop
 2016-01-17 13:23:25 +01:00
kervala
bb9ac688f6 Changed: Set CMP0020 NEW in root project 
--HG--
branch : develop
 2016-01-16 23:48:32 +01:00
kervala
4886da5855 Fixed: moc doesn't use the right namespace for std::string when using STLPort, so prefer QString for slots and signals 
--HG--
branch : develop
 2016-01-16 15:55:56 +01:00
kervala
cd021fc4ef Fixed: Compilation with Qt 5 and STLport (std::move doesn't exist) 
--HG--
branch : develop
 2016-01-16 15:54:46 +01:00
kervala
c427bb216b Fixed: Compilation with Qt 5 and STLport (std::move doesn't exist) 
--HG--
branch : develop
 2016-01-16 15:52:51 +01:00
kaetemi
9c687430c8 Update mask pixel format in panoply preview tool 
--HG--
branch : develop
 2016-01-15 17:22:27 +01:00
kaetemi
8673d27a13 Add panoply preview tool 
--HG--
branch : develop
 2016-01-15 17:11:10 +01:00
kervala
c844a0bdd1 Fixed: Compilation 
--HG--
branch : develop
 2016-01-14 23:46:19 +01:00
kervala
b7fe07d781 Improve CCmdArgs (a generic command line parser in NeL Misc), fixes #257 
--HG--
branch : develop
 2016-01-14 21:26:10 +01:00
kervala
bd5f838d6d Changed: Minor changes 
--HG--
branch : develop
 2016-01-13 19:54:23 +01:00
kervala
d0c587e445 Changed: Remove duplicate lines 
--HG--
branch : develop
 2016-01-13 19:53:20 +01:00
kervala
6a3292c600 Fixed: Convert .bank filenames with / and use existing CFile::fileExists 
--HG--
branch : develop
 2016-01-13 19:51:00 +01:00
kervala
bb3726fd46 Fixed: Compilation of object_viewer_widget in static under Linux 
--HG--
branch : develop
 2016-01-10 12:12:50 +01:00
kervala
3af2813fbf Fixed: Compilation 
--HG--
branch : develop
 2016-01-09 16:29:59 +01:00
kervala
14f48d821a Changed: Minor changes 
--HG--
branch : develop
 2016-01-09 15:57:20 +01:00
kervala
9ee32071d8 Fixed: Compilation under Linux 
--HG--
branch : develop
 2016-01-09 15:56:50 +01:00
kervala
59aff6a4bc Changed: Added more fromString tests 
--HG--
branch : develop
 2016-01-06 23:21:22 +01:00
kervala
245726f347 Changed: Don't need to use system API, NeL already has equivalent 
--HG--
branch : develop
 2016-01-06 23:20:40 +01:00
kervala
ea5b041844 Fixed: Compilation with Qt 4 
--HG--
branch : develop
 2016-01-06 16:01:53 +01:00
kervala
f323974dba Changed: Don't fix files within panoply_maker, use textures_optimizer (but checks can be enabled) 
--HG--
branch : develop
 2016-01-06 12:43:57 +01:00
kervala
03c9c93fc1 Changed: Comments to support DXTC1a for textures with one level of transparency later 
--HG--
branch : develop
 2016-01-06 12:35:21 +01:00
kervala
75eb7cb922 Changed: Compile tile_edit_qt and object_viewer_widget if WITH_QT5 is defined 
--HG--
branch : develop
 2016-01-06 12:33:58 +01:00
kervala
ec7699aca9 Fixed: Compilation of object_viewer_qt with Qt 5 
--HG--
branch : develop
 2016-01-06 12:33:05 +01:00
kervala
af14cbe3aa Fixed: Allow to select PNG and TGA for bitmaps 
--HG--
branch : develop
 2016-01-06 12:31:53 +01:00
kervala
2923fe7c89 Fixed: Remove dependency on Pic (NeL manages TGA and PNG itself, reused code by Kaetemi) 
--HG--
branch : develop
 2016-01-06 12:31:13 +01:00
kervala
fad179731a Fixed: Compilation of tile_edit_qt with Qt 5 
--HG--
branch : develop
 2016-01-06 12:29:34 +01:00
kervala
95404bd724 Fixed: Don't load grayscale textures as alpha 
--HG--
branch : develop
 2016-01-05 17:11:37 +01:00
kervala
f2b43c2d7e Changed: Added default checks for textures and masks (-t and -m) 
--HG--
branch : develop
 2016-01-05 12:57:26 +01:00
kervala
dc5ddadcbb Fixed: Alpha channel with 0 is correct, don't change it 
--HG--
branch : develop
 2016-01-05 12:54:47 +01:00
kervala
687301377e Fixed: Instead of returning an error, convert the bitmap in RGBA 
--HG--
branch : develop
 2016-01-05 12:53:32 +01:00
kervala
798cb1c7ce Fixed: Alpha channel with 0 is correct, don't change it 
--HG--
branch : develop
 2016-01-05 12:52:45 +01:00
kervala
aaa9c394d7 Fixed: If mask is using colors, convert it to grayscale using Red value (compatible with previous algorithm) 
--HG--
branch : develop
 2016-01-04 13:58:54 +01:00
kervala
ed98662de3 Changed: OutputPath is already "standardized" 
--HG--
branch : develop
 2016-01-04 13:57:21 +01:00
kervala
fe018c959b Changed: Use lowercase instead of uppercase for extensions 
--HG--
branch : develop
 2016-01-04 13:56:56 +01:00
kervala
6627c04a97 Changed: Copy tools related to client into client bundle under OS X 
--HG--
branch : develop
 2016-01-04 13:43:49 +01:00
kervala
79e3ec61b1 Changed: Convert masks to 8 bits grayscale instead of using only Red component of RGBA bitmaps 
--HG--
branch : develop
 2016-01-03 18:14:46 +01:00
kervala
33e701192d Fixed: Sign OS X binaries needed by client and copy them in Ryzom bundle 
--HG--
branch : develop
 2016-01-03 17:47:31 +01:00
kervala
06b83f85f7 Changed: Add an icon for crash_report under Windows 
--HG--
branch : develop
 2016-01-03 17:46:27 +01:00
kervala
de0df1645b Changed: Don't create bundle for Ryzom client tools (we will try to package them in same bundle) 
--HG--
branch : develop
 2016-01-02 22:23:49 +01:00
kervala
8087b76397 Fixed: Load 8bits textures as grayscale instead of alpha in textures_optimizer 
--HG--
branch : develop
 2016-01-02 20:29:24 +01:00
kervala
844b1e3d02 Fixed: Warnings with GCC 
--HG--
branch : develop
 2016-01-02 19:19:39 +01:00
kervala
0c98a86e4b Fixed: Display alpha as an integer 
--HG--
branch : develop
 2016-01-02 17:10:23 +01:00
kervala
20711e24e3 Fixed: Typos 
--HG--
branch : develop
 2016-01-02 17:04:45 +01:00
kervala
cf8ed540a7 Changed: Use new methods in panoply_maker 
--HG--
branch : develop
 2016-01-01 16:07:27 +01:00
kervala
80759eafb4 Changed: Minor changes 
--HG--
branch : develop
 2016-01-01 16:04:57 +01:00
kervala
e995b7221f Added: Textures optimizer tool 
--HG--
branch : develop
 2016-01-01 16:04:45 +01:00
kervala
8b770d41ac Fixed: Wrong bitmap size 
--HG--
branch : develop
 2015-12-29 16:15:07 +01:00
kervala
9b9ee4e492 Fixed: Install readme.txt in same directory if not using WITH_UNIX_STRUCTURE 
--HG--
branch : develop
 2015-12-28 18:16:07 +01:00
kervala
b93414cd27 Fixed: Warning when DDS_HEADER is not initialized 
--HG--
branch : develop
 2015-12-28 16:41:26 +01:00
kervala
5ccf0df1ab Changed: Allow panoply_maker to optimize textures and masks (remove alpha channel if useless) 
--HG--
branch : develop
 2015-12-28 16:37:32 +01:00
kervala
2d0d87a05e Fixed: Warnings with GCC 
--HG--
branch : develop
 2015-12-25 20:49:59 +01:00
kervala
360a634f5b Changed: Don't need to use XDG_CURRENT_DESKTOP under OS X 
--HG--
branch : develop
 2015-12-23 15:03:08 +01:00
kervala
5d64a01f58 Fixed: Use Xcb plugin for Qt 5 under Linux 
--HG--
branch : develop
 2015-12-23 15:00:49 +01:00
kervala
ad93a9005f Changed: Improve errors reporting 
--HG--
branch : develop
 2015-12-17 13:02:12 +01:00
kervala
a22e056de1 Fixed: Typos 
--HG--
branch : develop
 2015-12-17 12:51:26 +01:00
kervala
5efaa8360f Changed: Minor changes 
--HG--
branch : develop
 2015-12-17 12:48:57 +01:00
kervala
9d30c279e0 Fixed: Compilation of some tools with Qt 5 in static 
--HG--
branch : develop
 2015-12-13 13:09:25 +01:00
kervala
7ebe3088bb Fixed: Compile crash_report and ryzom_configuration if WITH_RYZOM_CLIENT is set 
--HG--
branch : develop
 2015-12-13 13:06:23 +01:00
kervala
fc951a24ce Fixed: Homogenize CFile::moveFile with other methods (use std::string instead of const char*) 
--HG--
branch : develop
 2015-12-13 13:03:16 +01:00
kervala
1fa2e22491 Changed: Port some tools to Qt 5 
--HG--
branch : develop
 2015-12-05 18:48:59 +01:00
kervala
7337ee4faa Fixed: Warning filePath not being a const char* 
--HG--
branch : develop
 2015-11-30 14:18:04 +01:00
kervala
4e5ed6060a Fixed: Warning string after #endif 
--HG--
branch : develop
 2015-11-30 10:27:03 +01:00
kaetemi
6c2490090d Merge with feature-export-assimp 
--HG--
branch : develop
 2015-11-16 00:46:27 +01:00
kervala
817486538c Changed: Minor changes 
--HG--
branch : develop
 2015-11-15 13:29:34 +01:00
kaetemi
ea7942b093 Be helpful 
--HG--
branch : feature-export-assimp
 2015-09-22 16:18:00 +02:00
kaetemi
6edff36476 Apply uv channel and transform 
--HG--
branch : feature-export-assimp
 2015-09-22 16:00:07 +02:00
kaetemi
7f31e640da Initial work on UV 
--HG--
branch : feature-export-assimp
 2015-09-21 23:47:19 +02:00
kaetemi
27e7095db9 Import material texture 
--HG--
branch : feature-export-assimp
 2015-09-21 18:11:35 +02:00
kaetemi
f8bb35c449 Adjust material import 
--HG--
branch : feature-export-assimp
 2015-09-21 15:53:12 +02:00
kaetemi
5fe1f2c711 Fix typo 
--HG--
branch : feature-export-assimp
 2015-09-20 21:47:26 +02:00
kaetemi
efccbdd3af Export shape 
--HG--
branch : feature-export-assimp
 2015-09-20 21:41:53 +02:00
kaetemi
c9aef7b5a4 Import basic material options 
--HG--
branch : feature-export-assimp
 2015-09-20 21:08:30 +02:00
kaetemi
ac5d9272f1 Adjust 
--HG--
branch : feature-export-assimp
 2015-09-20 19:12:33 +02:00
kaetemi
3a7b5c6a46 Note 
--HG--
branch : feature-export-assimp
 2015-09-20 19:06:07 +02:00
kaetemi
9e20f83e48 Shape import 
--HG--
branch : feature-export-assimp
 2015-09-20 19:03:05 +02:00
kaetemi
e60a9747b8 Restructure 
--HG--
branch : feature-export-assimp
 2015-09-20 17:22:24 +02:00
kaetemi
33dd77d516 Skeleton scan 
--HG--
branch : feature-export-assimp
 2015-09-20 17:03:44 +02:00
kaetemi
fec41ebda9 Scene meta data 
--HG--
branch : feature-export-assimp
 2015-09-20 16:44:56 +02:00
kaetemi
dec6c2d880 Centralized asset database configuration 
--HG--
branch : feature-export-assimp
 2015-09-20 15:23:27 +02:00
kaetemi
8036d53411 Add pipeline v3 tool logger 
--HG--
branch : feature-export-assimp
 2015-09-20 14:08:38 +02:00
kaetemi
875d7eaa7c Flag bones in scene for skel export 
--HG--
branch : feature-export-assimp
 2015-09-19 19:35:57 +02:00
kaetemi
7d502cc6bb Command line options 
--HG--
branch : feature-export-assimp
 2015-09-19 18:08:25 +02:00
kaetemi
d55124a6a9 Placeholder projects 
--HG--
branch : feature-export-assimp
 2015-09-19 17:14:35 +02:00
kaetemi
7d53552979 Fix object viewer include issue 
--HG--
branch : develop
 2015-07-10 07:54:34 +02:00
kaetemi
edebe18d6c MFC now requires XP or higher 
--HG--
branch : develop
 2015-07-10 06:24:17 +02:00
kaetemi
f578f0441a Add extra light groups for better lightmap control 
--HG--
branch : develop
 2015-04-16 17:39:47 +02:00
kaetemi
d9f3efc4e3 ryzomcore/v0.12.0 
--HG--
branch : develop
 2015-04-14 11:55:08 +02:00
kaetemi
2d74de8a36 Separate dither matrix per color channel 
--HG--
branch : develop
 2015-03-30 12:04:35 +02:00
kaetemi
2da42040ef Apply bayer dither to TGA16 export for smoother lightmaps 
--HG--
branch : develop
 2015-03-30 11:22:25 +02:00
kaetemi
9d36ac8cb0 Merge with hotfix 
--HG--
branch : develop
 2015-03-07 00:01:02 +01:00
kaetemi
621a9e8f7c ryzomcore/v0.11.3 
--HG--
branch : hotfix
 2015-03-06 23:53:34 +01:00
kaetemi
2d297efc2a Merge with hotfix 
--HG--
branch : develop
 2015-03-06 23:40:48 +01:00
kaetemi
846abf93c9 Synchronize versions 
--HG--
branch : hotfix
 2015-03-06 23:37:21 +01:00
kaetemi
5a297ddbe4 Flag max plugins as windowed 
--HG--
branch : develop
 2015-03-06 21:20:01 +01:00
kaetemi
f2f7bad4c5 Merge with feature-crashreport 
--HG--
branch : feature-crashreport+develop
 2015-03-06 19:08:13 +01:00
kaetemi
a9dc1a4c68 Fix checkbox behaviour 
--HG--
branch : feature-crashreport
 2015-03-06 19:06:10 +01:00
kaetemi
b896405b3d Adjust layout 
--HG--
branch : feature-crashreport
 2015-03-06 19:06:10 +01:00
kaetemi
699e1644e7 Use proper style sheet for crash report under Cinnamon 
--HG--
branch : feature-crashreport
 2015-03-06 19:06:10 +01:00
kaetemi
0a567afc53 Merge with feature-crashreport 
--HG--
branch : feature-crashreport+develop
 2015-03-06 16:01:05 +01:00
dfighter1985
baa5273eaa Default return value. 
--HG--
branch : feature-crashreport
 2015-03-03 03:10:28 +01:00
dfighter1985
3714d15c60 Merged mainline changes.. 
--HG--
branch : feature-crashreport
 2015-03-03 03:05:14 +01:00
dfighter1985
7ca008ba86 Don't offer send in non-dev mode when there's no log file specified. 
--HG--
branch : feature-crashreport
 2015-03-03 02:37:51 +01:00
dfighter1985
d561a7078c Only send email if the email CB is checked. 
--HG--
branch : feature-crashreport
 2015-03-03 02:33:04 +01:00
dfighter1985
3108e5e013 Send report in dev mode if the CB is checked. 
--HG--
branch : feature-crashreport
 2015-03-03 02:30:39 +01:00
dfighter1985
374d966069 Some more GUI changes. 
--HG--
branch : feature-crashreport
 2015-03-02 21:06:01 +01:00
dfighter1985
d666240343 Added return codes as requested. 
--HG--
branch : feature-crashreport
 2015-03-02 20:12:09 +01:00
dfighter1985
9d92e2d0d3 GUI changes as per requested by Kaetemi. 
--HG--
branch : feature-crashreport
 2015-03-02 19:52:39 +01:00
kaetemi
4dd5955484 Merge with feature-crashreport 
--HG--
branch : feature-crashreport+develop
 2015-02-24 17:19:41 +01:00
kaetemi
826907c8dd Qt5 compile fix for crash report tool 
--HG--
branch : feature-crashreport
 2015-02-24 17:18:48 +01:00
kaetemi
6a48a2d199 Merge with feature-crashreport 
--HG--
branch : feature-crashreport+develop
 2015-02-24 11:41:05 +01:00
kaetemi
77d17265eb Visual Studio 2013 compilation support for Ryzom Server 
--HG--
branch : develop
 2015-02-23 12:58:43 +01:00
dfighter1985
2bb5e8e9ba Remove generated log file when quitting the reporter. 
--HG--
branch : feature-crashreport
 2015-02-22 22:34:07 +01:00
dfighter1985
955ef48460 Parametrize crash reporter. 
--HG--
branch : feature-crashreport
 2015-02-22 21:51:17 +01:00
dfighter1985
cfe2d60350 More renames... 
--HG--
branch : feature-crashreport
 2015-02-22 19:52:01 +01:00
dfighter1985
3987971792 Renames. 
--HG--
branch : feature-crashreport
 2015-02-22 19:33:38 +01:00