kervala
|
11c0a073ed
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-01-02 17:11:59 +01:00 |
|
kervala
|
de77bb634d
|
Changed: Don't need to cast since it's already a sint32
--HG--
branch : develop
|
2016-01-02 17:10:50 +01:00 |
|
kervala
|
2f45ff1ebe
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-12-29 22:36:04 +01:00 |
|
kervala
|
ab4dc8ec01
|
Changed: Merge code from private repository
--HG--
branch : develop
|
2015-12-29 22:06:49 +01:00 |
|
kervala
|
98c485bd94
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-12-29 18:03:21 +01:00 |
|
kervala
|
88042cc28d
|
Changed: Minor changes
--HG--
branch : develop
|
2015-12-29 16:19:46 +01:00 |
|
kervala
|
050a3679f1
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-12-15 22:52:28 +01:00 |
|
kervala
|
7105749d94
|
Changed: Include limits
--HG--
branch : develop
|
2015-12-15 22:51:37 +01:00 |
|
kervala
|
0e63e81565
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-12-15 15:09:50 +01:00 |
|
kervala
|
3a3a8752d1
|
Changed: Replace (uint16)~0 by std::numeric_limits<uint16>::max()
--HG--
branch : develop
|
2015-12-15 14:33:59 +01:00 |
|
kervala
|
189fc7a2d9
|
Changed: Minor changes
--HG--
branch : develop
|
2015-12-15 13:39:02 +01:00 |
|
kervala
|
84831a4b34
|
Changed: Use std::string insteaf of const char* for filenames in CPersistentDataRecord
--HG--
branch : develop
|
2015-12-15 13:35:04 +01:00 |
|
kervala
|
74f297f588
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-12-13 15:26:37 +01:00 |
|
kervala
|
8aff509f0f
|
Fixed: Clang warnings
--HG--
branch : develop
|
2015-12-13 15:25:28 +01:00 |
|
kervala
|
9e60db1a89
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-12-07 21:49:21 +01:00 |
|
kervala
|
079ea3e5c5
|
Changed: Let dependencies propagate to other targets
--HG--
branch : develop
|
2015-12-07 21:48:32 +01:00 |
|
kervala
|
fd4519f447
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-12-03 12:50:55 +01:00 |
|
kervala
|
86a866d4cb
|
Fixed: Completely remove Yubo Chat since it's not used anymore (patch by Kaetemi)
--HG--
branch : develop
|
2015-12-03 12:49:51 +01:00 |
|
kervala
|
ba2cfee2b1
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-11-25 16:02:08 +01:00 |
|
kaetemi
|
525b0f1643
|
Apply patch #231, new weather values, must be applied server-side as well. Needs to be tested
--HG--
branch : develop
|
2015-11-24 19:33:57 +01:00 |
|
kervala
|
a2ba342e06
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-11-14 19:29:43 +01:00 |
|
kervala
|
fb1d5134ba
|
Changed: Minor changes
--HG--
branch : develop
|
2015-11-14 18:33:13 +01:00 |
|
kervala
|
45597ebd8a
|
Changed: Implement a TODO
--HG--
branch : develop
|
2015-11-14 18:21:44 +01:00 |
|
kervala
|
64e4468943
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-11-14 12:13:12 +01:00 |
|
kervala
|
53f46eb5fa
|
Changed: Support for integer types in Lua 5.3, fixes #253
--HG--
branch : develop
|
2015-11-14 11:46:17 +01:00 |
|
kervala
|
7f62faa794
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-11-13 19:52:35 +01:00 |
|
kervala
|
a8d81c689b
|
Changed: Support for integer types in Lua 5.3, fixes #253
--HG--
branch : develop
|
2015-11-13 18:42:50 +01:00 |
|
kervala
|
4a97f339a3
|
Changed: Replaced some NLMISC::strlwr by NLMISC::toLower
--HG--
branch : develop
|
2015-11-13 16:22:49 +01:00 |
|
kervala
|
f095121991
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-11-06 15:49:55 +01:00 |
|
kervala
|
93a03b5db0
|
Fixed: clang warnings
--HG--
branch : develop
|
2015-11-06 15:24:19 +01:00 |
|
kervala
|
2e96c40211
|
Changed: Revert back to official client version (revision will be displayed in Ryzom Core client)
--HG--
branch : compatibility-develop
|
2015-11-05 17:42:43 +01:00 |
|
kaetemi
|
f07e471597
|
Merge with develop (ryzomcore/v0.12.0)
--HG--
branch : compatibility-develop
|
2015-04-14 11:57:40 +02:00 |
|
kaetemi
|
d9f3efc4e3
|
ryzomcore/v0.12.0
--HG--
branch : develop
|
2015-04-14 11:55:08 +02:00 |
|
kervala
|
9882d17a45
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-04-05 16:45:34 +02:00 |
|
kaetemi
|
1a5a0d5acb
|
Fix CHashCode compare operator
--HG--
branch : develop
|
2015-03-29 16:58:07 +02:00 |
|
kervala
|
97eac497ff
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-03-07 17:03:34 +01:00 |
|
kaetemi
|
3c04d70f28
|
Merge ryzomcore/v0.11.3
--HG--
branch : compatibility
|
2015-03-07 00:03:48 +01:00 |
|
kaetemi
|
9d36ac8cb0
|
Merge with hotfix
--HG--
branch : develop
|
2015-03-07 00:01:02 +01:00 |
|
kaetemi
|
621a9e8f7c
|
ryzomcore/v0.11.3
--HG--
branch : hotfix
|
2015-03-06 23:53:34 +01:00 |
|
kaetemi
|
77d17265eb
|
Visual Studio 2013 compilation support for Ryzom Server
--HG--
branch : develop
|
2015-02-23 12:58:43 +01:00 |
|
kaetemi
|
32b3b4ac80
|
Visual Studio 2013 compilation support for Ryzom Client
--HG--
branch : develop
|
2015-02-20 17:50:58 +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
|
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
|
47051791fa
|
Changed: Added RYZOM_COMPATIBILITY_VERSION version string for compatibility branch
--HG--
branch : compatibility
|
2015-02-14 15:09:18 +01:00 |
|
kervala
|
eb05c962de
|
Merge with develop
--HG--
branch : compatibility
|
2015-02-14 14:36:37 +01:00 |
|
dfighter1985
|
b2d137eb07
|
Merged hotfix to compatibility.
--HG--
branch : compatibility
|
2015-02-02 02:53: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
|
4fc639671c
|
Changed: Check for string length
--HG--
branch : develop
|
2014-12-26 13:44:35 +01:00 |
|
kervala
|
6596af9682
|
Changed: Minor changes
--HG--
branch : develop
|
2014-12-26 13:38:02 +01:00 |
|
kaetemi
|
0a7462f7e1
|
Merge with hotfix
--HG--
branch : develop
|
2014-12-22 16:40:12 +01:00 |
|
kaetemi
|
bb8eb7dcec
|
Fix mirror type sizes
--HG--
branch : hotfix
|
2014-12-22 16:39:54 +01:00 |
|
kaetemi
|
c03c0f532b
|
Merge with default
--HG--
branch : develop
|
2014-12-22 14:26:26 +01:00 |
|
kaetemi
|
79b6fcae28
|
Merge with default
--HG--
branch : compatibility
|
2014-12-22 14:24:13 +01:00 |
|
kaetemi
|
f9c81f3740
|
ryzomcore/v0.11.2
--HG--
branch : hotfix
|
2014-12-22 14:21:01 +01:00 |
|
kaetemi
|
dfe0b2977a
|
Separate version string
--HG--
branch : develop
|
2014-11-24 16:07:17 +01:00 |
|
kaetemi
|
7bdf719cb9
|
Adjust version
--HG--
branch : develop
|
2014-11-24 15:04:53 +01:00 |
|
kaetemi
|
358f19acae
|
Merge with ryzomcore/v0.11.1
--HG--
branch : compatibility
|
2014-11-24 15:03:07 +01:00 |
|
kaetemi
|
6b1ea30f9c
|
ryzomcore/v0.11.1
--HG--
branch : hotfix
|
2014-11-24 14:57:36 +01:00 |
|
kaetemi
|
53b3a51b54
|
Merge with ryzomcore/v0.11.0
--HG--
branch : compatibility
|
2014-11-10 23:47:23 +01:00 |
|
kaetemi
|
0c1ff0df2a
|
ryzomcore/v0.11.0
--HG--
branch : develop
|
2014-11-10 23:34:41 +01:00 |
|
kaetemi
|
fe4c2becf8
|
File name, fix #202
--HG--
branch : compatibility
|
2014-09-13 10:08:44 +02:00 |
|
kaetemi
|
b698c10475
|
Merge with ryzomcore/v0.10.0
--HG--
branch : compatibility
|
2014-09-12 11:19:09 +02:00 |
|
kaetemi
|
2abe431675
|
Regenerate PLR cpp and header
|
2014-09-11 17:40:53 +02:00 |
|
kaetemi
|
14fda8a39a
|
Add missing leaf
|
2014-09-11 15:13:17 +02:00 |
|
kaetemi
|
9e74156181
|
Move islands entry points to data
|
2014-09-10 08:25:45 +02:00 |
|
kaetemi
|
55ca1e7a2a
|
Crashfix
|
2014-09-09 15:50:12 +02:00 |
|
kaetemi
|
ea9cf3db93
|
Typo
|
2014-09-09 08:15:05 +02:00 |
|
kaetemi
|
d651eff10b
|
Cleanup some RYZOMID code
|
2014-09-08 09:48:28 +02:00 |
|
kaetemi
|
4dda4099de
|
Remove dead code
|
2014-09-08 08:04:09 +02:00 |
|
kaetemi
|
b0c0439b39
|
Change ClientApplication to DomainId in permission table
|
2014-09-07 08:53:10 +02:00 |
|
kaetemi
|
fad363efb5
|
Merge with ryzomcore/v0.9.1
--HG--
branch : compatibility
|
2014-08-25 15:09:16 +02:00 |
|
kaetemi
|
025d7b6260
|
Fix crypt
--HG--
branch : sha512-auth
|
2014-10-07 03:00:34 +02:00 |
|
kaetemi
|
e6c0c70fc9
|
Compile fixes
--HG--
branch : sha512-auth
|
2014-10-07 01:44:43 +02:00 |
|
kaetemi
|
f900f80b36
|
Merge with develop
--HG--
branch : sha512-auth
|
2014-10-07 01:15:35 +02:00 |
|
kaetemi
|
b98c6f6a59
|
Set version
--HG--
branch : develop
|
2014-10-07 01:14:03 +02:00 |
|
Rodolphe Breard
|
4c2be7ea1f
|
ref #206 : hacking the types so it may compile on windows
--HG--
branch : sha512-auth
|
2014-10-02 19:14:25 +02:00 |
|
Rodolphe Breard
|
81d5294fc3
|
ref #206 : removing unused crypt lib reference
--HG--
branch : sha512-auth
|
2014-10-02 18:21:56 +02:00 |
|
Rodolphe Breard
|
65b902970a
|
ref #206 : rolling back to include a crypt(3) implementation and adding sha512 support
--HG--
branch : sha512-auth
|
2014-10-01 21:29:10 +02:00 |
|
Rodolphe Breard
|
094a23bd09
|
fixing #206 : passwords are now stored using SHA-512 instead of traditional DES
--HG--
branch : sha512-auth
|
2014-09-16 20:34:26 +02:00 |
|
kaetemi
|
c789a22155
|
Fix r2ed
--HG--
branch : develop
|
2014-09-15 18:15:40 +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
|
07ee9a4469
|
Add missing r2_islands_textures tool
--HG--
branch : develop
|
2014-09-12 20:29:50 +02:00 |
|
kaetemi
|
b18203fc4e
|
Fix Ryzom server compile under MinGW
|
2014-06-19 20:19:39 +02:00 |
|
kaetemi
|
2e096a9b36
|
Fix Ryzom client compile under MinGW
|
2014-06-19 01:17:35 +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 |
|
kaetemi
|
1a4a7bafab
|
Backed out changeset: 897087f1fa71, 7c3f1f0dc9d8, 61d11f94e3ea
|
2014-04-30 12:54:20 +02:00 |
|
kaetemi
|
562dae3c3f
|
Add command to eternally trap players ingame
|
2014-04-01 13:52:36 +02:00 |
|
kervala
|
e2797c2567
|
Changed: Include PCH
|
2014-03-26 13:14:14 +01:00 |
|
kaetemi
|
91d453dd63
|
Make packed sheets behaviour consistent accross services
|
2014-02-20 21:53:11 +01:00 |
|
kaetemi
|
2555e93771
|
Add sheets packer tool for CTimeDateSeasonManager
|
2014-02-19 00:07:22 +01:00 |
|
kaetemi
|
cb6661b10d
|
Fix for excessive inlining of npc chat serialization, issue #97
|
2014-02-14 18:36:15 +01:00 |
|
kaetemi
|
1bafddccf6
|
Fixup paths (could we use the search paths for this?)
|
2014-02-14 04:52:11 +01:00 |
|
kaetemi
|
f5c30593c8
|
Merge with default
--HG--
branch : build_pipeline_py
|
2014-02-07 00:11:12 +01:00 |
|
kaetemi
|
b53926014d
|
Remove weather configuration from data common
--HG--
branch : build_pipeline_py
|
2014-02-06 23:39:05 +01:00 |
|
kaetemi
|
439ba0713e
|
Build pacs prim list txt outside repository
--HG--
branch : build_pipeline_py
|
2014-02-06 22:10:56 +01:00 |
|
kaetemi
|
48d2c22639
|
Merge with default
--HG--
branch : kaetemi-cleanup
|
2014-02-06 19:54:15 +01:00 |
|
kervala
|
ae5becbb0b
|
Fixed: Warning with clang
|
2013-11-13 22:53:26 +01:00 |
|
kervala
|
d8a6c9f966
|
Fixed: Warning with clang
|
2013-11-13 21:40:41 +01:00 |
|
kervala
|
8099217145
|
Changed: Replaced math.mod by math.fmod in Ring lua files
|
2013-11-13 21:38:23 +01:00 |
|
kervala
|
36a537a88e
|
Changed: Replaced atof by fromString
|
2013-11-13 21:37:28 +01:00 |
|
kervala
|
de42e4d7ff
|
Fixed: Some warnings
|
2013-09-29 13:52:53 +02:00 |
|
kaetemi
|
3b1d4e3915
|
Fix warnings
|
2013-09-27 01:11:19 +02:00 |
|
kaetemi
|
96b2df8405
|
Merge with default
--HG--
branch : multipass-stereo
|
2013-08-01 23:02:49 +02:00 |
|
kervala
|
8577277bfd
|
Fixed: prtab function not compiling with VC++ (define DEBUG_CRYPT if you want to debug crypt() method)
|
2013-07-26 09:33:32 +02:00 |
|
kaetemi
|
55a00fd518
|
Don't do EOL changes for database.xml and msg.xml, causes checksum difference
|
2013-07-25 18:06:32 +02:00 |
|
kaetemi
|
929692b204
|
Remove more game data
--HG--
branch : kaetemi-cleanup
|
2013-07-24 21:49:16 +02:00 |
|
kaetemi
|
ddec3d8b19
|
Remove game data
--HG--
branch : kaetemi-cleanup
|
2013-07-24 20:58:43 +02:00 |
|
kervala
|
920cbf55ca
|
Fixed: Assign instead of a comparison
|
2013-04-29 10:34:33 +02:00 |
|
mattraykowski
|
e7e51f01e0
|
merging gui editor repo.
|
2013-02-14 09:53:06 -06:00 |
|
dfighter1985
|
fcb736c387
|
Merged mainline default branch changes.
--HG--
branch : gsoc2012-gui-editor
|
2013-02-14 10:47:10 +01:00 |
|
kervala
|
45c8b20f39
|
Changed: Typo fixes (thanks to Vagrant!)
|
2013-02-08 13:17:44 +01:00 |
|
kervala
|
5efeb5ba62
|
Fixed: Compilation with VC++ 2010 and 2012
|
2012-12-11 12:22:41 +01:00 |
|
kervala
|
0cabe14089
|
Changed: Code simplification
|
2012-12-08 11:24:43 +01:00 |
|
kervala
|
b94b59c9b7
|
Changed: Changes in game_share
|
2012-11-26 20:19:14 +01:00 |
|
dfighter1985
|
cb13ce46cd
|
MODIFIED: #1471 Merged mainline default to this branch.
--HG--
branch : gsoc2012-gui-editor
|
2012-11-25 05:22:40 +01:00 |
|
kervala
|
d2da18ff10
|
Changed: Minor typos
|
2012-11-24 20:23:13 +01:00 |
|
kervala
|
ef19fc9ec6
|
Changed: New STRING_MANAGER type clan
|
2012-11-24 20:21:45 +01:00 |
|
kervala
|
d8c7fa52f9
|
Changed: Replaced string empty comparisons with empty()
|
2012-10-06 18:17:57 +02:00 |
|
kervala
|
25dd379d7e
|
Changed: Replaced string empty comparisons with empty()
|
2012-10-06 17:17:26 +02:00 |
|
kervala
|
0cf5c1f44a
|
Changed: Install data_leveldesign if ryzom_tools are enabled
|
2012-10-01 10:07:41 +02:00 |
|
kervala
|
9bbbb79ba6
|
Changed: Synchronization with SVN
|
2012-10-01 10:07:09 +02:00 |
|
kervala
|
a9fa9bb78a
|
Changed: Install data_leveldesign if WITH_RYZOM_TOOLS is enabled
|
2012-09-26 12:43:18 +02:00 |
|
kervala
|
1374286cab
|
Changed: #825 Remove all warnings when compiling Ryzom
|
2012-09-25 13:20:25 +02:00 |
|
kervala
|
0795a61516
|
Changed: #825 Remove all warnings when compiling Ryzom
|
2012-09-25 12:33:02 +02:00 |
|
kervala
|
7a04e920e1
|
Fixed: #1493 MultiArch support
|
2012-09-22 22:57:38 +02:00 |
|
kervala
|
8922f96b9a
|
Changed: Synchronization with SVN
|
2012-09-11 20:26:36 +02:00 |
|
dfighter1985
|
d301c46c27
|
Merged default branch into gui-refactoring.
--HG--
branch : gui-refactoring
|
2012-07-02 22:46:08 +02:00 |
|
kaetemi
|
e9f75e639d
|
Fixed: Valgrind warnings
|
2012-06-28 11:08:36 +02:00 |
|
kaetemi
|
c618a29276
|
Reverted: Unnecessary changes to config and data from merge
|
2012-06-04 15:03:40 +02:00 |
|
kaetemi
|
cab401fa13
|
Merged: From default to sound_dev
--HG--
branch : sound_dev
|
2012-06-02 11:09:14 +02:00 |
|
sfb
|
af454dd1cf
|
Fixed EOL issues and added .hgeol file.
|
2012-05-29 08:31:11 -05:00 |
|
Fabien_HENON
|
f70bdc4032
|
Changed: #1469 StringId conversion to SheetId for sounds V2 (DOES NOT COMPILE YET)
--HG--
branch : gsoc2012-fabien
|
2012-05-26 19:21:19 +02:00 |
|
kervala
|
f6178de16c
|
Changed: Don't include local files in PCH
|
2012-05-21 10:04:00 +02:00 |
|
dfighter1985
|
decc92e75d
|
Extracted the CDB bank handling code into a new class CCDBBankHandler, the CDB system should be now totally independent of Ryzom.
--HG--
branch : cdb-refactoring
|
2012-04-17 08:23:02 +02:00 |
|
dfighter1985
|
17eab4ef52
|
CDB is now part of NLMISC. However it still requires some work!
--HG--
branch : cdb-refactoring
|
2012-04-16 06:08:12 +02:00 |
|
dfighter1985
|
29cde6e15b
|
Moved xml auto pointer to nlmisc.
--HG--
branch : cdb-refactoring
|
2012-04-16 02:50:18 +02:00 |
|
kervala
|
55f7150202
|
Changed: #825 Remove all warnings when compiling Ryzom
|
2012-04-08 14:23:36 +02:00 |
|
kervala
|
36fcd706fa
|
Changed: #825 Remove all warnings when compiling Ryzom
|
2012-04-07 23:47:55 +02:00 |
|
kervala
|
48e05d0056
|
Changed: #825 Remove all warnings when compiling Ryzom
|
2012-04-07 20:04:08 +02:00 |
|
kervala
|
0ac33d338a
|
Changed: #825 Remove all warnings when compiling Ryzom
|
2012-04-07 15:04:26 +02:00 |
|
kervala
|
cdcdc05e88
|
Fixed: #1448 Compilation with CLang
|
2012-04-07 14:57:15 +02:00 |
|
kervala
|
6c768a144a
|
Changed: #1448 Compilation with CLang
|
2012-04-07 11:51:21 +02:00 |
|
kervala
|
425927cd50
|
Changed: #1448 Compilation with CLang (patch provided by GelluleX, thanks !)
|
2012-04-07 11:14:21 +02:00 |
|
kaetemi
|
fab5ddfd74
|
Fixed: Compile errors under Linux.
|
2012-04-05 17:45:53 +02:00 |
|
sfb
|
5bbff4201d
|
merge inbound
|
2012-03-12 13:31:26 -05:00 |
|
sfb
|
66d5b0b879
|
Fixed: #1449 Added missing header, fixed CMake configuration, fixed iterators. GUS builds fine without MFC extensions.
|
2012-03-12 13:28:56 -05:00 |
|
sfb
|
ade9ab1689
|
Fixed: #1436 Fixed license header for deployment_configuration files - PMS should be building fine now.
|
2012-03-12 13:26:13 -05:00 |
|