diff --git a/code/nel/src/3d/driver/opengl/CMakeLists.txt b/code/nel/src/3d/driver/opengl/CMakeLists.txt index edff05d2a..21d790668 100644 --- a/code/nel/src/3d/driver/opengl/CMakeLists.txt +++ b/code/nel/src/3d/driver/opengl/CMakeLists.txt @@ -40,8 +40,6 @@ NL_ADD_LIB_SUFFIX(${NLDRV_OGL_LIB}) NL_ADD_RUNTIME_FLAGS(${NLDRV_OGL_LIB}) IF(WIN32) - INCLUDE_DIRECTORIES(BEFORE ${DXSDK_INCLUDE_DIR}) - TARGET_LINK_LIBRARIES(${NLDRV_OGL_LIB} ${DXSDK_DINPUT_LIBRARY} ${DXSDK_GUID_LIBRARY}) ADD_DEFINITIONS(-DDRIVER_OPENGL_EXPORTS) ENDIF() diff --git a/code/nel/src/3d/driver/opengles/CMakeLists.txt b/code/nel/src/3d/driver/opengles/CMakeLists.txt index e6d10fae5..8cac2dfea 100644 --- a/code/nel/src/3d/driver/opengles/CMakeLists.txt +++ b/code/nel/src/3d/driver/opengles/CMakeLists.txt @@ -38,8 +38,6 @@ NL_ADD_LIB_SUFFIX(${NLDRV_OGLES_LIB}) NL_ADD_RUNTIME_FLAGS(${NLDRV_OGLES_LIB}) IF(WIN32) - INCLUDE_DIRECTORIES(BEFORE ${DXSDK_INCLUDE_DIR}) - TARGET_LINK_LIBRARIES(${NLDRV_OGLES_LIB} ${DXSDK_DINPUT_LIBRARY} ${DXSDK_GUID_LIBRARY}) ADD_DEFINITIONS(/DDRIVER_OPENGLES_EXPORTS) ENDIF() diff --git a/code/nel/src/misc/CMakeLists.txt b/code/nel/src/misc/CMakeLists.txt index fb6752982..53993161c 100644 --- a/code/nel/src/misc/CMakeLists.txt +++ b/code/nel/src/misc/CMakeLists.txt @@ -201,12 +201,6 @@ ELSE(WITH_STATIC OR WIN32) TARGET_LINK_LIBRARIES(nelmisc ${PNG_LIBRARY}) ENDIF(WITH_STATIC OR WIN32) -# For DirectInput (di_event_emitter) -IF(WIN32) - INCLUDE_DIRECTORIES(BEFORE ${DXSDK_INCLUDE_DIR}) - TARGET_LINK_LIBRARIES(nelmisc ${DXSDK_DINPUT_LIBRARY} ${DXSDK_GUID_LIBRARY} winmm dbghelp) -ENDIF(WIN32) - IF(UNIX) TARGET_LINK_LIBRARIES(nelmisc -lc -ldl) IF(NOT APPLE) diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.lua b/code/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.lua index 1c8a86342..fd3116aee 100644 --- a/code/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.lua +++ b/code/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.lua @@ -3,8 +3,8 @@ ------------------------------------------------------------------------------------------------------------ -- create the game namespace without reseting if already created in an other file. -if (outgame==nil) then - outgame= {}; +if (outgame == nil) then + outgame = {} end @@ -20,14 +20,14 @@ end -- Fyros function outgame:getFyrosFirstName() - local nbFyrosFirstNames = 0; + local nbFyrosFirstNames = 0 for _ in pairs(fyrosFirstNames) do nbFyrosFirstNames = nbFyrosFirstNames + 1 end return fyrosFirstNames[math.random(nbFyrosFirstNames)] end function outgame:getFyrosLastName() - local nbFyrosLastNames = 0; + local nbFyrosLastNames = 0 for _ in pairs(fyrosLastNames) do nbFyrosLastNames = nbFyrosLastNames + 1 end return fyrosLastNames[math.random(nbFyrosLastNames)] @@ -36,29 +36,29 @@ end -- Matis function outgame:getMatisFirstName(sex) -- 1 = male, 2 = female - local dbNameSex = getDbProp("UI:TEMP:NAME_SEX"); + local dbNameSex = getDbProp("UI:TEMP:NAME_SEX") if sex ~= nil then - dbNameSex = sex; + dbNameSex = sex end local FirstName = "" if tonumber(dbNameSex) == 1 then - local nbMatisMaleFirstNames = 0; + local nbMatisMaleFirstNames = 0 for _ in pairs(matisMaleFirstNames) do nbMatisMaleFirstNames = nbMatisMaleFirstNames + 1 end - FirstName = matisMaleFirstNames[math.random(nbMatisMaleFirstNames)]; + FirstName = matisMaleFirstNames[math.random(nbMatisMaleFirstNames)] else - local nbMatisFemaleFirstNames = 0; + local nbMatisFemaleFirstNames = 0 for _ in pairs(matisFemaleFirstNames) do nbMatisFemaleFirstNames = nbMatisFemaleFirstNames + 1 end - FirstName = matisFemaleFirstNames[math.random(nbMatisFemaleFirstNames)]; + FirstName = matisFemaleFirstNames[math.random(nbMatisFemaleFirstNames)] end - return FirstName; + return FirstName end function outgame:getMatisLastName() - local nbMatisLastNames = 0; + local nbMatisLastNames = 0 for _ in pairs(matisLastNames) do nbMatisLastNames = nbMatisLastNames + 1 end return matisLastNames[math.random(nbMatisLastNames)] @@ -66,14 +66,14 @@ end -- Tryker function outgame:getTrykerFirstName() - local nbTrykerFirstNames = 0; + local nbTrykerFirstNames = 0 for _ in pairs(trykerFirstNames) do nbTrykerFirstNames = nbTrykerFirstNames + 1 end return trykerFirstNames[math.random(nbTrykerFirstNames)] end function outgame:getTrykerLastName() - local nbTrykerLastNames = 0; + local nbTrykerLastNames = 0 for _ in pairs(trykerLastNames) do nbTrykerLastNames = nbTrykerLastNames + 1 end return trykerLastNames[math.random(nbTrykerLastNames)] @@ -81,53 +81,61 @@ end -- Zoraļ function outgame:getZoraiFirstName() - local nbFirstNamesOne = 0; + local nbFirstNamesOne = 0 for _ in pairs(zoraiFirstNamesOne) do nbFirstNamesOne = nbFirstNamesOne + 1 end - local FirstNameOne = zoraiFirstNamesOne[math.random(nbFirstNamesOne)]; + local FirstNameOne = zoraiFirstNamesOne[math.random(nbFirstNamesOne)] - local nbFirstNamesTwo = 0; + local nbFirstNamesTwo = 0 for _ in pairs(zoraiFirstNamesTwo) do nbFirstNamesTwo = nbFirstNamesTwo + 1 end - local FirstNameTwo = zoraiFirstNamesTwo[math.random(nbFirstNamesTwo)]; + local FirstNameTwo = zoraiFirstNamesTwo[math.random(nbFirstNamesTwo)] return FirstNameOne .. "-" .. FirstNameTwo end + function outgame:getZoraiLastName() - local nbLastNames = 0; + local nbLastNames = 0 for _ in pairs(zoraiLastNames) do nbLastNames = nbLastNames + 1 end return zoraiLastNames[math.random(nbLastNames)] end function outgame:procGenerateName() - local uiNameFull = getUI("ui:outgame:appear_name:name_full"); - local uiGenText = getUI("ui:outgame:appear_name:eb"); - local dbNameRace = getDbProp("UI:TEMP:NAME_RACE"); - local dbNameSubRaceFirstName = getDbProp("UI:TEMP:NAME_SUB_RACE_FIRST_NAME"); - local dbNameSubRaceLastName = getDbProp("UI:TEMP:NAME_SUB_RACE_LAST_NAME"); + local uiNameFull = getUI("ui:outgame:appear_name:name_full") + local uiGenText = getUI("ui:outgame:appear_name:eb") + local dbNameRace = getDbProp("UI:TEMP:NAME_RACE") + local dbNameSubRaceFirstName = getDbProp("UI:TEMP:NAME_SUB_RACE_FIRST_NAME") + local dbNameSubRaceLastName = getDbProp("UI:TEMP:NAME_SUB_RACE_LAST_NAME") - local nameResult = ""; - local fullnameResult = ""; + local nameResult = "" + local fullnameResult = "" -- Look at outgame:procUpdateNameRaceLabel() for the "race" list. -- fy ma try zo --> local firstName = "test2" local lastName = "test" + + -- Fyros and Matis are using "first name, last name" order + -- Trykers and Zoraļs are using "last name, first name" order if tonumber(dbNameRace) == 1 then -- Fyros firstName = self:getFyrosFirstName() lastName = self:getFyrosLastName() + fullnameResult = firstName .. " " .. lastName elseif tonumber(dbNameRace) == 2 then -- Matis firstName = self:getMatisFirstName() lastName = self:getMatisLastName() + fullnameResult = firstName .. " " .. lastName elseif tonumber(dbNameRace) == 3 then -- Tryker firstName = self:getTrykerFirstName() lastName = self:getTrykerLastName() + fullnameResult = lastName .. " " .. firstName elseif tonumber(dbNameRace) == 4 then -- Zorai firstName = self:getZoraiFirstName() lastName = self:getZoraiLastName() + fullnameResult = lastName .. " " .. firstName elseif tonumber(dbNameRace) == 5 then -- Maraudeurs @@ -163,97 +171,99 @@ function outgame:procGenerateName() -- Zorai lastName = self:getZoraiLastName() end + + fullnameResult = firstName .. " " .. lastName end - fullnameResult = firstName .. " " .. lastName + -- always use first name for character name nameResult = firstName - uiNameFull.hardtext = fullnameResult; + uiNameFull.hardtext = fullnameResult - nameResult = string.gsub(nameResult, "'", ""); - nameResult = string.gsub(nameResult, " ", ""); - nameResult = string.gsub(nameResult, "-", ""); - nameResult = string.lower( nameResult ); - nameResult = nameResult:gsub("^%l", string.upper); - uiGenText.input_string = nameResult; + nameResult = string.gsub(nameResult, "'", "") + nameResult = string.gsub(nameResult, " ", "") + nameResult = string.gsub(nameResult, "-", "") + nameResult = string.lower(nameResult) + nameResult = nameResult:gsub("^%l", string.upper) + uiGenText.input_string = nameResult end -- Name sex slider update. function outgame:procUpdateNameSexLabel() local nameSexType = { "uiCP_Sex_Male", "uiCP_Sex_Female" } - local uiNameSexText = getUI("ui:outgame:appear_name:name_sex_slider:name_sex"); - local uiNameSex = getDbProp("UI:TEMP:NAME_SEX"); + local uiNameSexText = getUI("ui:outgame:appear_name:name_sex_slider:name_sex") + local uiNameSex = getDbProp("UI:TEMP:NAME_SEX") - tempstr = tostring(i18n.get(nameSexType[tonumber(uiNameSex)])); - tempstr = string.lower(tempstr); - tempstr = (tempstr:gsub("^%l", string.upper)); + tempstr = tostring(i18n.get(nameSexType[tonumber(uiNameSex)])) + tempstr = string.lower(tempstr) + tempstr = (tempstr:gsub("^%l", string.upper)) - uiNameSexText.hardtext = tempstr; + uiNameSexText.hardtext = tempstr end -- Name race slider update. function outgame:procUpdateNameRaceLabel() local nameRaceType = { "Fyros", "Matis", "Tryker", "Zoraļ", "uiCP_Maraudeur" } - local uiNameRaceText = getUI("ui:outgame:appear_name:name_race_slider:name_race"); - local dbNameRace = getDbProp("UI:TEMP:NAME_RACE"); + local uiNameRaceText = getUI("ui:outgame:appear_name:name_race_slider:name_race") + local dbNameRace = getDbProp("UI:TEMP:NAME_RACE") - local uiNameSexSlider = getUI("ui:outgame:appear_name:name_sex_slider"); + local uiNameSexSlider = getUI("ui:outgame:appear_name:name_sex_slider") - local uiNameSubRaceFirstNameSlider = getUI("ui:outgame:appear_name:name_sub_race_first_name_slider"); - local uiNameSubRaceLastNameSlider = getUI("ui:outgame:appear_name:name_sub_race_last_name_slider"); + local uiNameSubRaceFirstNameSlider = getUI("ui:outgame:appear_name:name_sub_race_first_name_slider") + local uiNameSubRaceLastNameSlider = getUI("ui:outgame:appear_name:name_sub_race_last_name_slider") - local uiNameGenerate = getUI("ui:outgame:appear_name:generate"); + local uiNameGenerate = getUI("ui:outgame:appear_name:generate") -- Show/Hide sex slider uiNameGenerate.y = "-50" if tonumber(dbNameRace) == 2 then - uiNameSexSlider.active = true; + uiNameSexSlider.active = true uiNameGenerate.y = "-65" else - uiNameSexSlider.active = false; + uiNameSexSlider.active = false end -- Show/Hide sub race slider if tonumber(dbNameRace) == 5 then - uiNameSubRaceFirstNameSlider.active = true; - uiNameSubRaceLastNameSlider.active = true; + uiNameSubRaceFirstNameSlider.active = true + uiNameSubRaceLastNameSlider.active = true uiNameGenerate.y = "-105" else - uiNameSubRaceFirstNameSlider.active = false; - uiNameSubRaceLastNameSlider.active = false; + uiNameSubRaceFirstNameSlider.active = false + uiNameSubRaceLastNameSlider.active = false end - uiNameRaceText.hardtext = tostring(nameRaceType[tonumber(dbNameRace)]); + uiNameRaceText.hardtext = tostring(nameRaceType[tonumber(dbNameRace)]) end -local matisF = "Matis " .. (string.lower(tostring(i18n.get("uiCP_Sex_Female")) )):gsub("^%l", string.upper); -local matisM = "Matis " .. (string.lower(tostring(i18n.get("uiCP_Sex_Male")) )):gsub("^%l", string.upper); +local matisF = "Matis " .. (string.lower(tostring(i18n.get("uiCP_Sex_Female")) )):gsub("^%l", string.upper) +local matisM = "Matis " .. (string.lower(tostring(i18n.get("uiCP_Sex_Male")) )):gsub("^%l", string.upper) function outgame:procUpdateNameSubRaceFirstNameLabel() local nameSubRaceFirstNameType = { "Fyros", matisM, matisF, "Tryker", "Zoraļ" } - local uiNameSubRaceFirstNameText = getUI("ui:outgame:appear_name:name_sub_race_first_name_slider:name_race"); - local dbNameSubRaceFirstName = getDbProp("UI:TEMP:NAME_SUB_RACE_FIRST_NAME"); + local uiNameSubRaceFirstNameText = getUI("ui:outgame:appear_name:name_sub_race_first_name_slider:name_race") + local dbNameSubRaceFirstName = getDbProp("UI:TEMP:NAME_SUB_RACE_FIRST_NAME") - uiNameSubRaceFirstNameText.hardtext= tostring(nameSubRaceFirstNameType[tonumber(dbNameSubRaceFirstName)]); + uiNameSubRaceFirstNameText.hardtext= tostring(nameSubRaceFirstNameType[tonumber(dbNameSubRaceFirstName)]) end function outgame:procUpdateNameSubRaceLastNameLabel() local nameSubRaceLastNameType = { "Fyros", "Matis", "Tryker", "Zoraļ" } - local uiNameSubRaceLastNameText = getUI("ui:outgame:appear_name:name_sub_race_last_name_slider:name_race"); - local dbNameSubRaceLastName = getDbProp("UI:TEMP:NAME_SUB_RACE_LAST_NAME"); + local uiNameSubRaceLastNameText = getUI("ui:outgame:appear_name:name_sub_race_last_name_slider:name_race") + local dbNameSubRaceLastName = getDbProp("UI:TEMP:NAME_SUB_RACE_LAST_NAME") - uiNameSubRaceLastNameText.hardtext= tostring(nameSubRaceLastNameType[tonumber(dbNameSubRaceLastName)]); + uiNameSubRaceLastNameText.hardtext= tostring(nameSubRaceLastNameType[tonumber(dbNameSubRaceLastName)]) end ------------------------------------------------------------------------------------------------------------ -- called to construct icons function outgame:activePackElement(id, icon) - local uiDesc = getUI("ui:outgame:appear:job_options:options:desc"); - uiDesc['ico' .. tostring(id)].active= true; - uiDesc['ico' .. tostring(id)].texture= icon; - uiDesc['ico' .. tostring(id) .. 'txt'].active= true; + local uiDesc = getUI("ui:outgame:appear:job_options:options:desc") + uiDesc['ico' .. tostring(id)].active = true + uiDesc['ico' .. tostring(id)].texture = icon + uiDesc['ico' .. tostring(id) .. 'txt'].active = true end @@ -261,13 +271,13 @@ end -- called to construct pack text function outgame:setPackJobText(id, spec) -- Set Pack content - local uiPackText = getUI("ui:outgame:appear:job_options:options:desc:pack_" .. id); - uiPackText.hardtext= "uiCP_Job_" .. id .. tostring(spec); + local uiPackText = getUI("ui:outgame:appear:job_options:options:desc:pack_" .. id) + uiPackText.hardtext= "uiCP_Job_" .. id .. tostring(spec) -- Set specialization text - local uiResText = getUI("ui:outgame:appear:job_options:options:result:res"); + local uiResText = getUI("ui:outgame:appear:job_options:options:result:res") if(spec==2) then - uiResText.hardtext= "uiCP_Res_" .. id; + uiResText.hardtext= "uiCP_Res_" .. id end end @@ -275,63 +285,63 @@ end -- called to construct pack function outgame:buildActionPack() - local uiDesc = getUI("ui:outgame:appear:job_options:options:desc"); + local uiDesc = getUI("ui:outgame:appear:job_options:options:desc") if (uiDesc==nil) then - return; + return end -- Reset All for i = 1,20 do - uiDesc['ico' .. tostring(i)].active= false; - uiDesc['ico' .. tostring(i) .. 'txt'].active= false; + uiDesc['ico' .. tostring(i)].active = false + uiDesc['ico' .. tostring(i) .. 'txt'].active = false end -- Build Default Combat - self:activePackElement(1, 'f1.tga'); -- Dagger - self:activePackElement(2, 'f2.tga'); -- Accurate Attack + self:activePackElement(1, 'f1.tga') -- Dagger + self:activePackElement(2, 'f2.tga') -- Accurate Attack -- Build Default Magic - self:activePackElement(6, 'm2.tga'); -- Gloves - self:activePackElement(7, 'm1.tga'); -- Acid + self:activePackElement(6, 'm2.tga') -- Gloves + self:activePackElement(7, 'm1.tga') -- Acid -- Build Default Forage - self:activePackElement(11, 'g1.tga'); -- Forage Tool - self:activePackElement(12, 'g2.tga'); -- Basic Extract + self:activePackElement(11, 'g1.tga') -- Forage Tool + self:activePackElement(12, 'g2.tga') -- Basic Extract -- Build Default Craft - self:activePackElement(16, 'c2.tga'); -- Craft Tool - self:activePackElement(17, 'c1.tga'); -- 50 raw mat - self:activePackElement(18, 'c3.tga'); -- Craft Root - self:activePackElement(19, 'c4.tga'); -- Boots Plan + self:activePackElement(16, 'c2.tga') -- Craft Tool + self:activePackElement(17, 'c1.tga') -- 50 raw mat + self:activePackElement(18, 'c3.tga') -- Craft Root + self:activePackElement(19, 'c4.tga') -- Boots Plan -- Build Option if (getDbProp('UI:TEMP:JOB_FIGHT') == 2) then - self:activePackElement(3, 'f3.tga'); -- Increase damage + self:activePackElement(3, 'f3.tga') -- Increase damage elseif (getDbProp('UI:TEMP:JOB_MAGIC') == 2) then - self:activePackElement(8, 'm5.tga'); -- Fear + self:activePackElement(8, 'm5.tga') -- Fear elseif (getDbProp('UI:TEMP:JOB_FORAGE') == 2) then - self:activePackElement(13, 'g3.tga'); -- Basic Prospection + self:activePackElement(13, 'g3.tga') -- Basic Prospection elseif (getDbProp('UI:TEMP:JOB_CRAFT') == 2) then - self:activePackElement(20, 'c6.tga'); -- Gloves Plan - self:activePackElement(17, 'c5.tga'); -- Replace 17, with 100x RawMat + self:activePackElement(20, 'c6.tga') -- Gloves Plan + self:activePackElement(17, 'c5.tga') -- Replace 17, with 100x RawMat end -- Reset Text - self:setPackJobText('F', 1); - self:setPackJobText('M', 1); - self:setPackJobText('G', 1); - self:setPackJobText('C', 1); + self:setPackJobText('F', 1) + self:setPackJobText('M', 1) + self:setPackJobText('G', 1) + self:setPackJobText('C', 1) -- Set correct text for specalized version if (getDbProp('UI:TEMP:JOB_FIGHT') == 2) then - self:setPackJobText('F', 2); + self:setPackJobText('F', 2) elseif (getDbProp('UI:TEMP:JOB_MAGIC') == 2) then - self:setPackJobText('M', 2); + self:setPackJobText('M', 2) elseif (getDbProp('UI:TEMP:JOB_FORAGE') == 2) then - self:setPackJobText('G', 2); + self:setPackJobText('G', 2) elseif (getDbProp('UI:TEMP:JOB_CRAFT') == 2) then - self:setPackJobText('C', 2); + self:setPackJobText('C', 2) end end diff --git a/code/ryzom/tools/client/client_config_qt/general_settings_widget.ui b/code/ryzom/tools/client/client_config_qt/general_settings_widget.ui index 722a195d9..20e7a394b 100644 --- a/code/ryzom/tools/client/client_config_qt/general_settings_widget.ui +++ b/code/ryzom/tools/client/client_config_qt/general_settings_widget.ui @@ -43,11 +43,6 @@ German - - - Hungarian - - diff --git a/code/ryzom/tools/client/client_config_qt/translations/ryzom_configuration_es.ts b/code/ryzom/tools/client/client_config_qt/translations/ryzom_configuration_es.ts index b7498d3bc..97dba7b82 100644 --- a/code/ryzom/tools/client/client_config_qt/translations/ryzom_configuration_es.ts +++ b/code/ryzom/tools/client/client_config_qt/translations/ryzom_configuration_es.ts @@ -241,7 +241,7 @@ Specify if Ryzom is to be run in OpenGL or Direct3D: - + Especificar si Ryzom debe ser ejecutado con OpenGL o Direct3D: @@ -276,7 +276,7 @@ Specify a video mode: - + Especificar un modo de video: Specify a video mode @@ -353,7 +353,7 @@ Slow down the game (process low priority) - + Realentizar el juego (prioridad de procesamiento bajo) Slow down the game ( process low priority ) @@ -385,7 +385,7 @@ Software sound buffer (may increase FPS) - + Buffer de sonido software (puede aumentar los FPS) Software sound buffer ( may increase FPS ) diff --git a/code/web/public_php/ams/inc/login.php b/code/web/public_php/ams/inc/login.php index 753873f38..d813bfd00 100644 --- a/code/web/public_php/ams/inc/login.php +++ b/code/web/public_php/ams/inc/login.php @@ -1,6 +1,6 @@