kervala
ddff1b4e5e
Merge with develop
...
--HG--
branch : compatibility-develop
2016-02-04 14:33:30 +01:00
kaetemi
9602fcc8f0
Also support AppData/Local to allow a non-roaming config
...
--HG--
branch : develop
2016-02-04 13:02:32 +01:00
kaetemi
8ea6f521d3
Fix for VS2008 build
...
--HG--
branch : develop
2016-02-04 12:07:36 +01:00
kervala
fa4fb1992d
Merge with develop
...
--HG--
branch : compatibility-develop
2016-02-03 21:58:58 +01:00
kervala
6a7c33fa32
Changed: Updated launchProgramAndWaitForResult to support .bat files
...
--HG--
branch : develop
2016-02-03 21:58:29 +01:00
kervala
487aca0979
Merge with develop
...
--HG--
branch : compatibility-develop
2016-02-02 19:51:11 +01:00
kervala
923434aa72
Changed: Detect .bat file in launchProgram and adapt syntax of CreateProcess
...
--HG--
branch : develop
2016-02-02 19:49:37 +01:00
kervala
0e0dbf688d
Merge with develop
...
--HG--
branch : compatibility-develop
2016-02-02 19:31:12 +01:00
kervala
9b52f6bc28
Changed: Use "open" to open other programs too under OS X
...
--HG--
branch : develop
2016-02-02 19:20:34 +01:00
kervala
d8ddb1fd11
Fixed: Async execution of .bat under Windows
...
--HG--
branch : develop
2016-02-02 19:20:02 +01:00
kervala
6459d901ef
Merge with develop
...
--HG--
branch : compatibility-develop
2016-02-02 12:37:59 +01:00
kervala
e5a601c109
Changed: Unit tests for bytesToHumanReadableUnits
...
--HG--
branch : develop
2016-02-02 12:37:20 +01:00
kervala
092a3226bd
Changed: New function bytesToHumanReadableUnits to use specific strings for units
...
--HG--
branch : develop
2016-02-02 12:37:06 +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
kervala
7b1ab1592e
Fixed: Support new ISO units (KiB, MiB, etc...) in humanReadableToBytes
...
--HG--
branch : develop
2016-02-02 11:33:44 +01:00
kervala
0919fc66e4
Changed: Support more values for fromString with a boolean
...
--HG--
branch : develop
2016-02-02 11:32:20 +01:00
kervala
ed68c612ac
Merge with develop
...
--HG--
branch : compatibility-develop
2016-02-01 09:07:45 +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
f0d6d70b8c
merge with develop
...
--HG--
branch : compatibility-develop
2016-01-28 13:27:35 +01:00
kervala
6e93a0d395
Fixed: Wrong return value for CCmdArgs::haveAdditionalArg
...
--HG--
branch : develop
2016-01-28 13:25:21 +01:00
kervala
ccfd1c9721
Merge with develop
...
--HG--
branch : compatibility-develop
2016-01-27 13:30:49 +01:00
kervala
63a36fc2f8
Changed: Removed libxml2 dependencies from other targets
...
--HG--
branch : develop
2016-01-27 12:56:16 +01:00
kervala
eae2e3fea1
Merge with develop
...
--HG--
branch : compatibility-develop
2016-01-26 23:43:34 +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
fbed1d5854
Merge with develop
...
--HG--
branch : compatibility-develop
2016-01-26 23:30:48 +01:00
kervala
093ee91656
Fixed: libxml2 dependencies
...
--HG--
branch : develop
2016-01-26 23:26:38 +01:00
kervala
325242c2e4
Merge with develop
...
--HG--
branch : compatibility-develop
2016-01-26 22:44:40 +01:00
kervala
89319eb99c
Changed: Put libxml code in .cpp (it was a hack for libwww, that is not used anymore...)
...
--HG--
branch : develop
2016-01-26 22:41:58 +01:00
kervala
df22787f90
Changed: Added PCH for logic
...
--HG--
branch : develop
2016-01-26 22:41:02 +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
700b75f44a
Merge with develop
...
--HG--
branch : compatibility-develop
2016-01-23 19:07:13 +01:00
kervala
7237736922
Changed: Make absolute program path (useful if launched from current directory under Linux)
...
Changed: Set process name for logs
--HG--
branch : develop
2016-01-23 18:50:17 +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
0505395fd1
Fixed: toLower shouldn't transform a eszett to s
...
--HG--
branch : develop
2016-01-23 18:48:25 +01:00
kervala
e6b2e0088b
Merge with develop
...
--HG--
branch : compatibility-develop
2016-01-23 13:03:27 +01:00
kervala
5892fb8c1c
Fixed: -o option of tga2dds for directory output
...
--HG--
branch : develop
2016-01-23 13:02:29 +01:00
kervala
5adebf258d
Merge with develop
...
--HG--
branch : compatibility-develop
2016-01-23 12:30:33 +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
9aff198d70
Fixed: Return true if a required argument is found
...
--HG--
branch : develop
2016-01-23 12:28:22 +01:00
kervala
a8a1e04299
Merge with develop
...
--HG--
branch : compatibility-develop
2016-01-23 10:59:56 +01:00
kervala
7f69309e39
Fixed: Link to Qt ICO plugin
...
--HG--
branch : develop
2016-01-23 10:59:30 +01:00
kervala
5f70be0308
Merge with develop
...
--HG--
branch : compatibility-develop
2016-01-23 10:28:00 +01:00
kervala
12d87b4914
Changed: Use CCmdArgs for tga2dds
...
--HG--
branch : develop
2016-01-23 10:27:34 +01:00
kervala
9aea637643
Merge with develop
...
--HG--
branch : compatibility-develop
2016-01-23 10:19:01 +01:00
kervala
e2cc9e622e
Changed: Minor changes
...
--HG--
branch : develop
2016-01-23 10:18:23 +01:00
kervala
19aa093ea8
Changed: Centralize BNP unpacking and packing methods, to be reused in other tools/programs
...
--HG--
branch : develop
2016-01-23 10:18:09 +01:00
kervala
93e1289a77
Changed: Add a parameter to CPath::makePathAbsolute to simplify the path (remove all . and ..)
...
--HG--
branch : develop
2016-01-23 09:44:41 +01:00
kervala
5a6580dc38
Merge with develop
...
--HG--
branch : compatibility-develop
2016-01-21 10:08:56 +01:00
kervala
aff9cccd0c
Changed: Improve toString(const bool &val)...
...
--HG--
branch : develop
2016-01-21 10:06:35 +01:00
kervala
a08cdce803
Fixed: Use icon under Windows
...
--HG--
branch : develop
2016-01-21 10:05:26 +01:00
Nimetu
6b13fdd770
Merge with develop
...
--HG--
branch : compatibility-develop
2016-01-20 19:15:45 +02:00
Nimetu
52dcf1a300
Changed: Use url from <base> element for relative urls
...
--HG--
branch : develop
2016-01-20 19:15:20 +02:00
kervala
f50c9c0866
Merge with develop
...
--HG--
branch : compatibility-develop
2016-01-19 20:42:11 +01:00
kervala
fa22852adb
Changed: Removed fromString(const char *, ...) because useless
...
--HG--
branch : develop
2016-01-19 20:41:41 +01:00
kervala
5cc2b2865f
Changed: Local includes against system includes
...
--HG--
branch : develop
2016-01-19 20:38:05 +01:00
kervala
00395d6b2e
Fixed: Compilation without PCH
...
--HG--
branch : develop
2016-01-19 20:37:03 +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
d96e1da521
Merge with develop
...
--HG--
branch : compatibility-develop
2016-01-18 21:48:31 +01:00
kervala
e01f706ccc
Fixed: Updated with new changes
...
--HG--
branch : develop
2016-01-18 21:48:00 +01:00
kervala
d54e569b3f
Merge with develop
...
--HG--
branch : compatibility-develop
2016-01-18 21:32:01 +01:00
kervala
b91e3bdf0e
Changed: Improved CCmdArgs
...
--HG--
branch : develop
2016-01-18 21:22:57 +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
6ea1421fd3
Merge with develop
...
--HG--
branch : compatibility-develop
2016-01-17 13:24:01 +01:00
kervala
58d23bbe97
Fixed: Compilation with static Qt 5
...
--HG--
branch : develop
2016-01-17 13:23:25 +01:00
kervala
cc282fd3d5
Merge with develop
...
--HG--
branch : compatibility-develop
2016-01-16 23:50:23 +01:00
kervala
c5fbf56984
Fixed: Missing ++
...
--HG--
branch : develop
2016-01-16 23:48:44 +01:00
kervala
bb9ac688f6
Changed: Set CMP0020 NEW in root project
...
--HG--
branch : develop
2016-01-16 23:48:32 +01:00
kervala
b3cfd5f6bb
Fixed: Use lua_tointeger under Lua 5.2 and prior versions
...
--HG--
branch : develop
2016-01-16 21:35:34 +01:00
kervala
b149c94a26
Merge with develop
...
--HG--
branch : compatibility-develop
2016-01-16 15:58:19 +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
kervala
8b5dcc345d
Fixed: Link to X11 under Linux
...
--HG--
branch : develop
2016-01-16 15:50:45 +01:00
kervala
cca0dd450e
Merge with develop
...
--HG--
branch : compatibility-develop
2016-01-16 10:52:18 +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
kaetemi
8cfaa89620
Separate window displayer message stringify
...
--HG--
branch : develop
2016-01-15 17:10:39 +01:00
kaetemi
e4b72e63a1
More of the VS2015 stuff
...
--HG--
branch : develop
2016-01-15 12:29:05 +01:00
kaetemi
f7d05ea8e4
VS2015 fixes for NeL Samples
...
--HG--
branch : develop
2016-01-15 12:22:35 +01:00
kaetemi
9a0c6290a2
Fix another VS2015 warning
...
--HG--
branch : develop
2016-01-15 12:07:33 +01:00
kaetemi
da02779588
More VS2015 fixes
...
--HG--
branch : develop
2016-01-15 12:04:06 +01:00
kaetemi
3632ae4e64
Fix VS2015 warnings
...
--HG--
branch : develop
2016-01-15 11:52:09 +01:00
kaetemi
9a477d976b
VS2015 compilation fixes
...
--HG--
branch : develop
2016-01-15 11:34:23 +01:00
kervala
72c70dee6a
Merge with develop
...
--HG--
branch : compatibility-develop
2016-01-14 23:58:34 +01:00
kervala
9a34434cf8
Fixed: Compilation
...
--HG--
branch : develop
2016-01-14 23:58:04 +01:00
kervala
f54b41f5cc
Merge with develop
...
--HG--
branch : compatibility-develop
2016-01-14 23:54:26 +01:00
kervala
875224d277
Changed: Minor changes
...
--HG--
branch : develop
2016-01-14 23:53:17 +01:00
kervala
c1d8d4e400
Changed: Invert version and help checks
...
--HG--
branch : develop
2016-01-14 23:47:24 +01:00
kervala
c844a0bdd1
Fixed: Compilation
...
--HG--
branch : develop
2016-01-14 23:46:19 +01:00
kervala
f820e7b703
Merge with develop
...
--HG--
branch : compatibility-develop
2016-01-14 21:28:47 +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
3c4f324bfe
Merge with develop
...
--HG--
branch : compatibility-develop
2016-01-13 20:05:06 +01:00
kervala
57f216dc3e
Changed: Expand environment variables in paths read from cfg files
...
--HG--
branch : develop
2016-01-13 19:59:09 +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
e1c14db5a0
Fixed: getLastSeparator should return std::string::size_type instead of an integer
...
--HG--
branch : develop
2016-01-13 19:47:35 +01:00
kervala
a66fa8cc9c
Changed: Implement CPath::isAbsolutePath
...
--HG--
branch : develop
2016-01-13 19:46:27 +01:00
kervala
af9610328f
Changed: Implement expandEnvironmentVariables function
...
--HG--
branch : develop
2016-01-13 19:45:02 +01:00
kervala
ad36e59a71
Fixed: Save filenames in .bank with / instead of system separator
...
--HG--
branch : develop
2016-01-13 19:43:46 +01:00
kervala
df816b2a5d
Merge with develop
...
--HG--
branch : compatibility-develop
2016-01-12 22:32:22 +01:00
kervala
49ef5a1ed7
Fixed: lua_tointeger doesn't work if value has a decimal part and returns 0
...
--HG--
branch : develop
2016-01-12 22:21:38 +01:00
kervala
6471fada97
Merge with develop
...
--HG--
branch : compatibility-develop
2016-01-11 11:44:44 +01:00
kervala
59c06630cd
Changed: Table keys are integers
...
--HG--
branch : develop
2016-01-11 11:43:59 +01:00
kervala
839928a57a
Fixed: In Lua, all integers are numbers and numbers can be converted to integers
...
--HG--
branch : develop
2016-01-11 11:34:32 +01:00
Nimetu
e44e131365
Merge with develop
...
--HG--
branch : compatibility-develop
2016-01-10 16:34:13 +02:00
Nimetu
ad8059c345
Fixed: Invalid image width/height on error
...
--HG--
branch : develop
2016-01-10 16:33:42 +02:00
kervala
63983cd5ac
Merge with develop
...
--HG--
branch : compatibility-develop
2016-01-10 12:13:59 +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
ef8c8d0401
Merge with develop
...
--HG--
branch : compatibility-develop
2016-01-09 16:32:59 +01:00
kervala
3af2813fbf
Fixed: Compilation
...
--HG--
branch : develop
2016-01-09 16:29:59 +01:00
kervala
9dc7f5102b
Merge with develop
...
--HG--
branch : compatibility-develop
2016-01-09 16:08:34 +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
3f4a5010f6
Merge with develop
...
--HG--
branch : compatibility-develop
2016-01-07 17:41:02 +01:00
kervala
9e8cd07e4b
Changed: HAVE_X86_64 is defined or not
...
--HG--
branch : develop
2016-01-07 17:39:53 +01:00
kervala
b3a392d559
Changed: Minor changes
...
--HG--
branch : develop
2016-01-07 17:36:17 +01:00
Nimetu
511a004827
Fixed: Wrong DD indent in nested list when tag is not closed
...
--HG--
branch : develop
2016-01-07 01:00:48 +02:00
kervala
ef29c2b5ef
Merge with develop
...
--HG--
branch : compatibility-develop
2016-01-06 23:22:57 +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
ad3df5084a
Merge with develop
...
--HG--
branch : compatibility-develop
2016-01-06 16:06:23 +01:00
kervala
ea5b041844
Fixed: Compilation with Qt 4
...
--HG--
branch : develop
2016-01-06 16:01:53 +01:00
kervala
ddba3e583c
Merge with develop
...
--HG--
branch : compatibility-develop
2016-01-06 13:22:47 +01:00
kervala
ecb47bc2dc
Changed: Remove unused variable
...
--HG--
branch : develop
2016-01-06 13:21:47 +01:00
kervala
0ef79083a0
Changed: Code simplification
...
--HG--
branch : develop
2016-01-06 13:19:48 +01:00
kervala
80ae07c8b3
Changed: Minor changes
...
--HG--
branch : develop
2016-01-06 13:17:07 +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
6efce5ba59
Changed: Support for new key events
...
--HG--
branch : develop
2016-01-06 12:42:10 +01:00
kervala
76744b18c7
Changed: Minor change
...
--HG--
branch : develop
2016-01-06 12:39:58 +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
Nimetu
410ddea49d
Merge with develop
...
--HG--
branch : compatibility-develop
2016-01-06 01:02:22 +02:00
Nimetu
8475f25e75
Changed: Refactor DL
...
--HG--
branch : develop
2016-01-06 00:11:17 +02:00
Nimetu
639ce91e61
Fixed: Align UL, LI list style type marker outside content
...
--HG--
branch : develop
2016-01-06 00:08:41 +02:00
Nimetu
6bcb153930
Fixed: DL list top margin
...
--HG--
branch : develop
2016-01-05 23:23:19 +02:00
Nimetu
f95d445839
Fixed: DL list DD element indent
...
--HG--
branch : develop
2016-01-05 23:02:21 +02:00