Commit graph

5196 commits

Author SHA1 Message Date
kervala
9e88fa645b Changed: Support for integer types in Lua 5.3, fixes #253
--HG--
branch : develop
2015-11-14 18:19:58 +01:00
kervala
64e4468943 Merge with develop
--HG--
branch : compatibility-develop
2015-11-14 12:13:12 +01:00
kervala
53f46eb5fa Changed: Support for integer types in Lua 5.3, fixes #253
--HG--
branch : develop
2015-11-14 11:46:17 +01:00
kervala
7f62faa794 Merge with develop
--HG--
branch : compatibility-develop
2015-11-13 19:52:35 +01:00
kervala
08d50dc725 Changed: Don't try to convert string to CRGBA if less than 3 integers
--HG--
branch : develop
2015-11-13 19:38:46 +01:00
kervala
630a22d428 Changed: Minor changes
--HG--
branch : develop
2015-11-13 19:37:32 +01:00
kervala
c854201d91 Changed: Removed useless LoadLuaDebugger
--HG--
branch : develop
2015-11-13 19:36:46 +01:00
kervala
aa3d209d39 Fixed: Crash in CLuaManager
--HG--
branch : develop
2015-11-13 19:18:41 +01:00
kervala
a8d81c689b Changed: Support for integer types in Lua 5.3, fixes #253
--HG--
branch : develop
2015-11-13 18:42:50 +01:00
kervala
4a97f339a3 Changed: Replaced some NLMISC::strlwr by NLMISC::toLower
--HG--
branch : develop
2015-11-13 16:22:49 +01:00
Nimetu
c5a3d993be Merge with develop
--HG--
branch : compatibility-develop
2015-11-12 23:48:57 +02:00
Nimetu
4bb0da6a72 Correctly save and restore screen resolution from icfg file
--HG--
branch : develop
2015-11-12 23:47:23 +02:00
Nimetu
bc9593e938 Merge with develop
--HG--
branch : compatibility-develop
2015-11-12 20:15:28 +02:00
Nimetu
76ee797e49 Add lua function CCtrlBase::setTooltipUtf8 to set tooltip from html page
--HG--
branch : develop
2015-11-12 20:15:04 +02:00
Nimetu
55e687e80d Fixed displaying utf8 string on <img> alt attr.
--HG--
branch : develop
2015-11-12 16:01:57 +02:00
kervala
28bbf76c8f Fixed: Bug with language in URLs
--HG--
branch : compatibility-develop
2015-11-11 16:40:42 +01:00
kervala
a1c89b0d7b Fixed: Wrong comparison
--HG--
branch : compatibility-develop
2015-11-09 12:48:07 +01:00
kervala
cdab63fb2c Merge with develop
--HG--
branch : compatibility-develop
2015-11-09 12:47:24 +01:00
kervala
7258054350 Fixed: Don't put same twice frequencies in list
--HG--
branch : develop
2015-11-09 12:46:55 +01:00
kervala
e8b0ae3f81 Changed: Don't log nldebug in Release
--HG--
branch : develop
2015-11-09 12:46:02 +01:00
kervala
1d11914192 Fixed: Include AvailabilityMacros.h before using macro MAC_OS_X_VERSION_10_6
--HG--
branch : develop
2015-11-09 12:45:34 +01:00
kervala
f8ad0e4466 Merge with develop
--HG--
branch : compatibility-develop
2015-11-09 10:48:04 +01:00
kervala
9525d24cd7 Fixed: Compilation with old libcurl versions
--HG--
branch : develop
2015-11-09 10:47:28 +01:00
kervala
3f55f85e10 Changed: Frequency to 0 to enable automatic detection
--HG--
branch : compatibility-develop
2015-11-09 10:05:39 +01:00
kervala
2548561d1e Changed: Removed unused/invalid URLs and updated some of them
--HG--
branch : compatibility-develop
2015-11-09 10:04:43 +01:00
kervala
cc7c889775 Merge with develop
--HG--
branch : compatibility-develop
2015-11-09 10:01:24 +01:00
kervala
5e07440a1e Changed: Display OpenGL version and GPU used in logs
--HG--
branch : develop
2015-11-09 10:00:51 +01:00
kervala
2f3aab5c74 Changed: Support for WGL_NV_gpu_affinity extension
--HG--
branch : develop
2015-11-09 10:00:05 +01:00
kervala
d32a61d481 Changed: Updated OpenGL headers
--HG--
branch : develop
2015-11-09 09:56:13 +01:00
kervala
e634e3ecf1 Fixed: Missing #endif
--HG--
branch : develop
2015-11-09 09:55:58 +01:00
kervala
a340260e40 Fixed: Force use of NVIDIA GPU if Optimus is present
--HG--
branch : develop
2015-11-09 09:55:38 +01:00
kervala
53783c0e71 Changed: Support new forums URLs
--HG--
branch : compatibility-develop
2015-11-08 14:47:56 +01:00
kervala
9cfebf3eb3 Changed: Remove hardcoded FAQ URLs
--HG--
branch : compatibility-develop
2015-11-08 14:21:26 +01:00
kervala
1e892148c7 Merge with develop
--HG--
branch : compatibility-develop
2015-11-08 14:14:53 +01:00
kervala
326520465c Fixed: If frequency is 0, use the first one in list
--HG--
branch : develop
2015-11-08 13:43:31 +01:00
kervala
744966acd6 Changed: More comments
--HG--
branch : develop
2015-11-08 13:43:02 +01:00
kervala
b56686b9b7 Changed: Release modes list under OS X
--HG--
branch : develop
2015-11-08 13:42:31 +01:00
kervala
a49723178d Changed: Centralize OS X 10.6 check in NL_MAC_VERSION_10_6_UP
--HG--
branch : develop
2015-11-08 13:35:16 +01:00
kervala
2be81c5445 Changed: Replace int 3 asm by __debugbreak()
--HG--
branch : develop
2015-11-08 13:25:36 +01:00
kervala
2b155c2d50 Changed: Minor changes
--HG--
branch : develop
2015-11-08 13:22:33 +01:00
kervala
3ac728872e Fixed: Typos (renamed restaure to restore)
--HG--
branch : develop
2015-11-08 11:53:46 +01:00
kervala
25febfa3bc Merge
--HG--
branch : develop
2015-11-08 10:48:42 +01:00
Nimetu
b3ffea9a17 Merge with develop
--HG--
branch : compatibility-develop
2015-11-08 05:16:07 +02:00
Nimetu
84dfa01176 Fixed: CViewText not updating visible text when used by CCtrlTextButton
--HG--
branch : develop
2015-11-08 05:15:40 +02:00
Nimetu
dc01c6afec Merge with develop
--HG--
branch : compatibility-develop
2015-11-08 03:07:14 +02:00
Nimetu
8a55f1b1e9 Changed: Allow to set max concurrent cURL connections per CGroupHTML instance
--HG--
branch : develop
2015-11-08 01:51:34 +02:00
kervala
831a3eb7b7 Changed: Minor changes
--HG--
branch : develop
2015-11-07 22:57:41 +01:00
kervala
c2c930035c Changed: Use new Ryzom icon under Windows
--HG--
branch : develop
2015-11-07 22:56:45 +01:00
kervala
6fa9131bf8 Merge with develop
--HG--
branch : compatibility-develop
2015-11-07 18:34:25 +01:00
kervala
cafc06e70c Fixed: Clang warnings
--HG--
branch : develop
2015-11-07 18:33:43 +01:00
kervala
c4ea200633 Changed: Minor changes (spaces replaced by tabs)
--HG--
branch : develop
2015-11-07 18:33:16 +01:00
kervala
67a857e0fe Fixed: Use ShellExecute to open a document or URL as primary method, because second one doesn't work everytime
--HG--
branch : develop
2015-11-07 18:31:58 +01:00
kervala
cf4de232fc Changed: Updated default settings for official client
--HG--
branch : compatibility-develop
2015-11-07 15:57:38 +01:00
kervala
5a34740b15 Added: Steam OS X script installscript_osx.vdf
--HG--
branch : compatibility-develop
2015-11-07 15:56:47 +01:00
kervala
54ce40729d Fixed: Add revision in Info.plist for long version
--HG--
branch : compatibility-develop
2015-11-07 14:57:43 +01:00
kervala
d30be0841e Merge with develop
--HG--
branch : compatibility-develop
2015-11-07 14:55:30 +01:00
kervala
b944892c8f Fixed: Clang warning, ContinentMngr.cur() is checked later
--HG--
branch : develop
2015-11-07 14:54:24 +01:00
kervala
ffb600e03e Changed: Minor changes
--HG--
branch : develop
2015-11-07 14:53:49 +01:00
kervala
716c4cdab5 Changed: Add support for Spanish
--HG--
branch : develop
2015-11-07 14:53:07 +01:00
kervala
9b231afa54 Fixed: Get system language code under OS X too and added method in NLMISC::CI18N
--HG--
branch : develop
2015-11-07 14:52:46 +01:00
kervala
f095121991 Merge with develop
--HG--
branch : compatibility-develop
2015-11-06 15:49:55 +01:00
kervala
285eeeab26 Fixed: Compilation errors when constant not defined
--HG--
branch : develop
2015-11-06 15:48:48 +01:00
kervala
9e74adee86 Changed: Minor changes
--HG--
branch : develop
2015-11-06 15:48:23 +01:00
kervala
2baddc78ac More checks before to get a pointer on a CCDBNodeLeaf, fixes #251
--HG--
branch : develop
2015-11-06 15:47:58 +01:00
kervala
93a03b5db0 Fixed: clang warnings
--HG--
branch : develop
2015-11-06 15:24:19 +01:00
kervala
2e96c40211 Changed: Revert back to official client version (revision will be displayed in Ryzom Core client)
--HG--
branch : compatibility-develop
2015-11-05 17:42:43 +01:00
kervala
8b0d8282bc Merge with develop
--HG--
branch : compatibility-develop
2015-11-05 17:30:12 +01:00
kervala
94b7148d44 Fixed: Wrong index for video modes comparison (nFoundMode was an index in strings not CMode list, now renamed to nFoundStringMode)
--HG--
branch : develop
2015-11-05 17:26:45 +01:00
kervala
2a9b9deaf9 Fixed: Didn't initialize video modes frequencies
--HG--
branch : develop
2015-11-05 17:22:43 +01:00
kervala
804c5cb80b Fixed: Update also Depth and Frequency with default resolution
--HG--
branch : develop
2015-11-05 17:18:14 +01:00
kervala
56e1f5eff0 Changed: Centralize version different formats
--HG--
branch : develop
2015-11-05 17:16:55 +01:00
kervala
1b211566bb Fixed: Unable to debug Ryzom while client is in fullscreen (bug with Windows 10?)
--HG--
branch : develop
2015-11-05 16:48:07 +01:00
kervala
c6ea264f24 Fixed: cURL static version needs to be linked against libidn under Linux too
--HG--
branch : develop
2015-11-05 16:47:07 +01:00
kervala
b44b24acd3 Merge with develop
--HG--
branch : compatibility-develop
2015-11-05 09:30:56 +01:00
Nimetu
7d9f4030ff Fixed: Wrong key shortcuts in debug help screen (issue #241)
--HG--
branch : develop
2015-11-04 19:42:42 +02:00
kervala
cfb5fd56df Changed: Updated translations
--HG--
branch : develop
2015-11-04 17:29:56 +01:00
kervala
e00376a584 Added: Bin directory for translations
--HG--
branch : develop
2015-11-04 15:45:17 +01:00
kervala
959fc6a961 Changed: Updated translations
--HG--
branch : develop
2015-11-04 15:35:42 +01:00
kervala
f01ff0a222 Added: Tutorial for translations
--HG--
branch : develop
2015-11-04 15:27:47 +01:00
kervala
499a2605e0 Added: Translations diff directory
--HG--
branch : develop
2015-11-04 10:47:27 +01:00
kervala
c67f177297 Added: Client-side translations
--HG--
branch : develop
2015-11-04 10:41:30 +01:00
Nimetu
4c8b2d3134 Add basic gif support to CBitmap (issue #238)
--HG--
branch : develop
2015-11-03 18:50:31 +02:00
kervala
a15d9b803e Merge with develop
--HG--
branch : compatibility-develop
2015-11-03 14:04:38 +01:00
kervala
f1a75132dd Changed: CMake end tags
--HG--
branch : develop
2015-11-03 14:04:06 +01:00
kervala
44bfc85c7a Fixed: Wrong external detection (we don't use libwww anymore, so new external don't have it)
--HG--
branch : develop
2015-11-03 14:03:46 +01:00
kervala
1f68b32b7b Merge with develop
--HG--
branch : compatibility-develop
2015-11-03 13:42:07 +01:00
kervala
6aaeedb077 Fixed: Crash when cursor is over WebPage, Outpost or WebIG at first frame, patch by kishan_grimout (issue #245)
--HG--
branch : develop
2015-11-03 13:40:49 +01:00
Nimetu
4abb02afcd Merge with develop
--HG--
branch : compatibility-develop
2015-11-03 01:13:18 +02:00
Nimetu
f187421011 Fixed: Crash in CWidgetManager::sendClockTickEvent when element removed from _ClockMsgTargets (issue #250)
--HG--
branch : develop
2015-11-03 01:06:12 +02:00
kervala
93f27a1a48 Merge with develop
--HG--
branch : compatibility-develop
2015-11-01 20:13:33 +01:00
kervala
69100c20f0 Fixed: Wrong end tags
--HG--
branch : develop
2015-11-01 17:04:59 +01:00
kervala
ec39ef13bf Changed: Support for Lua 5.3 (can be improved)
--HG--
branch : develop
2015-11-01 17:04:41 +01:00
kervala
12614d5ff4 Fixed: Avoid warnings of conflicts between Debug and Release DLLs
--HG--
branch : develop
2015-11-01 16:47:39 +01:00
kervala
e1b810ab85 Fixed: Crash when displaying configuration window
--HG--
branch : develop
2015-11-01 16:46:47 +01:00
kervala
0e96e3505d Fixed: Use official support URL
--HG--
branch : compatibility-develop
2015-10-31 16:14:34 +01:00
kervala
41be501160 Merge with develop
--HG--
branch : compatibility-develop
2015-10-25 15:17:26 +01:00
kervala
5fc3c52df9 Fixed: Don't add dependency on target revision if not defined
--HG--
branch : develop
2015-10-25 15:16:29 +01:00
kervala
52800cd03b Fixed: GCC 5 version check fails for PCH support
--HG--
branch : develop
2015-10-25 15:11:27 +01:00
kervala
8df64e7c4f Merge with develop
--HG--
branch : compatibility-develop
2015-10-06 20:32:46 +02:00
kervala
2910b1a375 Fixed: Warnings with CMake
--HG--
branch : develop
2015-10-06 20:31:41 +02:00
kervala
eb5f46fbae Changed: Use less verbose version for ELSE(), ENDIF(), ENDFOREACH() and ENDMACRO()
--HG--
branch : develop
2015-10-06 20:30:43 +02:00
kervala
aa3a9dcead Merge with develop
--HG--
branch : compatibility-develop
2015-10-01 14:54:18 +02: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
kervala
67c6edc9ae Changed: Use invalid screen mode by default (will be overridden by config files)
--HG--
branch : develop
2015-09-22 09:55:06 +02:00
kervala
00c36d3ac4 Changed: If Width and Height are invalid, use current screen mode
--HG--
branch : develop
2015-09-22 09:46:51 +02:00
kervala
9459224f23 Fixed: GetVersionEx deprecated under Windows 8.1+ and returns wrong version, replace it by RtlGetVersion from kernel
--HG--
branch : develop
2015-09-22 09:43:24 +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
8179ee3836 Add assimp dependency
--HG--
branch : feature-export-assimp
2015-09-19 16:46:59 +02:00
Nimetu
08e5345e14 Fix 'ah:' urls for untrusted domains
--HG--
branch : develop
2015-08-11 19:35:27 +03:00
kaetemi
7d53552979 Fix object viewer include issue
--HG--
branch : develop
2015-07-10 07:54:34 +02:00
kaetemi
96116c6eba Todo note
--HG--
branch : develop
2015-07-10 06:33:14 +02:00
kaetemi
5e428761c5 Fix freetype include order
WINSDK added a fttypes.h header...

--HG--
branch : develop
2015-07-10 06:30:20 +02:00
kaetemi
edebe18d6c MFC now requires XP or higher
--HG--
branch : develop
2015-07-10 06:24:17 +02:00
kaetemi
9a10f1413b Fix DXSDK include order
--HG--
branch : develop
2015-07-10 06:16:19 +02:00
kaetemi
cac661dbca SDK 8.1 support
--HG--
branch : develop
2015-07-10 05:50:05 +02:00
kaetemi
0cd51d59c7 Fix VS2013 64bit compiler error
C1128: number of sections exceeded object file format limit : compile with /bigobj

--HG--
branch : develop
2015-07-10 02:31:04 +02:00
Nimetu
c51d3ae2e0 Merge with develop
--HG--
branch : compatibility-develop
2015-06-17 00:43:48 +03:00
Nimetu
04cffc1559 Fix missing include when WITH_PCH=OFF
--HG--
branch : develop
2015-06-17 00:36:54 +03:00
kishan_grimout
83a81801ea fix crash when a shader fails to build
--HG--
branch : develop
2015-05-23 16:50:24 +02:00
kervala
a21ebfe544 Merge with develop
--HG--
branch : compatibility-develop
2015-04-25 19:49:15 +02:00
kervala
39670e5b77 Comment translation
--HG--
branch : develop
2015-04-25 19:17:58 +02:00
kervala
7cecd18eee Save space in debug screen to display VPB and VPC
--HG--
branch : develop
2015-04-25 19:16:06 +02:00
kervala
b4e0b46ac9 Fixed uint to bool conversion warning
--HG--
branch : develop
2015-04-25 18:28:03 +02:00
kervala
9a55ee46b7 Removed dependency on libwww
--HG--
branch : develop
2015-04-25 12:53:52 +02:00
kervala
385e066ac0 Merge with develop
--HG--
branch : compatibility-develop
2015-04-22 17:58:09 +02:00
Nimetu
11ca61be54 Fix compiling on 32bit linux
--HG--
branch : develop
2015-04-22 13:44:21 +03:00
Nimetu
c58e10f173 Add "select_shortcut_bar_2" action handler (issue 222)
--HG--
branch : develop
2015-04-21 18:54:08 +03:00
Nimetu
ce4cb9c4f1 Fix sending and receiving cookies
--HG--
branch : develop
2015-04-20 20:51:00 +03:00
Nimetu
a6cf9730be Fix possible curl handle leak
--HG--
branch : develop
2015-04-20 20:50:56 +03:00
kervala
4600c74b6b Merge with develop
--HG--
branch : compatibility-develop
2015-04-20 13:38:51 +02:00
Nimetu
26571de439 Fix compiling under windows
--HG--
branch : develop
2015-04-20 01:04:52 +03:00
Nimetu
dc082f3921 Replace url parser with one less strict
--HG--
branch : develop
2015-04-19 22:12:05 +03:00
Nimetu
ad3fac7b15 Make sure image src attribute matches local file or is absolute url
--HG--
branch : develop
2015-04-19 22:01:46 +03:00