Commit graph

5911 commits

Author SHA1 Message Date
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
d5749430f7 Fixed: Typo in Lua 5.3 module
--HG--
branch : develop
2016-01-17 13:21:27 +01:00
Cédric OCHS
47087e3d22 Merged in zerotacg/ryzomcore/feature-build-with-all-lua-versions (pull request #130)
build travis ci with each lua version enabled

--HG--
branch : develop
2016-01-17 10:37:21 +01:00
Tobias Peters
ae2bdb14b6 Merged github:zerotacg/ryzomcore/feature/build-with-all-lua-versions
--HG--
branch : feature-build-with-all-lua-versions
2016-01-17 08:27:17 +01:00
kervala
cc282fd3d5 Merge with develop
--HG--
branch : compatibility-develop
2016-01-16 23:50:23 +01:00
kervala
0be5356f78 Fixed: Right directories
--HG--
branch : develop
2016-01-16 23:49:39 +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
5b3e181227 Changed: Minor changes
--HG--
branch : develop
2016-01-16 23:47:58 +01:00
kervala
06eb63183e Added: Config file for translation_tools
--HG--
branch : develop
2016-01-16 23:47:12 +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
f068c6ff66 Fixed: Removed tab
--HG--
branch : develop
2016-01-16 20:56:00 +01:00
kervala
f84b7f781a Fixed: Travis-ci config syntax
--HG--
branch : develop
2016-01-16 19:37:28 +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
074fdb5c22 Fixed: Link to static libxml2 under Linux
--HG--
branch : develop
2016-01-16 15:50:17 +01:00
kervala
5c772f45b4 Changed: Update year in copyright automatically
--HG--
branch : develop
2016-01-16 15:47:13 +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
d5654ad62e Fix bad printf parameters
--HG--
branch : develop
2016-01-15 16:42:21 +01:00
kaetemi
53b62c66d2 More of that VS2015 magic
--HG--
branch : develop
2016-01-15 16:17:23 +01:00
kaetemi
5c6edf6cee And more VS2015 fixes
--HG--
branch : develop
2016-01-15 12:33:27 +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
fadb57ed00 Merge with develop
--HG--
branch : compatibility-develop
2016-01-15 10:47:37 +01:00
kervala
fd80a0f22d Changed: Update WindowsSDK CMake module for VC++ 2015
--HG--
branch : develop
2016-01-15 10:46:34 +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
563f92d27b Fixed: Use language name in native language in config window
--HG--
branch : compatibility-develop
2016-01-14 22:42:34 +01:00
kervala
f820e7b703 Merge with develop
--HG--
branch : compatibility-develop
2016-01-14 21:28:47 +01:00
kervala
cb26d897ae Fixed: Warning with clang
--HG--
branch : develop
2016-01-14 21:27:42 +01:00
kervala
27ae7dddf0 Fixed: Right directory under OS X
--HG--
branch : develop
2016-01-14 21:27:10 +01:00
kervala
7d9a8b28c8 Fixed: Don't display D3D page under Linux and OS X
--HG--
branch : develop
2016-01-14 21:26: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
7f5a9f4d91 Merge with develop
--HG--
branch : compatibility-develop
2016-01-14 10:22:22 +01:00
kervala
c8c563807d Fixed: Compilation under OS X
--HG--
branch : develop
2016-01-14 10:21:50 +01:00