Commit graph

389 commits

Author SHA1 Message Date
kervala
7495d3f611 Fixed: Sort files in CFileContainer::addSearchPath too 2015-03-02 13:13:26 +01:00
kervala
6fe4c728ba Changed: Use NLMISC::toString instead of itoa 2015-03-02 13:09:57 +01:00
kervala
f675848e1e Changed: Use CFile::createEmptyFile() 2015-03-02 13:09:16 +01:00
kervala
e7cdb7cde8 Fix #229 missing include in tools sources 2015-03-02 13:08:42 +01:00
kervala
b98648583d Fixed: Skip .hg directories 2015-03-02 13:07:33 +01:00
kervala
658fc3c1ad Fix #208 linking against static libX11.a 2015-03-02 13:06:51 +01:00
Nimetu
81273e4c4a Fix compilation 2015-03-01 18:41:16 +02:00
kaetemi
b63f917cde Merge with feature-crashreport 2015-02-24 17:19:41 +01:00
kaetemi
10ae0d201c Merge with develop 2015-02-24 17:19:27 +01:00
kaetemi
816d9a47e8 Qt5 compile fix for crash report tool 2015-02-24 17:18:48 +01:00
kaetemi
ddc1662b35 Fix FindLibOVR cmake script 2015-02-24 17:17:45 +01:00
kaetemi
e5fc6f9d7a Add isWindowedApplication to INeLContext 2015-02-24 17:17:45 +01:00
kaetemi
e6eaffc28b Use ULL suffix for unsigned 64bit integer constants with Visual Studio 2013 2015-02-24 17:17:45 +01:00
kaetemi
e7e7ff9746 Fix _MSC_VER typo 2015-02-24 17:17:45 +01:00
kaetemi
fe96d344df Merge with develop 2015-02-24 12:51:16 +01:00
kaetemi
976415461d Merge with feature-crashreport 2015-02-24 12:51:01 +01:00
kaetemi
f90ebc8dff Cleanup Windows includes 2015-02-24 12:47:54 +01:00
kaetemi
53b676e283 Add _WIN32_WINNT fallback define 2015-02-24 12:47:54 +01:00
kaetemi
178ac7432d Remove redundant windows.h includes in NLMISC 2015-02-24 12:47:54 +01:00
kaetemi
67bdbd14a6 Categorize NLMISC project source files 2015-02-24 12:47:54 +01:00
kaetemi
83f11f3522 Fix sstream include 2015-02-24 12:47:32 +01:00
kaetemi
c19eb35c2d Merge with feature-crashreport 2015-02-24 11:41:05 +01:00
kaetemi
ce60a93d3f Branch feature-crashreport+develop (for testing only) 2015-02-24 11:40:31 +01:00
kaetemi
ab9240dcc9 Only in FINAL_VERSION 2015-02-23 20:33:31 +01:00
kaetemi
455c71dfc7 Default window title 2015-02-23 20:09:51 +01:00
kaetemi
b62bcae1c7 Move crash report web application to appropriate directory 2015-02-23 20:07:29 +01:00
kaetemi
8bcfa372ee Add function to set custom host url. Deprecate email callback function. Add some comments 2015-02-23 20:01:20 +01:00
kaetemi
28ffc449c4 GCC/Linux version of NLMISC_BREAKPOINT 2015-02-23 19:23:15 +01:00
dfighter1985
958f66a8e9 Merged in dfighter1985/ryzomcore/feature-crashreport (pull request #122)
Crash reporter changes
2015-02-23 17:55:32 +01:00
kaetemi
edc6910948 Visual Studio 2013 compilation support for Ryzom Server 2015-02-23 13:16:50 +01:00
kaetemi
603a8e6d89 Visual Studio 2013 compilation support for Ryzom Tools 2015-02-23 13:13:11 +01:00
kaetemi
ec09096b63 Visual Studio 2013 compilation support for Ryzom Server 2015-02-23 13:08:03 +01:00
kaetemi
cdbb9bd21a Visual Studio 2013 compilation support for Ryzom Server 2015-02-23 12:58:43 +01:00
kaetemi
f2c78a5dd5 Visual Studio 2013 compilation support for Ryzom Server 2015-02-23 12:52:01 +01:00
kaetemi
0b3e58a563 Visual Studio 2013 compilation support for Ryzom Server 2015-02-23 12:48:41 +01:00
kaetemi
1cf671509e Visual Studio 2013 compilation support for Ryzom Tools 2015-02-23 12:38:43 +01:00
kaetemi
b4df6d77cb Visual Studio 2013 compilation support for Ryzom Server 2015-02-23 12:37:51 +01:00
kaetemi
068b7bf77a Visual Studio 2013 compilation support for Ryzom Tools 2015-02-23 12:28:13 +01:00
kaetemi
8a2f4ea737 Visual Studio 2013 compilation support for Ryzom Server 2015-02-23 12:25:23 +01:00
dfighter1985
d8812f6076 Use CMsgBoxDisplayer on non-windows platforms as well. 2015-02-23 01:36:50 +01:00
kaetemi
a35625d1b1 Merge with hotfix 2015-02-22 23:50:39 +01:00
dfighter1985
8074c1b8a6 Remove generated log file when quitting the reporter. 2015-02-22 22:34:07 +01:00
dfighter1985
abeac6d56d Parametrize crash reporter. 2015-02-22 21:51:17 +01:00
dfighter1985
2b24f62e9a More renames... 2015-02-22 19:52:01 +01:00
dfighter1985
687655c086 Renames. 2015-02-22 19:33:38 +01:00
dfighter1985
151e92a37d Renames. 2015-02-22 19:33:12 +01:00
dfighter1985
6646db3d56 renamed directory. 2015-02-22 19:28:02 +01:00
dfighter1985
ffbbf7d84b Changed default title to NeL Error Report. 2015-02-22 19:26:03 +01:00
dfighter1985
a143ffc959 Moved to nel\tools\misc 2015-02-22 19:24:38 +01:00
dfighter1985
a2cd433eed Class names in Nel start with a C... 2015-02-22 19:04:11 +01:00
dfighter1985
f25c6f6103 Copyright header changed to Nel... 2015-02-22 18:59:35 +01:00
dfighter1985
059287db6a Launch the error report application instead of sending an email. 2015-02-22 18:45:41 +01:00
dfighter1985
987f140998 Backed out from fdc0d40 2015-02-22 17:38:06 +01:00
dfighter1985
917cb4aa9d Backed out from 5942903 2015-02-22 17:20:24 +01:00
dfighter1985
9ecf62b3ed Back out from 5bb3dad 2015-02-22 17:15:41 +01:00
Jan Boon
9afb02343f Merged in nimetu/ryzomcore/issue-221 (pull request #100)
improve chatlog file (issue #221)
2015-02-22 11:01:08 +01:00
kaetemi
aa3ddd3972 Merge with hotfix 2015-02-22 10:53:17 +01:00
kaetemi
12487d2e58 Merge with dfighter-tools 2015-02-22 10:45:48 +01:00
kaetemi
b5d48a8f15 Merge with hotfix 2015-02-22 10:39:02 +01:00
kaetemi
735027d3e0 Revert invalid hotfix commits 2015-02-22 10:34:27 +01:00
dfighter1985
53975d98af Merged in hotfix (pull request #117)
Merge hotfix branch
2015-02-21 23:09:07 +01:00
dfighter1985
ba02245e33 Removed unused references to CMsgBoxDisplayer. 2015-02-21 22:34:02 +01:00
dfighter1985
65366b92e1 Removed unused references to CMsgBoxDisplayer. 2015-02-21 22:34:02 +01:00
dfighter1985
5cc93c0feb A little cleanup of CMsgBoxDisplayer. 2015-02-21 22:32:11 +01:00
dfighter1985
169a41c59d A little cleanup of CMsgBoxDisplayer. 2015-02-21 22:32:11 +01:00
dfighter1985
588519b1d1 Use CMsgBoxDisplayer on platforms other than Windows as well. 2015-02-21 21:28:56 +01:00
dfighter1985
b8192c387f Use CMsgBoxDisplayer on platforms other than Windows as well. 2015-02-21 21:28:56 +01:00
dfighter1985
adf9155484 Install rcerror 2015-02-21 20:01:44 +01:00
dfighter1985
c246eb3fe2 Install rcerror 2015-02-21 20:01:44 +01:00
kaetemi
795254df36 Visual Studio 2013 compilation support for Ryzom Client 2015-02-20 18:10:06 +01:00
kaetemi
f008ed26e7 Visual Studio 2013 compilation support for Ryzom Client 2015-02-20 17:57:11 +01:00
kaetemi
a336a75f30 Visual Studio 2013 compilation support for Ryzom Client 2015-02-20 17:53:39 +01:00
kaetemi
a5f6eacef1 Visual Studio 2013 compilation support for NeL Tools 2015-02-20 17:51:13 +01:00
kaetemi
90e9d48708 Visual Studio 2013 compilation support for Ryzom Client 2015-02-20 17:50:58 +01:00
kaetemi
9201b15650 Visual Studio 2013 compilation support for NLGUI 2015-02-20 17:17:07 +01:00
kaetemi
7c9b10912e Visual Studio 2013 compilation support for NL3D 2015-02-20 17:14:12 +01:00
kaetemi
c7d7b3e464 Visual Studio 2013 compilation support for NLSOUND 2015-02-20 17:14:00 +01:00
kaetemi
fb0929cfcc Visual Studio 2013 compilation support for NLMISC 2015-02-20 17:07:23 +01:00
kaetemi
f800744edd Visual Studio 2013 compilation support for NLPACS 2015-02-20 16:31:54 +01:00
kaetemi
f38b4fc5fa Visual Studio 2013 compilation support for NLNET 2015-02-20 16:29:09 +01:00
kaetemi
8fa42c1f32 Visual Studio 2013 compilation support for NLMISC 2015-02-20 16:24:19 +01:00
dfighter1985
c543f35114 Typo... 2015-02-20 03:22:02 +01:00
dfighter1985
40c6614dfc Typo... 2015-02-20 03:22:02 +01:00
dfighter1985
dc31507f12 Oups 2015-02-20 02:56:22 +01:00
dfighter1985
fdfffb32a2 Oups 2015-02-20 02:56:22 +01:00
dfighter1985
100fb11435 Tell the user if the report couldn't be sent. 2015-02-20 02:54:05 +01:00
dfighter1985
a8fe3d6c24 Tell the user if the report couldn't be sent. 2015-02-20 02:54:05 +01:00
dfighter1985
36633a7aba Override the cursor while sending the report. 2015-02-20 02:44:22 +01:00
dfighter1985
fc0cb388d8 Override the cursor while sending the report. 2015-02-20 02:44:22 +01:00
dfighter1985
7d88d84a5c 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
021b034e97 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
c1da7d663e Probably a good idea to look for rcerror as rcerror.exe on Windows. 2015-02-20 02:03:33 +01:00
dfighter1985
271fbb8013 Probably a good idea to look for rcerror as rcerror.exe on Windows. 2015-02-20 02:03:33 +01:00
dfighter1985
8417642596 Implemented the bug report Qt app and an example web app that takes the report. 2015-02-20 01:59:04 +01:00
dfighter1985
7f16563262 Implemented the bug report Qt app and an example web app that takes the report. 2015-02-20 01:59:04 +01:00
dfighter1985
35fe51761a Added the Ryzom Core Error Reporter's skeleton. 2015-02-19 00:20:18 +01:00
dfighter1985
439302da23 Added the Ryzom Core Error Reporter's skeleton. 2015-02-19 00:20:18 +01:00
dfighter1985
9825a77b79 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
c649dce53b 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
a5895daee0 Merge with hotfix 2015-02-15 09:54:31 +01:00
kervala
10a147bee3 Fixed: Wrong include guard for admin_modules PCH 2015-02-15 09:53:56 +01:00
kervala
ab4669a76f Merge with hotfix 2015-02-14 19:29:36 +01:00
kervala
9a97ffb211 Fixed: Warning multichars 2015-02-14 17:54:05 +01:00
kervala
4ee76e6182 Fixed: Unnamed semaphores are deprecated under OS X 2015-02-14 17:52:15 +01:00
kervala
c9fec14cef Fixed: Warning assert always false 2015-02-14 17:47:55 +01:00
kervala
bc214862df Fixed: Warning comparing an enum to an int 2015-02-14 17:47:10 +01:00
kervala
31d9db86ce Merge with hotfix 2015-02-14 16:07:04 +01:00
kervala
6c14b8f081 Fixed: Compilation 2015-02-14 16:05:45 +01:00
kervala
8da23b3fbe Merge with hotfix 2015-02-14 15:44:11 +01:00
kervala
557ff358bf Added: PCH for admin_modules 2015-02-14 15:43:05 +01:00
kervala
f7462aaf46 Merge with hotfix 2015-02-14 15:19:49 +01:00
kervala
09df6d6d9b Changed: Improved User Agent management 2015-02-14 15:18:53 +01:00
kervala
9cb149e17e Merge with hotfix 2015-02-14 14:31:19 +01:00
kervala
4b5bad763c Fixed: Warning with multichars to int conversion 2015-02-14 14:25:50 +01:00
kervala
fc68f4da14 Fixed: Compilation 2015-02-14 13:57:06 +01:00
kervala
e6ed730e4e Changed: Updated CMale modules 2015-02-14 13:47:37 +01:00
kervala
2ad2fea0bc Changed: Replaced atoi and atof by NLMISC::fromString 2015-02-14 13:46:21 +01:00
kervala
793d8fb8c4 Changed: Minor changes 2015-02-14 13:34:45 +01:00
kervala
8ca4c7548d Changed: Use Ryzom user agent for CURL 2015-02-14 13:19:53 +01:00
kervala
c5131f6700 Fixed: Missing namespace 2015-02-14 13:19:09 +01:00
kervala
b5ea715d42 Changed: std::string already initialized to en empty string 2015-02-14 13:18:51 +01:00
kervala
4c03c8b653 Changed: Used INVALID_AI_INSTANCE in CUsedContinent::getInstanceForContinent 2015-02-14 13:03:27 +01:00
kervala
4e24a6444c Changed: Possible bug if string not found 2015-02-14 12:54:17 +01:00
kervala
0324ebbd63 Fixed: Unable to patch when Ryzom was located on a mounted FS 2015-02-14 12:52:57 +01:00
kervala
3eb60013c9 Changed: Used PCH for admin_modules 2015-02-14 12:48:29 +01:00
kervala
203acf6d62 Changed: Check getSpawn() before calling its methods 2015-02-14 12:47:54 +01:00
kervala
3b38f01d5f Changed: Minor changes 2015-02-14 12:47:03 +01:00
kervala
5f912f713a Changed: Replaced atof by NLMISC::fromString 2015-02-14 12:43:29 +01:00
kervala
c510dcde2e Fixed: Compilation warnings 2015-02-14 12:41:59 +01:00
kervala
8fcd432074 Fixed: Only keep Release and Debug configurations in CMake 2015-02-14 12:06:19 +01:00
dfighter1985
8a34288795 Merged in hotfix (pull request #114)
Merging hotfix branch
2015-02-13 19:48:42 +01:00
dfighter1985
049b967bd6 Add the data directory to the search path. 2015-02-11 20:42:31 +01:00
dfighter1985
d5425face0 Added ryzom.ttf, it will be installed to the data directory. 2015-02-11 19:55:16 +01:00
dfighter1985
1d3b8bfd75 Include rgba.h in libwww.h. Thanks Nimetu! 2015-02-09 20:07:35 +01:00
dfighter1985
e91498f11e Change the cursor to a wait cursor when applying settings in the settings dialog. 2015-02-09 19:55:27 +01:00
dfighter1985
d4b8628f92 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
53e8f8ed94 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
33d658a444 Read the GUI Editor widget and expression definition XML files from the right directory. 2015-02-09 01:48:39 +01:00
dfighter1985
e26561ae1d Install the GUI Editor widget and expression definition files to the data dir. 2015-02-08 23:46:33 +01:00
dfighter1985
2fadeccaf1 Handle relative paths when loading .worldedit files in World Editor. 2015-02-08 00:24:29 +01:00
dfighter1985
ad8d9fa391 Merged in hotfix (pull request #111)
Merge hotfix
2015-02-06 02:32:03 +01:00
dfighter1985
eca3a92a08 Erm. Initialize Nel3D on other platforms too... 2015-02-06 02:29:33 +01:00
dfighter1985
b1bd4d132f Merged in hotfix (pull request #108)
Merge hotfix branch.
2015-02-06 00:45:36 +01:00
dfighter1985
dfaf2b08e6 CPack should use the install prefix. 2015-02-06 00:31:51 +01:00
dfighter1985
45e7e542a8 We need the LIGO config file, not directory in the first start settings dialog. 2015-02-05 23:50:38 +01:00
dfighter1985
b52a633615 Merged in hotfix (pull request #105)
Merge hotfix
2015-02-02 23:32:08 +01:00
dfighter1985
37f9f90fab Use release squish if debug not found. Fixes s3tc compressor tool build. 2015-02-02 23:25:11 +01:00
dfighter1985
acbfc21b3b Some CPack renames. 2015-02-02 22:51:43 +01:00
dfighter1985
3b8012b308 Install tile editor's plugin spec to the right directory. 2015-02-02 22:41:29 +01:00
dfighter1985
d7c33649e3 Fixed build of Object Viewer Widget Qt ( old, not part of Studio ). 2015-02-02 22:01:16 +01:00