kervala
|
1e8d28759a
|
Merge with develop
|
2016-12-18 20:44:33 +01:00 |
|
kervala
|
44a7872135
|
Changed: Merged changes from compatibility-develop that should also be in develop
|
2016-12-18 20:39:16 +01:00 |
|
kervala
|
bb28b25e71
|
Merge with develop
|
2016-12-18 14:47:16 +01:00 |
|
kervala
|
9032a98096
|
Changed: Strings initialization
|
2016-12-18 14:41:47 +01:00 |
|
kervala
|
e2f3e5ee89
|
Changed: Replaced comparisons with string("") by empty() check
|
2016-12-18 14:40:54 +01:00 |
|
kervala
|
22e236f2fe
|
Changed: Use %u instead of %d for uint
|
2016-12-18 14:00:20 +01:00 |
|
kervala
|
c4cd6ccfc2
|
Fixed: Compilation
|
2016-12-18 13:59:17 +01:00 |
|
kervala
|
ff0581a402
|
Fixed: Unicode MFC use
|
2016-12-18 13:59:02 +01:00 |
|
kervala
|
33983dec8d
|
Changed: Make 2 different upgd_nl.bat depending on compiler
|
2016-12-18 13:58:20 +01:00 |
|
kervala
|
288b13dbfb
|
Changed: Replace some const char* by std::string
|
2016-12-18 13:45:07 +01:00 |
|
Guillaume Dupuy
|
116769bc4e
|
Remove duplicate code
|
2016-12-17 14:31:27 +01:00 |
|
Guillaume Dupuy
|
82dcde8aa6
|
Fix a bug where a monster could be stuck after dropping aggro while rooted
|
2016-12-17 02:47:05 +01:00 |
|
kervala
|
487a6eacfa
|
Merge with develop
|
2016-12-15 21:12:19 +01:00 |
|
kervala
|
77c4520ce3
|
Changed: Support VC++ 2013 DLLs
|
2016-12-15 21:11:27 +01:00 |
|
ulukyn
|
ae32111ea2
|
Fixed: Load Scenographic Editor lua files
|
2016-12-14 22:24:49 +01:00 |
|
ulukyn
|
fd1f324c5c
|
Fixed: Load Scenographic Editor lua files
|
2016-12-14 20:16:42 +01:00 |
|
ulukyn
|
8fc66a4af4
|
Fixed: Load Scenographic Editor lua files
|
2016-12-14 16:14:33 +01:00 |
|
ulukyn
|
569793d779
|
Added: sceneedit.lua and json.lua used by Scenographic Editor
|
2016-12-14 13:36:59 +01:00 |
|
ulukyn
|
390765d49f
|
Fixed: updateVector don't need return a boolean
|
2016-12-13 23:42:02 +01:00 |
|
ulukyn
|
66a34ace54
|
Fusion
|
2016-12-13 21:16:30 +01:00 |
|
ulukyn
|
448da5375d
|
Fixed: Removing some nlinfo and correction getMouseRightDown
|
2016-12-13 21:08:33 +01:00 |
|
|
a6339b7fd9
|
Merge branch 'feature/v3+CI' into 'develop'
Feature/v3+ci
Toujours le merge de la v3...
See merge request !28
|
2016-12-13 13:54:26 +00:00 |
|
kervala
|
d3dc21ad46
|
Merge with develop
|
2016-12-12 12:03:15 +01:00 |
|
kervala
|
e084c2014a
|
Fixed: Compilation
|
2016-12-12 12:02:25 +01:00 |
|
|
0e55d39f53
|
Update egs_mirror.cpp (ajout ChaScore1 ) warning dans le shard
|
2016-12-12 09:34:03 +00:00 |
|
kervala
|
861a9b399a
|
Merge with develop
|
2016-12-11 14:25:19 +01:00 |
|
kervala
|
bb3f3370b8
|
Fixed: Wrong indent
|
2016-12-11 14:21:28 +01:00 |
|
kervala
|
43a3391a98
|
Chnged: Sign comparison warning
|
2016-12-11 14:20:52 +01:00 |
|
kervala
|
b4d5bb9af5
|
Changed: Removed unused variables
|
2016-12-11 14:20:31 +01:00 |
|
kervala
|
f3147c7616
|
Merge with develop
|
2016-12-11 12:43:05 +01:00 |
|
kervala
|
e8b906c59b
|
Fixed: Compilation
|
2016-12-11 12:42:06 +01:00 |
|
kervala
|
486a5e4638
|
Merge with develop
|
2016-12-11 12:32:05 +01:00 |
|
kervala
|
3665c79b3a
|
Fixed: Use std::vector instead of CUniquePtr for arrays
|
2016-12-11 12:31:24 +01:00 |
|
ulukyn
|
2a7615b2f4
|
Added: ARKPACSBorders to enable/disable the display of collisions by user
|
2016-12-10 22:05:38 +01:00 |
|
ulukyn
|
512d300741
|
Added: Export usefull cursor and shape functions in lua:
getGroundAtMouse
getMousePos
getMouseDown
getMouseMiddleDown
getMouseRightDown
setMouseCursor
setupShape
getShapeIdAt
addShape
moveShape
rotateShape
getShapePos
getShapeScale
getShapeRot
getShapeColPos
getShapeColScale
getShapeColOrient
deleteShape
|
2016-12-10 22:04:33 +01:00 |
|
kervala
|
dab3de7a74
|
Merge with develop
|
2016-12-10 19:52:43 +01:00 |
|
kervala
|
e1f810ffba
|
Changed: extern keyword useless there
|
2016-12-10 19:02:06 +01:00 |
|
kervala
|
0be5b4b248
|
Fixed: Don't call CCoTask::releaseInstance() because allocated on heap
|
2016-12-10 19:01:34 +01:00 |
|
kervala
|
7fb636f37d
|
Changed: Minor changes
|
2016-12-10 18:58:13 +01:00 |
|
kervala
|
cf840353ce
|
Removed: Empty cpp files
|
2016-12-10 18:40:17 +01:00 |
|
kervala
|
1ee5aa36bc
|
Fixed: Compilation of World Editor in Unicode
|
2016-12-10 18:15:01 +01:00 |
|
kervala
|
12f39043b0
|
Changed: Use TCHAR functions
|
2016-12-10 14:21:20 +01:00 |
|
kervala
|
51068e2164
|
Changed: Already a std::string
|
2016-12-10 13:09:16 +01:00 |
|
kervala
|
7a270ff9c0
|
Changed: Use addSlashR to replace \n by \r\n
|
2016-12-10 13:08:39 +01:00 |
|
kervala
|
08071b75dd
|
Changed: NeL helpers to launch an external editor
|
2016-12-10 13:02:26 +01:00 |
|
kervala
|
a184dd7d8f
|
Changed: Convert std::string <> TCHAR
|
2016-12-10 13:01:27 +01:00 |
|
kervala
|
a625bccce3
|
Changed: Replace a lot of const char* by std::string parameters
|
2016-12-10 12:30:57 +01:00 |
|
kervala
|
bbeac21e82
|
Changed: Use a CUniquePtr macro since std::unique_ptr doesn't exist on all (yet) supported platforms
|
2016-12-10 12:05:29 +01:00 |
|
kervala
|
a6b31df8de
|
Changed: Release all memory when leaving in login screen
|
2016-12-09 16:15:18 +01:00 |
|
kervala
|
9bfa8f1049
|
Fixed: Release CCurrentCoTask singleton
|
2016-12-09 16:14:16 +01:00 |
|
kervala
|
a905001849
|
Changed: Unimplemented functions
|
2016-12-09 16:04:50 +01:00 |
|
kervala
|
914980875b
|
Changed: Unicode MFC support
|
2016-12-09 16:04:26 +01:00 |
|
kervala
|
75e183e637
|
Backed out changeset: 6b7af3bc4752
|
2016-12-08 18:20:34 +01:00 |
|
|
d5b6609538
|
Correction des privileges ChaScore1 et maxChaScore1 pour les GM
|
2016-12-07 21:40:41 +01:00 |
|
|
5d93d12272
|
Changement du nom de shard "Open" en "Lirria"
|
2016-12-07 21:26:43 +01:00 |
|
kervala
|
52301431e4
|
Merge with develop
|
2016-12-06 20:29:22 +01:00 |
|
kervala
|
21f31f1827
|
Merge with develop
|
2016-12-05 19:53:15 +01:00 |
|
kervala
|
7036702324
|
Merge with develop
|
2016-12-05 14:06:48 +01:00 |
|
kervala
|
b61c9d4cf8
|
Merge with develop
|
2016-12-04 20:31:56 +01:00 |
|
kervala
|
c53133e7f2
|
Merge with develop
|
2016-12-04 19:19:15 +01:00 |
|
kervala
|
061bed6635
|
Merge with develop
|
2016-12-04 18:39:21 +01:00 |
|
kervala
|
18ca67b199
|
Merge with develop
|
2016-12-04 17:32:34 +01:00 |
|
C?dric OCHS
|
916f1b008b
|
Merged in Glorf/ryzomcore/target_sheet (pull request #142)
Update target command
|
2016-12-04 12:43:36 +00:00 |
|
Guillaume Dupuy
|
54f128ad17
|
Use std::string instead of ucstring
|
2016-12-04 13:37:04 +01:00 |
|
|
ce305c7512
|
Merge branch 'develop' of https://git.khaganat.net/khaganat/khanat-code into develop
|
2016-12-03 17:57:35 +01:00 |
|
|
56df66454a
|
Changement du nom du shard à la création du personnage
|
2016-12-03 17:56:35 +01:00 |
|
Guillaume Dupuy
|
6f1197d633
|
Allow target to work with sheetName and a quiet option
HG : Enter commit message. Lines beginning with 'HG:' are removed.
|
2016-11-28 00:54:33 +01:00 |
|
Nimetu
|
dcf8b9b77c
|
Changed: Added translation
|
2016-11-26 15:24:27 +02:00 |
|
Nimetu
|
3ab4c7d714
|
Merge with develop
|
2016-11-26 15:24:24 +02:00 |
|
kervala
|
99ab8fba3e
|
Merge with develop
|
2016-11-26 13:20:32 +01:00 |
|
kervala
|
4bf0e1b0d9
|
Merge with develop
|
2016-11-25 10:44:44 +01:00 |
|
kervala
|
b8c25f7df9
|
Merge with develop
|
2016-11-20 16:41:28 +01:00 |
|
kervala
|
4d96978674
|
Merge with develop
|
2016-11-20 14:51:11 +01:00 |
|
|
99543f52f3
|
Delete sheet_id.bin , il ne devrait pas être la c'est une erreur !!!
|
2016-11-17 21:20:07 +00:00 |
|
kervala
|
0504c52eeb
|
Merge with develop
|
2016-11-13 16:53:35 +01:00 |
|
kervala
|
6a315be980
|
Merge with develop
|
2016-11-13 11:08:14 +01:00 |
|
Sit Melai
|
ccb943b852
|
Merge de la v3 de Ryzom Core
|
2016-11-07 17:11:05 +01:00 |
|
kervala
|
4438ab108c
|
Merge with develop
|
2016-11-07 14:12:11 +01:00 |
|
Nuno Gon?alves
|
e157a7453e
|
Changed: Fix the way to load ryzhome lua/xml files
|
2016-11-07 13:53:41 +01:00 |
|
kervala
|
7d909da444
|
Changed: Rerun Installer from a specific directory with right arguments
|
2016-11-05 19:46:12 +01:00 |
|
kervala
|
33580166f4
|
Changed: Minor changes
|
2016-11-04 20:23:01 +01:00 |
|
kervala
|
59527ecc49
|
Changed: Don't display an error if file doesn't exist
|
2016-11-04 20:22:42 +01:00 |
|
kervala
|
e50b590ad0
|
Changed: Discard \r and only use \n
|
2016-11-04 20:22:10 +01:00 |
|
kervala
|
e1315c28a7
|
Changed: Minor changes
|
2016-11-04 20:20:39 +01:00 |
|
kervala
|
01736696a8
|
Changed: ForceUtf8 parameter useless now
|
2016-11-04 20:19:41 +01:00 |
|
kervala
|
4ad536b4fb
|
Fixed: Wrong size of nl
|
2016-11-04 09:17:32 +01:00 |
|
kervala
|
db95157bdb
|
Changed: Minor changes
|
2016-11-04 09:14:08 +01:00 |
|
kervala
|
2da57a4d24
|
Changed: Removed trailing spaces
|
2016-11-04 09:09:51 +01:00 |
|
kervala
|
d865dc5a70
|
Merge with develop
|
2016-11-03 14:46:44 +01:00 |
|
kervala
|
cd9a3c35c4
|
Changed: Sleep 1 second after copying files (because to some disk cache)
|
2016-11-03 14:44:01 +01:00 |
|
kervala
|
2625225120
|
Changed: Don't try to copy Installer several times (if it fails once, it'll fail forever)
|
2016-11-03 14:43:08 +01:00 |
|
kervala
|
d90983bee3
|
Changed: Use QSaveFile to be sure the file is fully written
|
2016-11-03 14:42:07 +01:00 |
|
|
003480c4e9
|
mise a jour des bons fichiers sur le client khanat
|
2016-11-01 17:59:10 +01:00 |
|
Sit Melai
|
f75a3cdd2d
|
Merge branch 'develop' of ssh://git.khaganat.net:1022/khaganat/khanat-code into develop
Merging local changes
|
2016-10-31 22:50:39 +01:00 |
|
Sit Melai
|
5231e8de28
|
various improvements to clients
|
2016-10-31 22:46:39 +01:00 |
|
kervala
|
9f434db97b
|
Merge with develop
|
2016-10-31 19:03:04 +01:00 |
|
kervala
|
d4bbc683a7
|
Changed: Updated all translations in UTF-8
|
2016-10-31 19:02:29 +01:00 |
|
kervala
|
ca9baf5e4c
|
Fixed: Spaces in paths for patch under Linux and OS X
|
2016-10-31 18:58:49 +01:00 |
|
kervala
|
9ce9d9c388
|
Changed: Don't update qtbase_*.ts files
|
2016-10-31 18:58:07 +01:00 |
|
kervala
|
9d85a406d4
|
Changed: Updated some variables names in interface
|
2016-10-31 18:57:42 +01:00 |
|