Commit graph

5276 commits

Author SHA1 Message Date
kaetemi
607ecda469 Flag bones in scene for skel export 2015-09-19 19:35:57 +02:00
kaetemi
d08d09b341 Command line options 2015-09-19 18:08:25 +02:00
kaetemi
8fc6c08aa6 Placeholder projects 2015-09-19 17:14:35 +02:00
kaetemi
681c1e089b Add assimp dependency 2015-09-19 16:46:59 +02:00
Nimetu
79c101b4a2 Fix 'ah:' urls for untrusted domains 2015-08-11 19:35:27 +03:00
kaetemi
04ce449901 Fix object viewer include issue 2015-07-10 07:54:34 +02:00
kaetemi
80d4e91d74 Todo note 2015-07-10 06:33:14 +02:00
kaetemi
5a297fd58d Fix freetype include order
WINSDK added a fttypes.h header...
2015-07-10 06:30:20 +02:00
kaetemi
8602783c96 MFC now requires XP or higher 2015-07-10 06:24:17 +02:00
kaetemi
ab0aed948a Fix DXSDK include order 2015-07-10 06:16:19 +02:00
kaetemi
e8e66df3cd SDK 8.1 support 2015-07-10 05:50:05 +02:00
kaetemi
d411833ee0 Fix VS2013 64bit compiler error
C1128: number of sections exceeded object file format limit : compile with /bigobj
2015-07-10 02:31:04 +02:00
Nimetu
139eb409da Merge with develop 2015-06-17 00:43:48 +03:00
Nimetu
a62a049f46 Fix missing include when WITH_PCH=OFF 2015-06-17 00:36:54 +03:00
kishan_grimout
eef81cf802 fix crash when a shader fails to build 2015-05-23 16:50:24 +02:00
kervala
32efe50809 Merge with develop 2015-04-25 19:49:15 +02:00
kervala
0d0023ddaa Comment translation 2015-04-25 19:17:58 +02:00
kervala
34999ce0db Save space in debug screen to display VPB and VPC 2015-04-25 19:16:06 +02:00
kervala
08451bad7d Fixed uint to bool conversion warning 2015-04-25 18:28:03 +02:00
kervala
0a20a6b7a1 Removed dependency on libwww 2015-04-25 12:53:52 +02:00
kervala
4a90702d42 Merge with develop 2015-04-22 17:58:09 +02:00
Nimetu
1ae44aecdd Fix compiling on 32bit linux 2015-04-22 13:44:21 +03:00
Nimetu
7966725977 Add "select_shortcut_bar_2" action handler (issue 222) 2015-04-21 18:54:08 +03:00
Nimetu
e14c131332 Fix sending and receiving cookies 2015-04-20 20:51:00 +03:00
Nimetu
db2cee5b84 Fix possible curl handle leak 2015-04-20 20:50:56 +03:00
kervala
1baab1ba2d Merge with develop 2015-04-20 13:38:51 +02:00
Nimetu
8d86495364 Fix compiling under windows 2015-04-20 01:04:52 +03:00
Nimetu
f8813e4d2e Replace url parser with one less strict 2015-04-19 22:12:05 +03:00
Nimetu
d7da85970d Make sure image src attribute matches local file or is absolute url 2015-04-19 22:01:46 +03:00
Nimetu
918d2c70fe Fix utf8 tooltips on web links 2015-04-19 20:26:38 +03:00
Nimetu
7e54d79be2 Use cURL as http transport 2015-04-17 17:41:01 +03:00
Nimetu
0933ffc9d2 Ensure that html is valid utf8 and that tags come in correct(ish) order 2015-04-18 23:23:23 +03:00
Nimetu
f3c99aa589 Remove libwww, only keep html entitites list 2015-04-17 15:10:00 +03:00
kaetemi
d77f0c0b42 Add extra light groups for better lightmap control 2015-04-16 17:39:47 +02:00
Jan Boon
14b39953ac Merged in nimetu/ryzomcore/libxml2-html-parser (pull request #127)
implement html parser using libxml2
2015-04-16 17:01:47 +02:00
kaetemi
d0d8155e4e Merge with develop (ryzomcore/v0.12.0) 2015-04-14 11:57:40 +02:00
kaetemi
dc7e040d94 ryzomcore/v0.12.0 2015-04-14 11:55:08 +02:00
Nimetu
6198b7f496 Parse local files (ingame help) with new html parser 2015-04-13 20:53:10 +03:00
Nimetu
55a3c66c78 Implement html parser using libxml2 2015-04-13 20:52:34 +03:00
Nimetu
1f08e3ac94 Remove libwww dependency from CGroupHTML::addLink() signature 2015-04-13 20:51:39 +03:00
kervala
4896487f69 Merge with develop 2015-04-05 16:45:34 +02:00
kervala
de78560bdd Fixed compilation of font sample 2015-04-05 13:52:05 +02:00
Jan Boon
dd4c90785e Merged in nimetu/ryzomcore (pull request #126)
add bold, italic, underline, strikethrough font styles
2015-04-01 06:20:41 +02:00
Nimetu
746a0b9f24 Add radio button type to CGroupHTML (issue 237) 2015-03-31 18:47:46 +03:00
kaetemi
4c91c4a7d9 Separate dither matrix per color channel 2015-03-30 12:04:35 +02:00
kaetemi
76a1deb882 Apply bayer dither to TGA16 export for smoother lightmaps 2015-03-30 11:22:25 +02:00
Nimetu
c1670e1318 Add span tag and bold, italic, underline, strikethrough styles to CGroupHTML 2015-03-29 18:24:19 +03:00
Nimetu
a1c11a07ba Add embolden, oblique, underline, strikethrough styles to CViewText 2015-03-29 18:24:16 +03:00
kaetemi
25a399ae9e Use unordered set and map for VS2013, ref #236 2015-03-29 16:58:07 +02:00
kaetemi
84f9d64872 Fixes for VS2013, ref #236 2015-03-29 16:58:07 +02:00
kaetemi
63df17a63c Fixup some more hashes 2015-03-29 16:58:07 +02:00
kaetemi
0a2d358e31 Fix CHashCode compare operator 2015-03-29 16:58:07 +02:00
Nimetu
b5b5dcd031 Add embolden, oblique font styles (NL3D) 2015-03-29 17:28:33 +03:00
kaetemi
9cd1a4528c Add Wang hash functions 2015-03-29 03:14:06 +02:00
kervala
334f9a16a8 Merge with hotfix 2015-03-24 15:52:41 +01:00
kervala
c72c040589 Merge with hotfix 2015-03-24 15:52:16 +01:00
kervala
0d83cea719 Fixed compilation with GCC 2015-03-24 15:51:32 +01:00
kervala
5238249e61 Merge with develop 2015-03-24 15:30:58 +01:00
kervala
ed2d2a06de Fixed compilation (setReportEmailFunction doesn't exist anymore) 2015-03-24 15:26:34 +01:00
kervala
ce0ec3b912 Changed: Minor changes 2015-03-07 17:51:12 +01:00
kervala
d51e2fb861 Merge with develop 2015-03-07 17:03:34 +01:00
kaetemi
e8d8503631 Merge ryzomcore/v0.11.3 2015-03-07 00:03:48 +01:00
kaetemi
42944adf1d Merge with hotfix 2015-03-07 00:01:02 +01:00
kaetemi
9363bdc478 EOL 2015-03-06 23:56:49 +01:00
kaetemi
8d854e3e8d ryzomcore/v0.11.3 2015-03-06 23:53:34 +01:00
kaetemi
eaf44707a7 Merge with hotfix 2015-03-06 23:40:48 +01:00
kaetemi
7764fc3a26 EOL 2015-03-06 23:39:53 +01:00
kaetemi
3c29eac27c Add script to increment version numbers 2015-03-06 23:38:37 +01:00
kaetemi
08dfa4e628 Synchronize versions 2015-03-06 23:37:21 +01:00
kaetemi
a77c5d540b Flag max plugins as windowed 2015-03-06 21:20:01 +01:00
kaetemi
f904785238 Flag studio as windowed application 2015-03-06 21:17:20 +01:00
kaetemi
28a7017c00 Flag windowed application when attempting window creation using 3D driver 2015-03-06 21:15:09 +01:00
kaetemi
4afe23c6e3 Some practical improvements for the report handling 2015-03-06 21:07:12 +01:00
kaetemi
c5a40c2616 Merge with feature-crashreport+develop 2015-03-06 21:05:31 +01:00
kaetemi
ac7dcc4ed0 Merge with feature-crashreport 2015-03-06 19:08:13 +01:00
kaetemi
7078fdb064 Replace report functionality 2015-03-06 19:07:25 +01:00
kaetemi
14c10db490 Replace report functionality 2015-03-06 19:06:11 +01:00
kaetemi
f7055db542 Extend debugging sample 2015-03-06 19:06:10 +01:00
kaetemi
4bcb8811d6 Fix checkbox behaviour 2015-03-06 19:06:10 +01:00
kaetemi
0a2c891c75 Extend debugging sample 2015-03-06 19:06:10 +01:00
kaetemi
0c1bba4540 Adjust layout 2015-03-06 19:06:10 +01:00
kaetemi
9523abfe92 Use proper style sheet for crash report under Cinnamon 2015-03-06 19:06:10 +01:00
kaetemi
ea5a53ddc4 Enable crash report tool in debugging sample application 2015-03-06 19:06:10 +01:00
kaetemi
98ff7c1535 Merge with feature-crashreport 2015-03-06 16:01:05 +01:00
kervala
5cc2b16c87 Fixed: Compilation 2015-03-03 18:59:23 +01:00
dfighter1985
c369464776 This was left here unintentionally. 2015-03-03 03:10:59 +01:00
dfighter1985
5157e7a137 Default return value. 2015-03-03 03:10:28 +01:00
dfighter1985
2eb7a6648a Merged mainline changes.. 2015-03-03 03:05:14 +01:00
dfighter1985
de5c888318 Don't offer send in non-dev mode when there's no log file specified. 2015-03-03 02:37:51 +01:00
dfighter1985
2d7784aad4 Only send email if the email CB is checked. 2015-03-03 02:33:04 +01:00
dfighter1985
a761910a78 Send report in dev mode if the CB is checked. 2015-03-03 02:30:39 +01:00
kervala
4a1e0b58e5 Fixed: Compilation with GCC 2015-03-02 23:51:23 +01:00
kervala
a9f2459f35 Fixed: Compilation with GCC 2015-03-02 23:27:12 +01:00
dfighter1985
a579fbc924 Some more GUI changes. 2015-03-02 21:06:01 +01:00
dfighter1985
da6391ec1e Added return codes as requested. 2015-03-02 20:12:09 +01:00
dfighter1985
3080717012 GUI changes as per requested by Kaetemi. 2015-03-02 19:52:39 +01:00
kervala
29e95e59d3 Changed: Minor change 2015-03-02 13:13:45 +01:00
kervala
2e7e46b8f9 Fixed: Sort files in CFileContainer::addSearchPath too 2015-03-02 13:13:26 +01:00
kervala
b34e10adb4 Changed: Use NLMISC::toString instead of itoa 2015-03-02 13:09:57 +01:00
kervala
ae2ee4e0f3 Changed: Use CFile::createEmptyFile() 2015-03-02 13:09:16 +01:00
kervala
06e443abbe Fix #229 missing include in tools sources 2015-03-02 13:08:42 +01:00
kervala
d820233d21 Fixed: Skip .hg directories 2015-03-02 13:07:33 +01:00
kervala
619f33fffc Fix #208 linking against static libX11.a 2015-03-02 13:06:51 +01:00
Nimetu
ba1052672f Fix compilation 2015-03-01 18:41:16 +02:00
kaetemi
a84290983f Merge with feature-crashreport 2015-02-24 17:19:41 +01:00
kaetemi
04cca60cac Merge with develop 2015-02-24 17:19:27 +01:00
kaetemi
c60344217a Qt5 compile fix for crash report tool 2015-02-24 17:18:48 +01:00
kaetemi
e2c3fc8968 Fix FindLibOVR cmake script 2015-02-24 17:17:45 +01:00
kaetemi
7fa28fba72 Add isWindowedApplication to INeLContext 2015-02-24 17:17:45 +01:00
kaetemi
1f93a1024f Use ULL suffix for unsigned 64bit integer constants with Visual Studio 2013 2015-02-24 17:17:45 +01:00
kaetemi
8b14cd4121 Fix _MSC_VER typo 2015-02-24 17:17:45 +01:00
kaetemi
85c0a7e130 Merge with develop 2015-02-24 12:51:16 +01:00
kaetemi
e6593a326a Merge with feature-crashreport 2015-02-24 12:51:01 +01:00
kaetemi
c19ed5938b Cleanup Windows includes 2015-02-24 12:47:54 +01:00
kaetemi
692eab1c71 Add _WIN32_WINNT fallback define 2015-02-24 12:47:54 +01:00
kaetemi
edd1597b07 Remove redundant windows.h includes in NLMISC 2015-02-24 12:47:54 +01:00
kaetemi
946d80ae18 Categorize NLMISC project source files 2015-02-24 12:47:54 +01:00
kaetemi
0302156e24 Fix sstream include 2015-02-24 12:47:32 +01:00
kaetemi
5307229afa Merge with feature-crashreport 2015-02-24 11:41:05 +01:00
kaetemi
7f220d78ac Only in FINAL_VERSION 2015-02-23 20:33:31 +01:00
kaetemi
d01d3040c2 Default window title 2015-02-23 20:09:51 +01:00
kaetemi
680d59db49 Move crash report web application to appropriate directory 2015-02-23 20:07:29 +01:00
kaetemi
fa9da7caf8 Add function to set custom host url. Deprecate email callback function. Add some comments 2015-02-23 20:01:20 +01:00
kaetemi
ff010bc5d8 GCC/Linux version of NLMISC_BREAKPOINT 2015-02-23 19:23:15 +01:00
dfighter1985
d96159a2b7 Merged in dfighter1985/ryzomcore/feature-crashreport (pull request #122)
Crash reporter changes
2015-02-23 17:55:32 +01:00
kaetemi
f0a6384fbb Visual Studio 2013 compilation support for Ryzom Server 2015-02-23 13:16:50 +01:00
kaetemi
9eae8d81ec Visual Studio 2013 compilation support for Ryzom Tools 2015-02-23 13:13:11 +01:00
kaetemi
ff175a18cb Visual Studio 2013 compilation support for Ryzom Server 2015-02-23 13:08:03 +01:00
kaetemi
e64791ce55 Visual Studio 2013 compilation support for Ryzom Server 2015-02-23 12:58:43 +01:00
kaetemi
881bf2354e Visual Studio 2013 compilation support for Ryzom Server 2015-02-23 12:52:01 +01:00
kaetemi
fa91a85f55 Visual Studio 2013 compilation support for Ryzom Server 2015-02-23 12:48:41 +01:00
kaetemi
90b63768db Visual Studio 2013 compilation support for Ryzom Tools 2015-02-23 12:38:43 +01:00
kaetemi
05020d3b2a Visual Studio 2013 compilation support for Ryzom Server 2015-02-23 12:37:51 +01:00
kaetemi
4cd6fad710 Visual Studio 2013 compilation support for Ryzom Tools 2015-02-23 12:28:13 +01:00
kaetemi
ebdc7ba16b Visual Studio 2013 compilation support for Ryzom Server 2015-02-23 12:25:23 +01:00
dfighter1985
f7db38c7e1 Use CMsgBoxDisplayer on non-windows platforms as well. 2015-02-23 01:36:50 +01:00
kaetemi
d13e1bffdd Merge with hotfix 2015-02-22 23:50:39 +01:00
dfighter1985
7394873799 Remove generated log file when quitting the reporter. 2015-02-22 22:34:07 +01:00
dfighter1985
967275ec19 Parametrize crash reporter. 2015-02-22 21:51:17 +01:00
dfighter1985
8ed0e963de More renames... 2015-02-22 19:52:01 +01:00
dfighter1985
1c933a93c1 Renames. 2015-02-22 19:33:38 +01:00
dfighter1985
64a86fbd04 Renames. 2015-02-22 19:33:12 +01:00
dfighter1985
1b840d8734 renamed directory. 2015-02-22 19:28:02 +01:00
dfighter1985
82f298cb18 Changed default title to NeL Error Report. 2015-02-22 19:26:03 +01:00
dfighter1985
9d3f9c1c90 Moved to nel\tools\misc 2015-02-22 19:24:38 +01:00
dfighter1985
2f11ad54ac Class names in Nel start with a C... 2015-02-22 19:04:11 +01:00
dfighter1985
3569d88801 Copyright header changed to Nel... 2015-02-22 18:59:35 +01:00
dfighter1985
52250695f6 Launch the error report application instead of sending an email. 2015-02-22 18:45:41 +01:00
dfighter1985
8e745739cf Backed out from fdc0d40 2015-02-22 17:38:06 +01:00
dfighter1985
6be000a530 Backed out from 5942903 2015-02-22 17:20:24 +01:00
dfighter1985
32acbd5297 Back out from 5bb3dad 2015-02-22 17:15:41 +01:00
Jan Boon
ae7ee163a0 Merged in nimetu/ryzomcore/issue-221 (pull request #100)
improve chatlog file (issue #221)
2015-02-22 11:01:08 +01:00
kaetemi
60c7bfcf00 Merge with hotfix 2015-02-22 10:53:17 +01:00
kaetemi
3290bfd998 Merge with hotfix 2015-02-22 10:52:52 +01:00
kaetemi
d75b7f3491 Merge with dfighter-tools 2015-02-22 10:45:48 +01:00
kaetemi
891011b74c Merge with hotfix 2015-02-22 10:39:02 +01:00
kaetemi
f7fb9b2f37 Merge with hotfix 2015-02-22 10:38:36 +01:00
dfighter1985
7b89f9914b Merged in hotfix (pull request #118)
Merge hotfix branch
2015-02-21 23:10:13 +01:00
dfighter1985
4b15d60ec0 Merged in hotfix (pull request #117)
Merge hotfix branch
2015-02-21 23:09:07 +01:00
dfighter1985
218b413bd0 Removed unused references to CMsgBoxDisplayer. 2015-02-21 22:34:02 +01:00
dfighter1985
98cc1f03f8 Removed unused references to CMsgBoxDisplayer. 2015-02-21 22:34:02 +01:00
dfighter1985
9625ffb7dd A little cleanup of CMsgBoxDisplayer. 2015-02-21 22:32:11 +01:00
dfighter1985
8a571b8689 A little cleanup of CMsgBoxDisplayer. 2015-02-21 22:32:11 +01:00
dfighter1985
50d93d426a Use CMsgBoxDisplayer on platforms other than Windows as well. 2015-02-21 21:28:56 +01:00
dfighter1985
566d21f64e Use CMsgBoxDisplayer on platforms other than Windows as well. 2015-02-21 21:28:56 +01:00
dfighter1985
8771a4c69c Install rcerror 2015-02-21 20:01:44 +01:00
dfighter1985
d33da5fe44 Install rcerror 2015-02-21 20:01:44 +01:00
kaetemi
28a4989c17 Visual Studio 2013 compilation support for Ryzom Client 2015-02-20 18:10:06 +01:00
kaetemi
b8586b84ec Visual Studio 2013 compilation support for Ryzom Client 2015-02-20 17:57:11 +01:00
kaetemi
a5ede54ded Visual Studio 2013 compilation support for Ryzom Client 2015-02-20 17:53:39 +01:00
kaetemi
2e3c25251a Visual Studio 2013 compilation support for NeL Tools 2015-02-20 17:51:13 +01:00
kaetemi
ae1de68f3b Visual Studio 2013 compilation support for Ryzom Client 2015-02-20 17:50:58 +01:00
kaetemi
51721efeec Visual Studio 2013 compilation support for NLGUI 2015-02-20 17:17:07 +01:00
kaetemi
e60b2dc760 Visual Studio 2013 compilation support for NL3D 2015-02-20 17:14:12 +01:00
kaetemi
dedd5b7ef9 Visual Studio 2013 compilation support for NLSOUND 2015-02-20 17:14:00 +01:00
kaetemi
165151a7e6 Visual Studio 2013 compilation support for NLMISC 2015-02-20 17:07:23 +01:00
kaetemi
a8d366ead3 Visual Studio 2013 compilation support for NLPACS 2015-02-20 16:31:54 +01:00
kaetemi
e00310422f Visual Studio 2013 compilation support for NLNET 2015-02-20 16:29:09 +01:00
kaetemi
881bbc6083 Visual Studio 2013 compilation support for NLMISC 2015-02-20 16:24:19 +01:00
dfighter1985
893ef9e2aa Typo... 2015-02-20 03:22:02 +01:00
dfighter1985
0eb8913a20 Typo... 2015-02-20 03:22:02 +01:00
dfighter1985
3be42babfe Oups 2015-02-20 02:56:22 +01:00
dfighter1985
7e2e2ae56b Oups 2015-02-20 02:56:22 +01:00
dfighter1985
35eeb4697d Tell the user if the report couldn't be sent. 2015-02-20 02:54:05 +01:00
dfighter1985
31907ca35f Tell the user if the report couldn't be sent. 2015-02-20 02:54:05 +01:00
dfighter1985
dddcf6158c Override the cursor while sending the report. 2015-02-20 02:44:22 +01:00
dfighter1985
52bb68f547 Override the cursor while sending the report. 2015-02-20 02:44:22 +01:00
dfighter1985
457147d008 Unfortunately on Windows argc and argv parameters are unreliable inside a Qt application, so I had to hardcode the report file name. :( 2015-02-20 02:35:11 +01:00
dfighter1985
04480a3290 Unfortunately on Windows argc and argv parameters are unreliable inside a Qt application, so I had to hardcode the report file name. :( 2015-02-20 02:35:11 +01:00
dfighter1985
1e3fad50bb Probably a good idea to look for rcerror as rcerror.exe on Windows. 2015-02-20 02:03:33 +01:00
dfighter1985
a92f816f55 Probably a good idea to look for rcerror as rcerror.exe on Windows. 2015-02-20 02:03:33 +01:00
dfighter1985
8b92080b14 Implemented the bug report Qt app and an example web app that takes the report. 2015-02-20 01:59:04 +01:00
dfighter1985
aca8314fdb Implemented the bug report Qt app and an example web app that takes the report. 2015-02-20 01:59:04 +01:00
dfighter1985
02ec1b015e Added the Ryzom Core Error Reporter's skeleton. 2015-02-19 00:20:18 +01:00
dfighter1985
e962a41323 Added the Ryzom Core Error Reporter's skeleton. 2015-02-19 00:20:18 +01:00
dfighter1985
85fe754bf2 CMsgBoxDisplayer should not present a dialog now, but write the report to a file then attempt to launch the error reporter application. Which ofc doesn't exist yet in this commit. 2015-02-17 03:12:26 +01:00
dfighter1985
cc52abcfa0 CMsgBoxDisplayer should not present a dialog now, but write the report to a file then attempt to launch the error reporter application. Which ofc doesn't exist yet in this commit. 2015-02-17 03:12:26 +01:00
kervala
d51558e8dd Merge with hotfix 2015-02-15 09:54:55 +01:00
kervala
03a3a6bd3a Merge with hotfix 2015-02-15 09:54:31 +01:00
kervala
d5b620391e Fixed: Wrong include guard for admin_modules PCH 2015-02-15 09:53:56 +01:00
kervala
9718f37ec4 Merge with hotfix 2015-02-14 19:29:36 +01:00
kervala
8de4929777 Merge with hotfix 2015-02-14 17:54:50 +01:00
kervala
f07c2f51b8 Fixed: Warning multichars 2015-02-14 17:54:05 +01:00
kervala
f0ebd8d428 Fixed: Unnamed semaphores are deprecated under OS X 2015-02-14 17:52:15 +01:00
kervala
da7b88f052 Fixed: Warning assert always false 2015-02-14 17:47:55 +01:00
kervala
8e343db0fa Fixed: Warning comparing an enum to an int 2015-02-14 17:47:10 +01:00
kervala
8f04f658a4 Merge with hotfix 2015-02-14 16:07:04 +01:00
kervala
d228343d46 Merge with hotfix 2015-02-14 16:06:43 +01:00
kervala
c5ee1f3d95 Fixed: Compilation 2015-02-14 16:05:45 +01:00
kervala
9feac65c07 Merge with hotfix 2015-02-14 15:44:11 +01:00
kervala
eb3693229f Merge with hotfix 2015-02-14 15:43:40 +01:00
kervala
b023af51cf Added: PCH for admin_modules 2015-02-14 15:43:05 +01:00
kervala
33bfd6c72a Merge with hotfix 2015-02-14 15:20:19 +01:00
kervala
68e56e02b2 Merge with hotfix 2015-02-14 15:19:49 +01:00
kervala
f3b38eed9b Changed: Improved User Agent management 2015-02-14 15:18:53 +01:00
kervala
abc6a50c2d Changed: Added RYZOM_COMPATIBILITY_VERSION version string for compatibility branch 2015-02-14 15:09:18 +01:00
kervala
b2d7194606 Merge with develop 2015-02-14 14:36:37 +01:00
kervala
2dc4804c22 Merge with hotfix 2015-02-14 14:32:44 +01:00
kervala
5221bf199c Merge with hotfix 2015-02-14 14:31:19 +01:00
kervala
44d0c95b69 Fixed: Warning with multichars to int conversion 2015-02-14 14:25:50 +01:00
kervala
539f721624 Fixed: Compilation 2015-02-14 13:57:06 +01:00
kervala
779492b262 Changed: Updated CMale modules 2015-02-14 13:47:37 +01:00
kervala
c569b03d0c Changed: Replaced atoi and atof by NLMISC::fromString 2015-02-14 13:46:21 +01:00
kervala
eca33bfb95 Changed: Minor changes 2015-02-14 13:34:45 +01:00
kervala
491613e7fa Changed: Use Ryzom user agent for CURL 2015-02-14 13:19:53 +01:00
kervala
d478bf56a3 Fixed: Missing namespace 2015-02-14 13:19:09 +01:00
kervala
5b1926aeb4 Changed: std::string already initialized to en empty string 2015-02-14 13:18:51 +01:00
kervala
b6637fa6fe Changed: Used INVALID_AI_INSTANCE in CUsedContinent::getInstanceForContinent 2015-02-14 13:03:27 +01:00
kervala
bb5dc2c471 Changed: Possible bug if string not found 2015-02-14 12:54:17 +01:00
kervala
df3cdfab70 Fixed: Unable to patch when Ryzom was located on a mounted FS 2015-02-14 12:52:57 +01:00
kervala
72a50960cb Changed: Used PCH for admin_modules 2015-02-14 12:48:29 +01:00
kervala
a6cd459f33 Changed: Check getSpawn() before calling its methods 2015-02-14 12:47:54 +01:00
kervala
a5d69a78d7 Changed: Minor changes 2015-02-14 12:47:03 +01:00
kervala
65fb1bc8c1 Changed: Replaced atof by NLMISC::fromString 2015-02-14 12:43:29 +01:00
kervala
1ce011be38 Fixed: Compilation warnings 2015-02-14 12:41:59 +01:00
kervala
14046699bc Fixed: Only keep Release and Debug configurations in CMake 2015-02-14 12:06:19 +01:00
dfighter1985
fe97f54b33 Merged in hotfix (pull request #115)
Merging hotfix branch
2015-02-13 19:49:33 +01:00
dfighter1985
8b095f97b3 Merged in hotfix (pull request #114)
Merging hotfix branch
2015-02-13 19:48:42 +01:00
dfighter1985
f76650bb21 Add the data directory to the search path. 2015-02-11 20:42:31 +01:00
dfighter1985
a6ebf62e40 Added ryzom.ttf, it will be installed to the data directory. 2015-02-11 19:55:16 +01:00
dfighter1985
991a3fdf99 Include rgba.h in libwww.h. Thanks Nimetu! 2015-02-09 20:07:35 +01:00
dfighter1985
0f8c8f6655 Change the cursor to a wait cursor when applying settings in the settings dialog. 2015-02-09 19:55:27 +01:00
dfighter1985
70a83dbc45 We can now set whether to use OpenGL in WE in the WE settings page. For whatever reason VMware despises the OpenGL viewport so it's a good idea to turn it off inside VMware. 2015-02-09 19:49:16 +01:00
dfighter1985
05c3405e1b Renamed the studio startup settings dialog to avoid name conflict with the core plugin's settings dialog. 2015-02-09 17:54:27 +01:00
dfighter1985
4ea7c2025d Read the GUI Editor widget and expression definition XML files from the right directory. 2015-02-09 01:48:39 +01:00
dfighter1985
1c31ac6f05 Install the GUI Editor widget and expression definition files to the data dir. 2015-02-08 23:46:33 +01:00
dfighter1985
eaf5d26bae Handle relative paths when loading .worldedit files in World Editor. 2015-02-08 00:24:29 +01:00
dfighter1985
254f418f28 Merged in hotfix (pull request #112)
Merge hotfix
2015-02-06 02:32:37 +01:00
dfighter1985
ac2833e78d Merged in hotfix (pull request #111)
Merge hotfix
2015-02-06 02:32:03 +01:00
dfighter1985
23873f2e3a Erm. Initialize Nel3D on other platforms too... 2015-02-06 02:29:33 +01:00
dfighter1985
b754c91fef Merged in hotfix (pull request #109)
Merge hotfix branch
2015-02-06 00:46:23 +01:00
dfighter1985
aa6bc451c1 Merged in hotfix (pull request #108)
Merge hotfix branch.
2015-02-06 00:45:36 +01:00
dfighter1985
47f43b2a2e CPack should use the install prefix. 2015-02-06 00:31:51 +01:00
dfighter1985
689a9e0883 We need the LIGO config file, not directory in the first start settings dialog. 2015-02-05 23:50:38 +01:00
dfighter1985
dd09cc03be Merged in hotfix (pull request #106)
Merge hotfix
2015-02-02 23:32:55 +01:00
dfighter1985
5537d4b627 Merged in hotfix (pull request #105)
Merge hotfix
2015-02-02 23:32:08 +01:00
dfighter1985
b5e9dfbc9e Use release squish if debug not found. Fixes s3tc compressor tool build. 2015-02-02 23:25:11 +01:00
dfighter1985
94338a3742 Some CPack renames. 2015-02-02 22:51:43 +01:00
dfighter1985
c4fa07e1a9 Install tile editor's plugin spec to the right directory. 2015-02-02 22:41:29 +01:00
dfighter1985
8498b4aacd Fixed build of Object Viewer Widget Qt ( old, not part of Studio ). 2015-02-02 22:01:16 +01:00
dfighter1985
711261cb0d Merged hotfix 2015-02-02 03:54:50 +01:00
dfighter1985
688ea1285c Merged hotfix to compatibility. 2015-02-02 02:53:15 +01:00
dfighter1985
41e2e8b4db Merged mainline 2015-02-02 02:03:00 +01:00
dfighter1985
44760221f2 Initialize Nel3D in the Object Viewer plugin too. 2015-02-01 20:29:26 +01:00
kervala
e3de253702 Changed: Optimize sorting of files (instead of doing it several times for each directory, do it only once) 2015-01-23 21:11:15 +01:00
kervala
9981f07921 Fixed: Guilds with same characters and not same spaces 2015-01-21 13:20:56 +01:00
Nimetu
44663f0a6c Include chat message channel/type to chatlog file 2015-01-15 20:08:28 +02:00
kervala
1c543641c9 Fixed: Compilation 2015-01-13 20:35:34 +01:00
kervala
1675e7af3a Changed: Replaced atoi and atof by NLMISC::fromString 2015-01-13 19:47:14 +01:00
kervala
ef645e5421 Fixed: Compilation 2015-01-13 15:15:07 +01:00
kervala
d52a60b837 Fixed: Compilation 2015-01-13 15:08:13 +01:00
kervala
d6a2af6abd Changed: Minor changes 2015-01-13 14:11:07 +01:00
kervala
7987db85ca Changed: Replaced ~0 by corresponding std::numeric_limits<T>::max() 2015-01-13 13:47:19 +01:00
kaetemi
52cdc1e341 Lightmap debug message 2015-01-13 13:21:56 +01:00
kaetemi
f65356079e Unhide layers in max export 2015-01-13 13:21:56 +01:00
kervala
9dfc7944d7 Changed: Fixed a wrong copy-paste 2015-01-11 18:27:06 +01:00
kervala
b8b68c4ec1 Changed: Use defined directories prefixed by a default directory 2015-01-11 18:01:32 +01:00
kervala
9891de01ce Changed: Allow to use a readable and writable data path for IG patch (usefull when data are read only) 2015-01-11 15:06:02 +01:00
kervala
c90a3049c4 Changed: Append getAppBundlePath() to search paths under OS X 2015-01-11 14:59:15 +01:00
kervala
ef405c2f87 Changed: Don't use replaceApplicationDirToken anymore 2015-01-11 14:57:40 +01:00
kervala
5b492fdebe Changed: Typo 2015-01-11 14:56:51 +01:00
kervala
8880047f69 Fixed: Compilation with OS X SDK 10.10 2015-01-10 20:33:02 +01:00
kervala
afac054306 Fixed: Removed raw mouse mode for OS X too 2015-01-10 19:55:05 +01:00
kervala
541fd4a25c Fixed: OpenGL driver compilation 2015-01-10 19:53:27 +01:00
kervala
223de1a1a4 Merge 2015-01-10 19:08:55 +01:00
kervala
ba6cbc76c9 Changed: Minor changes 2015-01-10 18:45:14 +01:00
kervala
741d3b6275 Fixed: OpenGL ES driver compilation 2015-01-10 18:41:54 +01:00
kervala
2a6478b505 Changed: More aliases for OpenGL ES functions and defines to simplify code 2015-01-10 18:41:18 +01:00
Jan Boon
fce776f93e Merged in nimetu/ryzomcore/fix-issue-225 (pull request #98)
CGroupEditBox: ignore enter key when ctrl is pressed (ctrl+m combo) (issue #225)
2015-01-09 18:09:17 +01:00
Nimetu
e2517b8ebc Fix html submit button value that is included with form data (issue #226) 2015-01-09 13:11:20 +02:00
Nimetu
c05b296472 CGroupEditBox: ignore enter key when ctrl is pressed (ctrl+m combo) (issue #225) 2015-01-09 12:59:53 +02:00
kervala
751d6de2eb Changed: Check for string length 2014-12-26 13:44:35 +01:00
kervala
a728ae6b36 Changed: Allow to enable UAC for Windows client 2014-12-26 13:44:03 +01:00
kervala
25d1aa1d1f Changed: Give priority to Luabind library filenames with specific Lua version 2014-12-26 13:43:20 +01:00
kervala
bdfa7a624e Changed: Minor changes 2014-12-26 13:38:02 +01:00
kervala
fe9e52931d Changed: Minor changes 2014-12-26 13:12:56 +01:00
kaetemi
5190cbf8ff Merge with hotfix 2014-12-22 16:40:12 +01:00
kaetemi
566a5b6e86 Fix mirror type sizes 2014-12-22 16:39:54 +01:00
kaetemi
6d16be808f Merge with default 2014-12-22 14:26:26 +01:00
kaetemi
bbaaa522cd Merge with default 2014-12-22 14:24:13 +01:00
kaetemi
c522248f2d ryzomcore/v0.11.2 2014-12-22 14:21:01 +01:00
kaetemi
1aaff9f188 Move to hotfix: 9878ab4ebe5e 2014-12-22 14:15:38 +01:00
kaetemi
7af4bb69d4 Move to feature-light_cycle: c5207e1f862a 2014-12-22 14:10:37 +01:00
kaetemi
936276f789 Backed out changeset: 3694176c26bf 2014-12-22 14:08:54 +01:00
kaetemi
f146593561 Move to hotfix: 287c1142e5ea 2014-12-22 14:08:29 +01:00
dfighter1985
9a61380b37 Ported changeset 9878ab4: CCtrlTextbutton checkcoords should call it's text's checkcoords method. Fix #219. 2014-12-22 01:26:04 +01:00
dfighter1985
fe5c94505f CCtrlTextbutton checkcoords should call it's text's checkcoords method. Fix #219. 2014-12-21 22:55:27 +01:00
dfighter1985
7486483127 CCtrlTextbutton checkcoords should call it's text's checkcoords method. Fix #219. 2014-12-21 22:55:27 +01:00
kaetemi
00156b1d59 Override sun direction from sky dome [breaks packed sheets] 2014-12-12 21:17:13 +01:00
kaetemi
d7ea4033f7 Also export non-root shapes 2014-12-12 21:17:13 +01:00
kaetemi
c6d7da9d61 Merge 2014-12-12 01:24:56 +01:00
kaetemi
d0b4aa5681 Adjust sky batch 2014-12-12 01:22:19 +01:00
kaetemi
f7ad6e1a94 Allow different light cycle for different continents [breaks packed sheets] 2014-12-12 01:22:19 +01:00
kaetemi
661bb29406 Add sky batch script 2014-12-12 01:22:18 +01:00
kaetemi
a4f5c03293 Fix choppy sky animation 2014-12-12 01:22:18 +01:00
kaetemi
ebb1e06c85 Merge 2014-12-09 23:10:27 +01:00
kaetemi
e6f8faaf58 Merge 2014-12-09 23:07:58 +01:00
kaetemi
8f1bfa05ce Add zone snapshot script example 2014-12-09 23:06:08 +01:00
kaetemi
04ce266c03 Fix NeLLigoMakeSnapShot 2014-12-09 23:06:08 +01:00
kaetemi
dbe3ee5d9e Fix offscreen rendering mode 2014-12-09 23:06:08 +01:00
kaetemi
5edbf6d63d Add script to generate zone names 2014-12-09 23:06:07 +01:00
kaetemi
cfba18092d Handle window close message in painter 2014-12-09 23:06:07 +01:00
botanicvelious
90f72fdef0 add some additional checking for database errors 2014-12-07 06:42:57 -08:00
botanicvelious
5055d68e3f Update with added Domain_Auto_Add settings 2014-12-07 05:01:05 -08:00
kaetemi
18a52f8f92 Adjust patch orientation script 2014-12-04 13:28:30 +01:00
kaetemi
670412f630 Add key in patch painter to reset a patch mesh 2014-12-04 13:21:45 +01:00
kaetemi
b6e162bb05 Merge with hotfix 2014-12-04 13:21:40 +01:00
kaetemi
ea25449029 Fix crash with patch mesh attach 2014-12-04 13:21:12 +01:00
kaetemi
b7dbbcac54 Add script to orient zone patches automatically 2014-12-03 15:16:39 +01:00
kaetemi
c7e0627bb5 Increase patch painter distance 2014-12-03 15:16:39 +01:00
kaetemi
972611e5c0 Separate version string 2014-11-24 16:07:17 +01:00
kaetemi
39bb02454f Adjust version 2014-11-24 15:04:53 +01:00
kaetemi
c02d285b4d Merge with hotfix 2014-11-24 15:04:16 +01:00
kaetemi
c5453625b2 Merge with ryzomcore/v0.11.1 2014-11-24 15:03:07 +01:00
kaetemi
1a5f3a2875 ryzomcore/v0.11.1 2014-11-24 14:57:36 +01:00
kaetemi
899c0c441e Fix #218 erratic mouse behaviour 2014-11-24 14:53:28 +01:00
kaetemi
9fba7eff72 Fix bug causing patch painter fail to open more than once 2014-11-19 16:30:14 +01:00
kaetemi
2e94bc1d15 Fix bug causing patch painter fail to open more than once 2014-11-19 16:30:14 +01:00
kaetemi
fb44ccb82d Remove PIC library 2014-11-19 16:20:14 +01:00
kaetemi
1704fc9853 Merge with ryzomcore/v0.11.0 2014-11-10 23:47:23 +01:00
kaetemi
6d6926a8b8 ryzomcore/v0.11.0 2014-11-10 23:34:41 +01:00
kaetemi
d76c9c5018 Fix PHP error "Only variables should be passed by reference" 2014-11-08 00:29:50 +01:00
kaetemi
04c57350d9 Fix PHP error "Only variables should be passed by reference" 2014-11-07 23:51:42 +01:00
kaetemi
80105b365c Print callstack 2014-11-07 23:37:39 +01:00
kaetemi
aee9f17acb Fix patchman scripts 2014-11-07 19:32:18 +01:00
kaetemi
feeccbdea8 Update default path 2014-11-07 19:21:05 +01:00
kaetemi
a2457910c4 Backed out merge changeset: 361eb082ec5e
Does not compile. FindLibLZMA missing on Ubunty 12.04 LTS
2014-11-07 19:17:43 +01:00
kaetemi
0e119941b6 Update default patchman cfg 2014-11-07 19:16:45 +01:00
kaetemi
6245a68f76 Change patchman example domain 2014-11-07 19:02:50 +01:00
dfighter1985
b6c9cc5498 CDBViewQuantity shouldn't crash in the editor. 2014-10-20 22:49:46 +02:00