Ryzom
/
ryzom-core
1
1
Fork 0
Code Issues 38 Pull Requests Projects 1 Releases 1 Activity

Merge branch 'storyline/s2e0' into yubo

Browse Source
fix_opengl_on_mac
Ulukyn 5 years ago
parent a7d2175f93 6747613b03
commit b869cd07d6
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File

1
code/ryzom/common/src/game_share/brick_families.cpp
Unescape Escape View File

@ -549,6 +549,7 @@ namespace BRICK_FAMILIES
NL_STRING_CONVERSION_TABLE_ENTRY(BSGMBP) NL_STRING_CONVERSION_TABLE_ENTRY(BSGMBP)
NL_STRING_CONVERSION_TABLE_ENTRY(BSGMBR) NL_STRING_CONVERSION_TABLE_ENTRY(BSGMBR)
NL_STRING_CONVERSION_TABLE_ENTRY(BSGMBS) NL_STRING_CONVERSION_TABLE_ENTRY(BSGMBS)
NL_STRING_CONVERSION_TABLE_ENTRY(BSGMC)
NL_STRING_CONVERSION_TABLE_ENTRY(BSMMA) NL_STRING_CONVERSION_TABLE_ENTRY(BSMMA)
NL_STRING_CONVERSION_TABLE_ENTRY(BSMMB) NL_STRING_CONVERSION_TABLE_ENTRY(BSMMB)
NL_STRING_CONVERSION_TABLE_ENTRY(BSMMC) NL_STRING_CONVERSION_TABLE_ENTRY(BSMMC)

1
code/ryzom/common/src/game_share/brick_families.h
Unescape Escape View File

@ -660,6 +660,7 @@ namespace BRICK_FAMILIES
BSGMBP, BSGMBP,
BSGMBR, BSGMBR,
BSGMBS, BSGMBS,
BSGMC, // jewels s2e0
BeginMagicPowerParameter, BeginMagicPowerParameter,
BSMMA = BeginMagicPowerParameter, // sap aura BSMMA = BeginMagicPowerParameter, // sap aura

Write Preview
Loading…
Cancel
Save