Commit graph

1446 commits

Author SHA1 Message Date
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
kervala
c2139e95c0 Fixed: Compilation with GCC
--HG--
branch : develop
2015-03-02 23:27:12 +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
c0e885aa6a Fixed: Skip .hg directories
--HG--
branch : develop
2015-03-02 13:07:33 +01:00
kervala
4daf4f5b5f Fix #208 linking against static libX11.a
--HG--
branch : develop
2015-03-02 13:06:51 +01:00
Nimetu
c00ba3f2c1 Fix compilation
--HG--
branch : develop
2015-03-01 18:41:16 +02:00
kaetemi
ea9e32f46d Merge with develop
--HG--
branch : feature-crashreport+develop
2015-02-24 17:19:27 +01:00
kaetemi
a66204a03a Add isWindowedApplication to INeLContext
--HG--
branch : develop
2015-02-24 17:17:45 +01:00
kaetemi
cf79f1bb1b Merge with develop
--HG--
branch : feature-crashreport+develop
2015-02-24 12:51:16 +01:00
kaetemi
3b59bbcf69 Merge with feature-crashreport
--HG--
branch : feature-crashreport+develop
2015-02-24 12:51:01 +01:00
kaetemi
d9dd425dc6 Cleanup Windows includes
--HG--
branch : develop
2015-02-24 12:47:54 +01:00
kaetemi
50e11b0536 Add _WIN32_WINNT fallback define
--HG--
branch : develop
2015-02-24 12:47:54 +01:00
kaetemi
e201c90937 Remove redundant windows.h includes in NLMISC
--HG--
branch : develop
2015-02-24 12:47:54 +01:00
kaetemi
e2dcc3b035 Categorize NLMISC project source files
--HG--
branch : develop
2015-02-24 12:47:54 +01:00
kaetemi
02e8100ea4 Fix sstream include
--HG--
branch : feature-crashreport
2015-02-24 12:47:32 +01:00
kaetemi
6a48a2d199 Merge with feature-crashreport
--HG--
branch : feature-crashreport+develop
2015-02-24 11:41:05 +01:00
kaetemi
68120a53e7 Only in FINAL_VERSION
--HG--
branch : feature-crashreport
2015-02-23 20:33:31 +01:00
kaetemi
a548940b8c Default window title
--HG--
branch : feature-crashreport
2015-02-23 20:09:51 +01:00
kaetemi
e4e3f2019b Add function to set custom host url. Deprecate email callback function. Add some comments
--HG--
branch : feature-crashreport
2015-02-23 20:01:20 +01:00
dfighter1985
92d692fe69 Merged in dfighter1985/ryzomcore/feature-crashreport (pull request #122)
Crash reporter changes

--HG--
branch : feature-crashreport
2015-02-23 17:55:32 +01:00
dfighter1985
8bf372056f Use CMsgBoxDisplayer on non-windows platforms as well.
--HG--
branch : feature-crashreport
2015-02-23 01:36:50 +01:00
kaetemi
e27cdc7ac2 Merge with hotfix
--HG--
branch : feature-crashreport
2015-02-22 23:50:39 +01:00
dfighter1985
955ef48460 Parametrize crash reporter.
--HG--
branch : feature-crashreport
2015-02-22 21:51:17 +01:00
dfighter1985
cfe2d60350 More renames...
--HG--
branch : feature-crashreport
2015-02-22 19:52:01 +01:00
dfighter1985
24aa500d0b Launch the error report application instead of sending an email.
--HG--
branch : feature-crashreport
2015-02-22 18:45:41 +01:00
dfighter1985
3d9357637b Backed out from fdc0d40
--HG--
branch : feature-crashreport
2015-02-22 17:38:06 +01:00
dfighter1985
7efbee6d0a Backed out from 5942903
--HG--
branch : feature-crashreport
2015-02-22 17:20:24 +01:00
dfighter1985
4e00903dcc Back out from 5bb3dad
--HG--
branch : feature-crashreport
2015-02-22 17:15:41 +01:00
kaetemi
18d211f79b Merge with hotfix
--HG--
branch : develop
2015-02-22 10:53:17 +01:00
kaetemi
6e06b4e79e Merge with dfighter-tools
--HG--
branch : hotfix
2015-02-22 10:45:48 +01:00
kaetemi
b120d68a98 Merge with hotfix
--HG--
branch : develop
2015-02-22 10:39:02 +01:00
dfighter1985
36ce53b1ba Merged in hotfix (pull request #117)
Merge hotfix branch

--HG--
branch : develop
2015-02-21 23:09:07 +01:00
dfighter1985
e130625cca A little cleanup of CMsgBoxDisplayer.
--HG--
branch : feature-crashreport
2015-02-21 22:32:11 +01:00
dfighter1985
ac6bda5084 A little cleanup of CMsgBoxDisplayer.
--HG--
branch : hotfix
2015-02-21 22:32:11 +01:00
dfighter1985
1476bfe648 Use CMsgBoxDisplayer on platforms other than Windows as well.
--HG--
branch : feature-crashreport
2015-02-21 21:28:56 +01:00
dfighter1985
070dad8e53 Use CMsgBoxDisplayer on platforms other than Windows as well.
--HG--
branch : hotfix
2015-02-21 21:28:56 +01:00
kaetemi
1879a434f7 Visual Studio 2013 compilation support for NLGUI
--HG--
branch : develop
2015-02-20 17:17:07 +01:00
kaetemi
221267364d Visual Studio 2013 compilation support for NL3D
--HG--
branch : develop
2015-02-20 17:14:12 +01:00
kaetemi
a15221b00d Visual Studio 2013 compilation support for NLSOUND
--HG--
branch : develop
2015-02-20 17:14:00 +01:00
kaetemi
f5335f068d Visual Studio 2013 compilation support for NLMISC
--HG--
branch : develop
2015-02-20 17:07:23 +01:00
kaetemi
cb986cba6f Visual Studio 2013 compilation support for NLPACS
--HG--
branch : develop
2015-02-20 16:31:54 +01:00
kaetemi
7ea4cff032 Visual Studio 2013 compilation support for NLNET
--HG--
branch : develop
2015-02-20 16:29:09 +01:00
kaetemi
6db8abf95c Visual Studio 2013 compilation support for NLMISC
--HG--
branch : develop
2015-02-20 16:24:19 +01:00
dfighter1985
f0869aa659 Unfortunately on Windows argc and argv parameters are unreliable inside a Qt application, so I had to hardcode the report file name. :(
--HG--
branch : feature-crashreport
2015-02-20 02:35:11 +01:00
dfighter1985
469e5583c1 Unfortunately on Windows argc and argv parameters are unreliable inside a Qt application, so I had to hardcode the report file name. :(
--HG--
branch : hotfix
2015-02-20 02:35:11 +01:00
dfighter1985
9518a80c99 Probably a good idea to look for rcerror as rcerror.exe on Windows.
--HG--
branch : feature-crashreport
2015-02-20 02:03:33 +01:00
dfighter1985
2fe77d719f Probably a good idea to look for rcerror as rcerror.exe on Windows.
--HG--
branch : hotfix
2015-02-20 02:03:33 +01:00
dfighter1985
7302023777 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.
--HG--
branch : feature-crashreport
2015-02-17 03:12:26 +01:00
dfighter1985
fea7cff850 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.
--HG--
branch : hotfix
2015-02-17 03:12:26 +01:00
kervala
6784301afc Merge with hotfix
--HG--
branch : develop
2015-02-14 19:29:36 +01:00
kervala
1690f777a1 Fixed: Unnamed semaphores are deprecated under OS X
--HG--
branch : hotfix
2015-02-14 17:52:15 +01:00
kervala
e8b0765e7c Merge with hotfix
--HG--
branch : develop
2015-02-14 14:31:19 +01:00
kervala
cdd35f58a1 Fixed: Warning with multichars to int conversion
--HG--
branch : hotfix
2015-02-14 14:25:50 +01:00
kervala
8472a6ff7f Fixed: Compilation
--HG--
branch : hotfix
2015-02-14 13:57:06 +01:00
kervala
943131b802 Changed: Replaced atoi and atof by NLMISC::fromString
--HG--
branch : hotfix
2015-02-14 13:46:21 +01:00
kervala
b0937ec02b Changed: Minor changes
--HG--
branch : hotfix
2015-02-14 12:47:03 +01:00
kervala
3039428094 Fixed: Compilation warnings
--HG--
branch : hotfix
2015-02-14 12:41:59 +01:00
dfighter1985
225d786e7f Merged in hotfix (pull request #114)
Merging hotfix branch

--HG--
branch : develop
2015-02-13 19:48:42 +01:00
dfighter1985
46cc31d0d0 Handle relative paths when loading .worldedit files in World Editor.
--HG--
branch : hotfix
2015-02-08 00:24:29 +01:00
dfighter1985
7f35c5959a Merged in hotfix (pull request #111)
Merge hotfix

--HG--
branch : develop
2015-02-06 02:32:03 +01:00
dfighter1985
5e55a7b7bb Erm. Initialize Nel3D on other platforms too...
--HG--
branch : hotfix
2015-02-06 02:29:33 +01:00
dfighter1985
e21d926336 Merged hotfix
--HG--
branch : develop
2015-02-02 03:54:50 +01:00
dfighter1985
f902bf6ed6 Merged mainline
--HG--
branch : hotfix
2015-02-02 02:03:00 +01:00
dfighter1985
e311547a39 Initialize Nel3D in the Object Viewer plugin too.
--HG--
branch : hotfix
2015-02-01 20:29:26 +01:00
kervala
6205b16fbf Changed: Optimize sorting of files (instead of doing it several times for each directory, do it only once)
--HG--
branch : develop
2015-01-23 21:11:15 +01:00
kervala
3aa448ba24 Changed: Replaced atoi and atof by NLMISC::fromString
--HG--
branch : develop
2015-01-13 19:47:14 +01:00
kervala
303f7d2e79 Changed: Minor changes
--HG--
branch : develop
2015-01-13 14:11:07 +01:00
kervala
fad0e9af4e Fixed: Compilation with OS X SDK 10.10
--HG--
branch : develop
2015-01-10 20:33:02 +01:00
kervala
e8ff07fe7d Fixed: Removed raw mouse mode for OS X too
--HG--
branch : develop
2015-01-10 19:55:05 +01:00
kervala
5b9ac59f49 Fixed: OpenGL driver compilation
--HG--
branch : develop
2015-01-10 19:53:27 +01:00
kervala
418e0ee7b7 Merge
--HG--
branch : develop
2015-01-10 19:08:55 +01:00
kervala
99c88bd515 Changed: Minor changes
--HG--
branch : develop
2015-01-10 18:45:14 +01:00
kervala
2869d5f1ac Fixed: OpenGL ES driver compilation
--HG--
branch : develop
2015-01-10 18:41:54 +01:00
kervala
0f22ea7777 Changed: More aliases for OpenGL ES functions and defines to simplify code
--HG--
branch : develop
2015-01-10 18:41:18 +01:00
Jan Boon
d360f78a1c Merged in nimetu/ryzomcore/fix-issue-225 (pull request #98)
CGroupEditBox: ignore enter key when ctrl is pressed (ctrl+m combo) (issue #225)

--HG--
branch : develop
2015-01-09 18:09:17 +01:00
Nimetu
85f63b7db3 Fix html submit button value that is included with form data (issue #226)
--HG--
branch : fix-issue-226
2015-01-09 13:11:20 +02:00
Nimetu
fbea1d2173 CGroupEditBox: ignore enter key when ctrl is pressed (ctrl+m combo) (issue #225)
--HG--
branch : fix-issue-225
2015-01-09 12:59:53 +02:00
kervala
6596af9682 Changed: Minor changes
--HG--
branch : develop
2014-12-26 13:38:02 +01:00
kaetemi
c03c0f532b Merge with default
--HG--
branch : develop
2014-12-22 14:26:26 +01:00
kaetemi
a43fb4dba8 Move to hotfix: 287c1142e5ea
--HG--
branch : develop
2014-12-22 14:08:29 +01:00
dfighter1985
f189a98422 Ported changeset 9878ab4: CCtrlTextbutton checkcoords should call it's text's checkcoords method. Fix #219.
--HG--
branch : develop
2014-12-22 01:26:04 +01:00
dfighter1985
4d67a41f94 CCtrlTextbutton checkcoords should call it's text's checkcoords method. Fix #219.
--HG--
branch : hotfix
2014-12-21 22:55:27 +01:00
kaetemi
58590a9e7e Fix offscreen rendering mode
--HG--
branch : develop
2014-12-09 23:06:08 +01:00
kaetemi
fef6543e0c Fix bug causing patch painter fail to open more than once
--HG--
branch : develop
2014-11-19 16:30:14 +01:00
kaetemi
0a765bde8c Fix bug causing patch painter fail to open more than once
--HG--
branch : hotfix
2014-11-19 16:30:14 +01:00
dfighter1985
0ac94e3e72 CDBViewQuantity shouldn't crash in the editor.
--HG--
branch : dfighter-tools
2014-10-20 22:49:46 +02:00
dfighter1985
8c5ad81199 it's not a bad idea to store the value in the right variable...
--HG--
branch : dfighter-tools
2014-10-20 22:21:59 +02:00
dfighter1985
b6d9e3285f DBViewNumber shouldn't crash anymore.
--HG--
branch : dfighter-tools
2014-10-20 20:57:08 +02:00
dfighter1985
2fe2077170 When setting the Id of the decorated edit box, set the Id of the text as well.
--HG--
branch : dfighter-tools
2014-10-20 18:51:53 +02:00
Jan Boon
e2eb5d739c Merged in nimetu/ryzomcore/html-table-rendering (pull request #92)
Some improvements to table rendering

--HG--
branch : develop
2014-10-18 04:44:34 +02:00
Nimetu
78e1bb6147 Fix html img not showing on some cases, clean up addImage method
--HG--
branch : develop
2014-10-18 01:20:56 +03:00
Nimetu
48b346fed8 Fix crash when using textarea without form
--HG--
branch : develop
2014-10-18 00:15:51 +03:00
dfighter1985
67aa7a50d2 set the Id of the text properly when loading the decorated edit box.
--HG--
branch : dfighter-tools
2014-10-17 22:25:30 +02:00
dfighter1985
923b36f0e5 Create the viewtext of the decorated edit box when the box is created, also adjust it so the text is drawn to the right of the left texture.
--HG--
branch : dfighter-tools
2014-10-17 21:18:26 +02:00
dfighter1985
ba1e3c9919 Fixed a typo that messed up the textures of decorated editbox.
--HG--
branch : dfighter-tools
2014-10-17 16:01:50 +02:00
dfighter1985
210f93a4f2 Save decorated edit box as such.
--HG--
branch : dfighter-tools
2014-10-16 21:03:58 +02:00
dfighter1985
18866c88af Update decorated edit box decoration coords while dragging.
--HG--
branch : dfighter-tools
2014-10-16 20:58:47 +02:00