Commit graph

5125 commits

Author SHA1 Message Date
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
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
Nimetu
2771185ef7 Fix utf8 tooltips on web links
--HG--
branch : develop
2015-04-19 20:26:38 +03:00
Nimetu
8e1ada36b0 Use cURL as http transport
--HG--
branch : develop
2015-04-17 17:41:01 +03:00
Nimetu
c6535ee2fd Ensure that html is valid utf8 and that tags come in correct(ish) order
--HG--
branch : develop
2015-04-18 23:23:23 +03:00
Nimetu
be95880a95 Remove libwww, only keep html entitites list
--HG--
branch : develop
2015-04-17 15:10:00 +03:00
kaetemi
f578f0441a Add extra light groups for better lightmap control
--HG--
branch : develop
2015-04-16 17:39:47 +02:00
Jan Boon
bc3624c42f Merged in nimetu/ryzomcore/libxml2-html-parser (pull request #127)
implement html parser using libxml2

--HG--
branch : develop
2015-04-16 17:01:47 +02:00
kaetemi
f07e471597 Merge with develop (ryzomcore/v0.12.0)
--HG--
branch : compatibility-develop
2015-04-14 11:57:40 +02:00
kaetemi
d9f3efc4e3 ryzomcore/v0.12.0
--HG--
branch : develop
2015-04-14 11:55:08 +02:00
Nimetu
d1d0c0cf50 Parse local files (ingame help) with new html parser
--HG--
branch : libxml2-html-parser
2015-04-13 20:53:10 +03:00
Nimetu
1dc48143f3 Implement html parser using libxml2
--HG--
branch : libxml2-html-parser
2015-04-13 20:52:34 +03:00
Nimetu
5d4cbdce26 Remove libwww dependency from CGroupHTML::addLink() signature
--HG--
branch : libxml2-html-parser
2015-04-13 20:51:39 +03:00
kervala
9882d17a45 Merge with develop
--HG--
branch : compatibility-develop
2015-04-05 16:45:34 +02:00
kervala
87c198efbe Fixed compilation of font sample
--HG--
branch : develop
2015-04-05 13:52:05 +02:00
Jan Boon
f36e06dfb9 Merged in nimetu/ryzomcore (pull request #126)
add bold, italic, underline, strikethrough font styles

--HG--
branch : develop
2015-04-01 06:20:41 +02:00
Nimetu
15766d4d17 Add radio button type to CGroupHTML (issue 237)
--HG--
branch : develop
2015-03-31 18:47:46 +03: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
Nimetu
eeb881d49e Add span tag and bold, italic, underline, strikethrough styles to CGroupHTML
--HG--
branch : develop
2015-03-29 18:24:19 +03:00
Nimetu
55672485c9 Add embolden, oblique, underline, strikethrough styles to CViewText
--HG--
branch : develop
2015-03-29 18:24:16 +03:00
kaetemi
5bb34b12f4 Use unordered set and map for VS2013, ref #236
--HG--
branch : develop
2015-03-29 16:58:07 +02:00
kaetemi
769d5190c5 Fixes for VS2013, ref #236
--HG--
branch : develop
2015-03-29 16:58:07 +02:00
kaetemi
ec30735198 Fixup some more hashes
--HG--
branch : develop
2015-03-29 16:58:07 +02:00
kaetemi
1a5a0d5acb Fix CHashCode compare operator
--HG--
branch : develop
2015-03-29 16:58:07 +02:00
Nimetu
c760b1e3d9 Add embolden, oblique font styles (NL3D)
--HG--
branch : develop
2015-03-29 17:28:33 +03:00
kaetemi
e0d4aa1e7b Add Wang hash functions
--HG--
branch : develop
2015-03-29 03:14:06 +02:00
kervala
09169bfa87 Merge with hotfix
--HG--
branch : compatibility-develop
2015-03-24 15:52:41 +01:00
kervala
906cc01768 Merge with hotfix
--HG--
branch : develop
2015-03-24 15:52:16 +01:00
kervala
d76d8e52c9 Fixed compilation with GCC
--HG--
branch : hotfix
2015-03-24 15:51:32 +01:00
kervala
67b7e02983 Merge with develop
--HG--
branch : compatibility-develop
2015-03-24 15:30:58 +01:00
kervala
80874abf68 Fixed compilation (setReportEmailFunction doesn't exist anymore)
--HG--
branch : develop
2015-03-24 15:26:34 +01:00
kervala
f4ddf2dd86 Changed: Minor changes
--HG--
branch : compatibility-develop
2015-03-07 17:51:12 +01:00
kervala
97eac497ff Merge with develop
--HG--
branch : compatibility-develop
2015-03-07 17:03:34 +01:00
kaetemi
3c04d70f28 Merge ryzomcore/v0.11.3
--HG--
branch : compatibility
2015-03-07 00:03:48 +01:00
kaetemi
9d36ac8cb0 Merge with hotfix
--HG--
branch : develop
2015-03-07 00:01:02 +01:00
kaetemi
86f24a00b7 EOL
--HG--
branch : hotfix
2015-03-06 23:56:49 +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
d788d224d5 EOL
--HG--
branch : develop
2015-03-06 23:39:53 +01:00
kaetemi
cb298d556b Add script to increment version numbers
--HG--
branch : hotfix
2015-03-06 23:38:37 +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
3c120cd398 Flag studio as windowed application
--HG--
branch : develop
2015-03-06 21:17:20 +01:00
kaetemi
28bcfeb01c Flag windowed application when attempting window creation using 3D driver
--HG--
branch : develop
2015-03-06 21:15:09 +01:00
kaetemi
29f42ed5ab Some practical improvements for the report handling
--HG--
branch : develop
2015-03-06 21:07:12 +01:00
kaetemi
163abf31b8 Merge with feature-crashreport+develop
--HG--
branch : develop
2015-03-06 21:05:31 +01:00
kaetemi
f2f7bad4c5 Merge with feature-crashreport
--HG--
branch : feature-crashreport+develop
2015-03-06 19:08:13 +01:00
kaetemi
ee32b56d87 Replace report functionality
--HG--
branch : feature-crashreport
2015-03-06 19:07:25 +01:00
kaetemi
5a307cfa20 Replace report functionality
--HG--
branch : feature-crashreport
2015-03-06 19:06:11 +01:00
kaetemi
bbfc15c07a Extend debugging sample
--HG--
branch : feature-crashreport
2015-03-06 19:06:10 +01:00
kaetemi
a9dc1a4c68 Fix checkbox behaviour
--HG--
branch : feature-crashreport
2015-03-06 19:06:10 +01:00
kaetemi
230be4d64b Extend debugging sample
--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
9d50210e6b Enable crash report tool in debugging sample application
--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
kervala
242b19e9e2 Fixed: Compilation
--HG--
branch : develop
2015-03-03 18:59:23 +01:00
dfighter1985
74cb91d460 This was left here unintentionally.
--HG--
branch : feature-crashreport
2015-03-03 03:10:59 +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
kervala
f999cc892c Fixed: Compilation with GCC
--HG--
branch : develop
2015-03-02 23:51:23 +01:00
kervala
c2139e95c0 Fixed: Compilation with GCC
--HG--
branch : develop
2015-03-02 23:27:12 +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
kervala
5e390364de Changed: Minor change
--HG--
branch : develop
2015-03-02 13:13:45 +01:00
kervala
93a708400e Fixed: Sort files in CFileContainer::addSearchPath too
--HG--
branch : develop
2015-03-02 13:13:26 +01:00
kervala
bb429f0ea9 Changed: Use NLMISC::toString instead of itoa
--HG--
branch : develop
2015-03-02 13:09:57 +01:00
kervala
a0c60bc896 Changed: Use CFile::createEmptyFile()
--HG--
branch : develop
2015-03-02 13:09:16 +01:00