kervala
|
cbf2c744f0
|
Changed: Replace some const char* by std::string
--HG--
branch : develop
|
2016-12-18 13:45:07 +01:00 |
|
kervala
|
288b13dbfb
|
Changed: Replace some const char* by std::string
|
2016-12-18 13:45:07 +01:00 |
|
C?dric OCHS
|
c551307ff7
|
Merged in Glorf/ryzomcore/fix_freezing (pull request #143)
Fix a bug where a monster could be stuck after dropping aggro while rooted
|
2016-12-17 15:04:08 +01:00 |
|
Cédric OCHS
|
0c830e00e1
|
Merged in Glorf/ryzomcore/fix_freezing (pull request #143)
Fix a bug where a monster could be stuck after dropping aggro while rooted
--HG--
branch : compatibility-develop
|
2016-12-17 15:04:08 +01:00 |
|
Guillaume Dupuy
|
116769bc4e
|
Remove duplicate code
|
2016-12-17 14:31:27 +01:00 |
|
Guillaume Dupuy
|
73191a2388
|
Remove duplicate code
--HG--
branch : fix_freezing
|
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 |
|
Guillaume Dupuy
|
fb280101f1
|
Fix a bug where a monster could be stuck after dropping aggro while rooted
--HG--
branch : fix_freezing
|
2016-12-17 02:47:05 +01:00 |
|
kervala
|
487a6eacfa
|
Merge with develop
|
2016-12-15 21:12:19 +01:00 |
|
kervala
|
81008cd9ff
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-12-15 21:12:19 +01:00 |
|
kervala
|
3142a8d99f
|
Changed: Support VC++ 2013 DLLs
--HG--
branch : develop
|
2016-12-15 21:11:27 +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@gmail.com
|
3f58cbd077
|
Fixed: Load Scenographic Editor lua files
--HG--
branch : compatibility-develop
|
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@gmail.com
|
b0dc979718
|
Fixed: Load Scenographic Editor lua files
--HG--
branch : compatibility-develop
|
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@gmail.com
|
6238139c08
|
Fixed: Load Scenographic Editor lua files
--HG--
branch : compatibility-develop
|
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@gmail.com
|
6ff3cc9d77
|
Added: sceneedit.lua and json.lua used by Scenographic Editor
--HG--
branch : compatibility-develop
|
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@gmail.com
|
c6f10d493d
|
Fixed: updateVector don't need return a boolean
--HG--
branch : compatibility-develop
|
2016-12-13 23:42:02 +01:00 |
|
ulukyn
|
66a34ace54
|
Fusion
|
2016-12-13 21:16:30 +01:00 |
|
ulukyn@gmail.com
|
68e6dbaf9a
|
Fusion
--HG--
branch : compatibility-develop
|
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 |
|
ulukyn@gmail.com
|
80fc274813
|
Fixed: Removing some nlinfo and correction getMouseRightDown
--HG--
branch : compatibility-develop
|
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 |
|
|
9bd0bf131c
|
Update .gitlab-ci.yml
|
2016-12-13 13:22:52 +00:00 |
|
|
f46cad2e63
|
Update .gitlab-ci.yml
|
2016-12-13 12:56:37 +00:00 |
|
|
1fdbb7e688
|
Update .gitlab-ci.yml
|
2016-12-13 12:47:22 +00:00 |
|
|
4f784dc460
|
Update .gitlab-ci.yml
|
2016-12-13 12:35:32 +00:00 |
|
|
7369ce6f78
|
Update .gitlab-ci.yml
|
2016-12-12 21:51:23 +00:00 |
|
|
eba869c7f0
|
Update .gitlab-ci.yml
|
2016-12-12 21:46:56 +00:00 |
|
|
2e8bfb3f0b
|
Update .gitlab-ci.yml
|
2016-12-12 21:39:35 +00:00 |
|
|
9242213489
|
Update .gitlab-ci.yml
|
2016-12-12 21:36:14 +00:00 |
|
|
5cedb47135
|
Update .gitlab-ci.yml
|
2016-12-12 21:24:36 +00:00 |
|
|
2a21b4b517
|
Update .gitlab-ci.yml
|
2016-12-12 21:13:26 +00:00 |
|
|
f229de6ba5
|
Update .gitlab-ci.yml
|
2016-12-12 14:59:45 +00:00 |
|
|
3c25a4eb8c
|
Update .gitlab-ci.yml
|
2016-12-12 14:32:42 +00:00 |
|
|
15db81852c
|
Update .gitlab-ci.yml
|
2016-12-12 14:28:21 +00:00 |
|
|
a549e75526
|
Update .gitlab-ci.yml
|
2016-12-12 13:58:04 +00:00 |
|
|
e7a8320e98
|
Update .gitlab-ci.yml
|
2016-12-12 13:30:54 +00:00 |
|
kervala
|
d3dc21ad46
|
Merge with develop
|
2016-12-12 12:03:15 +01:00 |
|
kervala
|
afe3863f0f
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-12-12 12:03:15 +01:00 |
|
kervala
|
d039598225
|
Fixed: Compilation
--HG--
branch : develop
|
2016-12-12 12:02:25 +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
|
5acd03d77d
|
Merge with develop
|
2016-12-11 19:27:27 +01:00 |
|
kervala
|
c14d0733c9
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-12-11 19:27:27 +01:00 |
|
kervala
|
bca1722bdd
|
Changed: Fix warning
--HG--
branch : develop
|
2016-12-11 19:26:38 +01:00 |
|