Commit Graph

10757 Commits (703c21cbc5a2fb26eb356c003c0cff6d11bf6545)
 

Author SHA1 Message Date
kaetemi 2c1be97a50 Add r2 string translation command
kaetemi e4883acceb Formatting style
kaetemi aeb127e011 Fix cast warnings
Ulukyn 143b96c214 Merge branch 'atys' into yubo
Ulukyn d4e5af7df2 Added: libicu in Makefile
Ulukyn 8dc9b89f94 Merge remote-tracking branch 'origin/merge-into-atys' into yubo
Nimetu 2d86c5377d Merge branch 'develop' into merge-into-atys
Nimetu 2c92649a72 Fixed: Default value for WITH_RYZOM_LIVE not used.
kaetemi 02c40934ef Remove references to things which don't exist
kaetemi f892608865 Fix ring scenario edition mode initialization
Jan Boon 9d1545bbe2 Merge branch 'develop' into ryzomclassic-develop
kaetemi 6b9a1f39cd Fix scenario loading
kaetemi 0244c348ee Fix exit crash when CTextureBump is destroyed after _NameToNF
kaetemi f0687a8157 Fix ring scenario edition mode initialization
kaetemi f41126f4b2 The order of processing directories really is important, don't randomize it!!!
Jan Boon abb6af4f3b Merge remote-tracking branch 'ryzomcore/develop' into develop
Ulukyn 04f9d593e0 Merge remote-tracking branch 'origin/merge-into-atys' into yubo
Nimetu 3be969a73d Merge branch 'develop' into merge-into-atys
Nimetu 14076b899d Fixed: compiling ryzom installer
Ulukyn ce8b05b284 Merge branch 'master' into stline/s2e1
Nimetu f78decc6ad Fixed: typo
Ulukyn 42b291c73e Merge remote-tracking branch 'origin/merge-into-atys' into yubo
Nimetu 4aa94b3ae9 Changed: Set WITH_RYZOM_LIVE=ON as default
Nimetu c0110133d7 Changed: Restore ryzom.com urls in client cfg
Nimetu c36faf2d61 Merge branch 'develop' into merge-into-atys
Ulukyn fef0cad61a Merge branch 'ryzom/ui/improvements' into yubo
Ulukyn debb6b7d0c Changed: exposed the toggle_fly to final clients
Nimetu e1dff3b4b8 Fixed: typo
Nimetu 6afd9ea1f2 Fixed: invalid assignment
Nimetu f449bb7c51 Changed: Display mp3 music path on sysinfo window.
Heernis f11ed5ea49 Merge remote-tracking branch 'origin/master' into translation-german-fixes
Ulukyn 050d9fea2f Merge branch 'ryzom/ui/improvements' into yubo
Ulukyn 9a8f29bb67 Merge branch 'ryzom/ui/improvements' into atys
Ulukyn c2e879ebcc Changed: removed pvp check for rp logos
Ulukyn 11086f9b44 Merge branch 'translations' into yubo
Ulukyn 311e739d98 Merge branch 'translations'
Ulukyn f6f7e553fc Merge branch 'master' into translations
Ulukyn 255271cde5 Merge branch 'translation-german-fixes'
Ulukyn 6d233cdc2c Merge branch 'translation-german-fixes' into yubo
Ulukyn f337a28ae2 Merge branch 'translations' into translation-german-fixes
Ulukyn a36694614f Merge branch 'master' into translation-german-fixes
Ulukyn bcb8080d42 Merge branch 'master' into translations
kaetemi 7256109dcb Add a verbose variant of assert that's disabled in final build
kaetemi 86b809e581 Fix typo
kaetemi f8bee17d3c Fix build
kaetemi 71a22b43db Fixes
kaetemi 5a543239bb Batch of fixes for server
Jan Boon 6cdee90e4e Merge branch 'develop' into ryzomclassic-develop
kaetemi c056cd7d24 Fixes
kaetemi 0a1e8186b3 Batch of fixes for client