Commit graph

1002 commits

Author SHA1 Message Date
kervala
b944892c8f Fixed: Clang warning, ContinentMngr.cur() is checked later
--HG--
branch : develop
2015-11-07 14:54:24 +01:00
kervala
ffb600e03e Changed: Minor changes
--HG--
branch : develop
2015-11-07 14:53:49 +01:00
kervala
9b231afa54 Fixed: Get system language code under OS X too and added method in NLMISC::CI18N
--HG--
branch : develop
2015-11-07 14:52:46 +01:00
kervala
f095121991 Merge with develop
--HG--
branch : compatibility-develop
2015-11-06 15:49:55 +01:00
kervala
9e74adee86 Changed: Minor changes
--HG--
branch : develop
2015-11-06 15:48:23 +01:00
kervala
2baddc78ac More checks before to get a pointer on a CCDBNodeLeaf, fixes #251
--HG--
branch : develop
2015-11-06 15:47:58 +01:00
kervala
93a03b5db0 Fixed: clang warnings
--HG--
branch : develop
2015-11-06 15:24:19 +01:00
kervala
8b0d8282bc Merge with develop
--HG--
branch : compatibility-develop
2015-11-05 17:30:12 +01:00
kervala
94b7148d44 Fixed: Wrong index for video modes comparison (nFoundMode was an index in strings not CMode list, now renamed to nFoundStringMode)
--HG--
branch : develop
2015-11-05 17:26:45 +01:00
kervala
2a9b9deaf9 Fixed: Didn't initialize video modes frequencies
--HG--
branch : develop
2015-11-05 17:22:43 +01:00
kervala
804c5cb80b Fixed: Update also Depth and Frequency with default resolution
--HG--
branch : develop
2015-11-05 17:18:14 +01:00
kervala
56e1f5eff0 Changed: Centralize version different formats
--HG--
branch : develop
2015-11-05 17:16:55 +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
93f27a1a48 Merge with develop
--HG--
branch : compatibility-develop
2015-11-01 20:13:33 +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
aa3a9dcead Merge with develop
--HG--
branch : compatibility-develop
2015-10-01 14:54:18 +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
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
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
c58e10f173 Add "select_shortcut_bar_2" action handler (issue 222)
--HG--
branch : develop
2015-04-21 18:54:08 +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
8e1ada36b0 Use cURL as http transport
--HG--
branch : develop
2015-04-17 17:41:01 +03:00
kaetemi
f578f0441a Add extra light groups for better lightmap control
--HG--
branch : develop
2015-04-16 17:39:47 +02: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
163abf31b8 Merge with feature-crashreport+develop
--HG--
branch : develop
2015-03-06 21:05:31 +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
6a48a2d199 Merge with feature-crashreport
--HG--
branch : feature-crashreport+develop
2015-02-24 11:41:05 +01:00
kaetemi
77d17265eb Visual Studio 2013 compilation support for Ryzom Server
--HG--
branch : develop
2015-02-23 12:58:43 +01:00
Jan Boon
543331ea75 Merged in nimetu/ryzomcore/issue-221 (pull request #100)
improve chatlog file (issue #221)

--HG--
branch : develop
2015-02-22 11:01:08 +01:00
kaetemi
b120d68a98 Merge with hotfix
--HG--
branch : develop
2015-02-22 10:39:02 +01:00
kaetemi
3b9fe3e9c3 Merge with hotfix
--HG--
branch : compatibility
2015-02-22 10:38:36 +01:00
dfighter1985
1715cf7efe Merged in hotfix (pull request #118)
Merge hotfix branch

--HG--
branch : compatibility
2015-02-21 23:10:13 +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
d2194cda05 Removed unused references to CMsgBoxDisplayer.
--HG--
branch : feature-crashreport
2015-02-21 22:34:02 +01:00
dfighter1985
2f808280c8 Removed unused references to CMsgBoxDisplayer.
--HG--
branch : hotfix
2015-02-21 22:34:02 +01:00
kaetemi
a8db3b2dda Visual Studio 2013 compilation support for Ryzom Client
--HG--
branch : develop
2015-02-20 18:10:06 +01:00
kaetemi
2667c5d8a2 Visual Studio 2013 compilation support for Ryzom Client
--HG--
branch : develop
2015-02-20 17:57:11 +01:00
kaetemi
aebda454dc Visual Studio 2013 compilation support for Ryzom Client
--HG--
branch : develop
2015-02-20 17:53:39 +01:00
kaetemi
32b3b4ac80 Visual Studio 2013 compilation support for Ryzom Client
--HG--
branch : develop
2015-02-20 17:50:58 +01:00
dfighter1985
ef56d28542 Oups
--HG--
branch : feature-crashreport
2015-02-20 02:56:22 +01:00
dfighter1985
c7681bcb2b Oups
--HG--
branch : hotfix
2015-02-20 02:56:22 +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
e7166c1161 Merge with hotfix
--HG--
branch : compatibility
2015-02-14 17:54:50 +01:00
kervala
bd054ea776 Fixed: Warning multichars
--HG--
branch : hotfix
2015-02-14 17:54:05 +01:00
kervala
5aa8a1d615 Fixed: Warning assert always false
--HG--
branch : hotfix
2015-02-14 17:47:55 +01:00
kervala
3509d75ad6 Fixed: Warning comparing an enum to an int
--HG--
branch : hotfix
2015-02-14 17:47:10 +01:00
kervala
c561bd8d82 Merge with hotfix
--HG--
branch : compatibility
2015-02-14 15:20:19 +01:00
kervala
e9b5cc4410 Merge with hotfix
--HG--
branch : develop
2015-02-14 15:19:49 +01:00
kervala
4b397f3e5b Changed: Improved User Agent management
--HG--
branch : hotfix
2015-02-14 15:18:53 +01:00
kervala
eb05c962de Merge with develop
--HG--
branch : compatibility
2015-02-14 14:36:37 +01:00
kervala
49b18b72b5 Merge with hotfix
--HG--
branch : compatibility
2015-02-14 14:32:44 +01:00
kervala
e8b0765e7c Merge with hotfix
--HG--
branch : develop
2015-02-14 14:31:19 +01:00
kervala
1742997984 Changed: Minor changes
--HG--
branch : hotfix
2015-02-14 13:34:45 +01:00
kervala
d774dcac3e Changed: Use Ryzom user agent for CURL
--HG--
branch : hotfix
2015-02-14 13:19:53 +01:00
kervala
49bbb10b58 Fixed: Missing namespace
--HG--
branch : hotfix
2015-02-14 13:19:09 +01:00
kervala
1960f5c448 Changed: std::string already initialized to en empty string
--HG--
branch : hotfix
2015-02-14 13:18:51 +01:00
kervala
ee7008ae02 Changed: Possible bug if string not found
--HG--
branch : hotfix
2015-02-14 12:54:17 +01:00
kervala
6e1abd80d3 Fixed: Unable to patch when Ryzom was located on a mounted FS
--HG--
branch : hotfix
2015-02-14 12:52:57 +01:00
kervala
b0937ec02b Changed: Minor changes
--HG--
branch : hotfix
2015-02-14 12:47:03 +01:00
Nimetu
53f6adb041 Include chat message channel/type to chatlog file
--HG--
branch : issue-221
2015-01-15 20:08:28 +02: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
bc78734602 Changed: Fixed a wrong copy-paste
--HG--
branch : develop
2015-01-11 18:27:06 +01:00
kervala
8fc8c3aa39 Changed: Use defined directories prefixed by a default directory
--HG--
branch : develop
2015-01-11 18:01:32 +01:00
kervala
08c557ae76 Changed: Allow to use a readable and writable data path for IG patch (usefull when data are read only)
--HG--
branch : develop
2015-01-11 15:06:02 +01:00
kervala
3367eb3205 Changed: Append getAppBundlePath() to search paths under OS X
--HG--
branch : develop
2015-01-11 14:59:15 +01:00
kervala
acf677e635 Changed: Don't use replaceApplicationDirToken anymore
--HG--
branch : develop
2015-01-11 14:57:40 +01:00
kervala
418e0ee7b7 Merge
--HG--
branch : develop
2015-01-10 19:08:55 +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
kervala
ec12e6a75e Changed: Allow to enable UAC for Windows client
--HG--
branch : develop
2014-12-26 13:44:03 +01:00
kervala
6596af9682 Changed: Minor changes
--HG--
branch : develop
2014-12-26 13:38:02 +01:00
kaetemi
11ae94ab21 Move to feature-light_cycle: c5207e1f862a
--HG--
branch : develop
2014-12-22 14:10:37 +01:00
kaetemi
b9d372b144 Backed out changeset: 3694176c26bf
--HG--
branch : develop
2014-12-22 14:08:54 +01:00
kaetemi
93d5ffddb6 Override sun direction from sky dome [breaks packed sheets]
--HG--
branch : develop
2014-12-12 21:17:13 +01:00
kaetemi
c3df884b13 Allow different light cycle for different continents [breaks packed sheets]
--HG--
branch : develop
2014-12-12 01:22:19 +01:00
kaetemi
f411d2b230 Fix choppy sky animation
--HG--
branch : develop
2014-12-12 01:22:18 +01:00
kaetemi
358f19acae Merge with ryzomcore/v0.11.1
--HG--
branch : compatibility
2014-11-24 15:03:07 +01:00
kaetemi
1676b3b46f Fix #218 erratic mouse behaviour
--HG--
branch : hotfix
2014-11-24 14:53:28 +01:00
kaetemi
53b3a51b54 Merge with ryzomcore/v0.11.0
--HG--
branch : compatibility
2014-11-10 23:47:23 +01:00
kaetemi
0fe2401260 Backed out changeset: eae58a811aa5
--HG--
branch : compatibility
2014-09-12 11:20:36 +02:00
kaetemi
04528999c8 Backed out changeset: cd8e80e4b0d6
--HG--
branch : compatibility
2014-09-12 11:19:33 +02:00
kaetemi
b698c10475 Merge with ryzomcore/v0.10.0
--HG--
branch : compatibility
2014-09-12 11:19:09 +02:00
kaetemi
8a3994d95a Replace some hardcoded urls 2014-09-12 10:49:40 +02:00
kaetemi
50f05a2bb9 Remove hardcoded urls 2014-09-12 10:42:42 +02:00
nimetu
1a4c2169c5 Fix #161 fix craft success rate display on client 2014-09-10 15:40:32 +02:00
kaetemi
a8f8fa7b63 Don't use magic numbers for the LCT 2014-09-09 08:16:44 +02:00
kervala
305a6658ec Merge with default
--HG--
branch : compatibility
2014-08-30 16:22:41 +02:00
kervala
687927ba10 Changed: Preserve attributes when copying files in Application Bundle 2014-08-30 16:20:36 +02:00
kaetemi
dcd272c81a Merge with default
--HG--
branch : compatibility
2014-08-26 13:51:19 +02:00
kaetemi
4402e2134c Remove warnings, ref #177 2014-08-26 13:48:34 +02:00
kaetemi
031cd3b68d Adjust casts, ref #177 2014-08-26 13:33:18 +02:00
kaetemi
0c71506129 Merge with default
--HG--
branch : compatibility
2014-08-25 15:33:40 +02:00
kaetemi
2a27139594 Inventory bug workaround, ref #177 2014-08-25 15:32:00 +02:00
kaetemi
fad363efb5 Merge with ryzomcore/v0.9.1
--HG--
branch : compatibility
2014-08-25 15:09:16 +02:00
kaetemi
f724d13700 Fix #71 2014-07-28 22:16:41 +02:00
kaetemi
5930d3b384 Backed out changeset: 7bdb27443f88 2014-07-28 22:15:09 +02:00
kervala
49c53955a6 Fixed: Some typos 2014-07-19 13:59:54 +02:00
kaetemi
fff4edb2c9 Maybe solves #210
--HG--
branch : develop
2014-10-16 02:00:53 +02:00
kaetemi
5fd4f96a59 Configure shadow outline in applications
--HG--
branch : develop
2014-10-08 23:20:35 +02:00
kaetemi
dc3238b111 Disable dumb loading strings
--HG--
branch : develop
2014-10-08 09:31:45 +02:00
kaetemi
cb022c6bbb Remove debug message
--HG--
branch : develop
2014-09-23 18:18:14 +02:00
kaetemi
027860be16 Fix missing include
--HG--
branch : develop
2014-09-18 13:02:32 +02:00
kaetemi
74e9aac960 Fix r2ed
--HG--
branch : develop
2014-09-15 17:42:24 +02:00
kaetemi
9283a74a22 Fix r2ed
--HG--
branch : develop
2014-09-15 16:59:12 +02:00
kaetemi
84046c8db4 Fix r2ed
--HG--
branch : develop
2014-09-15 14:33:07 +02:00
kaetemi
433d83e2fc Increase texturing limits (*4), ref #203 (TODO: Update config translations)
--HG--
branch : develop
2014-09-13 12:14:45 +02:00
kaetemi
e729a9d035 Fix #162: Center ingame mouse cursor after login 2014-07-09 12:31:22 +02:00
kaetemi
e8f7851dd2 Fix compile 2014-06-21 22:32:49 +02:00
kaetemi
fd6a95e3a3 Backed out changeset: f665fcc42968 (except dru.cpp) 2014-06-19 20:22:12 +02:00
kaetemi
2e096a9b36 Fix Ryzom client compile under MinGW 2014-06-19 01:17:35 +02:00
kaetemi
15dc492690 Set additional preferred memory 2014-06-05 15:51:25 +02:00
kaetemi
1f786418a7 Crash safely with an error when sphrase is missing on client 2014-05-23 19:13:36 +02:00
kaetemi
47e5e587ad Use vector instead of map to store sbrick sheets, it's faster 2014-05-23 19:13:08 +02:00
kervala
574382fcbb Changed: Set official Ryzom client version and identifiers for OS X bundle
--HG--
branch : compatibility
2014-05-13 10:02:32 +02:00
kervala
a7eedeb7c7 Merge with default
--HG--
branch : compatibility
2014-05-13 09:37:06 +02:00
kervala
46e5c39e74 Changed: Replaced some spaces by tabulations 2014-05-13 09:29:45 +02:00
kaetemi
fea9413c18 Merge with default
--HG--
branch : compatibility
2014-04-30 13:02:11 +02:00
kaetemi
db5c65fedf Merge 2014-04-30 12:57:54 +02:00
kaetemi
1a4a7bafab Backed out changeset: 897087f1fa71, 7c3f1f0dc9d8, 61d11f94e3ea 2014-04-30 12:54:20 +02:00
kervala
1150cfeb75 Changed: Updated client_default.cfg to official client one
--HG--
branch : compatibility
2014-04-30 09:30:32 +02:00
kervala
55e7199c69 Merge with default
--HG--
branch : compatibility
2014-04-30 09:19:45 +02:00
kervala
060347f2b9 Changed: Small typo 2014-04-30 09:18:31 +02:00
kervala
50324ccd55 Fixed #151: White box on character selection screen (a big thanks to nimetu for the patch!) 2014-04-29 10:31:02 +02:00
kervala
732ffaa384 Changed: Official Ryzom URLs
--HG--
branch : compatibility
2014-04-25 12:00:29 +02:00
kervala
01bc4eeb92 Changed: Minor changes 2014-04-25 11:58:35 +02:00
kervala
31859175ba Backed out changeset: 79980ce60498 2014-04-24 19:31:53 +02:00
kervala
24fa8df5ff Fusion avec default
--HG--
branch : compatibility
2014-04-24 19:16:42 +02:00
kervala
3fff8fe467 Changed: Replaced strlwr by toLower
--HG--
branch : compatibility
2014-04-24 18:11:16 +02:00
Nimetu
02cb532401 Properly restore saved camera distance from config file (issue #130)
--HG--
branch : Issue#130
2014-04-23 23:20:13 +03:00
kaetemi
e494200c21 Bugfix: Kill users who attempt to escape the game 2014-04-01 13:54:39 +02:00
kaetemi
562dae3c3f Add command to eternally trap players ingame 2014-04-01 13:52:36 +02:00
kaetemi
5ed5cd5ea8 Add interface for HMD with player death support 2014-04-01 13:14:44 +02:00
kervala
81881a583f Fixed: Switch not handled warnings
--HG--
branch : compatibility
2014-03-27 15:53:19 +01:00
kervala
9f0daa9a1e Fixed: Wrong header guard warning 2014-03-27 15:51:20 +01:00
kervala
2e6ac0ad84 Fixed: Wrong header guard warning
--HG--
branch : compatibility
2014-03-27 15:51:20 +01:00
kervala
bfaf952f32 Fixed: Warnings with clang: wrong ! and == operators order 2014-03-27 15:50:58 +01:00