Commit graph

5041 commits

Author SHA1 Message Date
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
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
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
ed2d2a06de Fixed compilation (setReportEmailFunction doesn't exist anymore) 2015-03-24 15:26:34 +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
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
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
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
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
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
b023af51cf Added: PCH for admin_modules 2015-02-14 15:43:05 +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
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
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
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
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
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
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