Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: features OTCR natively in canary #3061

Draft
wants to merge 45 commits into
base: main
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
4c54d85
1/6 feature: Creature : AttachedEffect, Shader
kokekanon Nov 4, 2024
745b7b8
2/7 feature: Map Shader
kokekanon Nov 4, 2024
ee26730
3/7 feature: TypingIcon
kokekanon Nov 5, 2024
23e166a
review: mehah
kokekanon Nov 5, 2024
eae4112
4/7 feature: Item Shader
kokekanon Nov 5, 2024
74ea55f
5/7 send disableFeature / enableFeature
kokekanon Nov 5, 2024
b09547e
review: dudantas
kokekanon Nov 5, 2024
9484492
fix sonarcloud bot
kokekanon Nov 5, 2024
f490ce4
fix sonarcloud bot 2
kokekanon Nov 5, 2024
1437b7e
fix: wrong review
dudantas Nov 5, 2024
67777a9
Code format - (Clang-format)
github-actions[bot] Nov 5, 2024
6766389
fix: itemShader old protocol otcr
kokekanon Nov 5, 2024
7c45b97
clean variable
kokekanon Nov 6, 2024
bd1854c
fix return get shader
kokekanon Nov 6, 2024
0ff915e
missing content player:getAttachedEffects
kokekanon Nov 6, 2024
f538950
simple test Talkations. delete when finished
kokekanon Nov 6, 2024
0217e80
Lua code format - (Stylua)
github-actions[bot] Nov 6, 2024
4b5fbad
Merge remote-tracking branch 'upstream/main' into kokekanon/all-featu…
kokekanon Nov 6, 2024
9fe26c5
format
kokekanon Nov 6, 2024
7956f08
Merge remote-tracking branch 'upstream/main' into kokekanon/all-featu…
kokekanon Nov 6, 2024
8d6961d
improve: variable name
kokekanon Nov 6, 2024
558b212
Merge branch 'kokekanon/all-feature-redemption' of https://github.com…
kokekanon Nov 6, 2024
3744f16
game_outfit functional version, not cleaned or optimized
kokekanon Nov 6, 2024
789354a
this requires review canary team .no break v8 and cipsoft
kokekanon Nov 7, 2024
6a23e40
Lua code format - (Stylua)
github-actions[bot] Nov 7, 2024
36da43e
fix: review sonarcloud ?
kokekanon Nov 7, 2024
8e939e5
Code format - (Clang-format)
github-actions[bot] Nov 7, 2024
c551152
Merge remote-tracking branch 'upstream/main' into kokekanon/all-featu…
kokekanon Nov 7, 2024
5b5dc84
Merge branch 'kokekanon/all-feature-redemption' of https://github.com…
kokekanon Nov 7, 2024
9e763f7
simple test
kokekanon Nov 7, 2024
300f92c
Lua code format - (Stylua)
github-actions[bot] Nov 7, 2024
3bb868b
Merge remote-tracking branch 'upstream/main' into kokekanon/all-featu…
kokekanon Nov 8, 2024
ef754d0
Merge branch 'kokekanon/all-feature-redemption' of https://github.com…
kokekanon Nov 8, 2024
6b27bb9
Merge remote-tracking branch 'upstream/main' into kokekanon/all-featu…
kokekanon Nov 10, 2024
6097de3
Merge remote-tracking branch 'upstream/main' into kokekanon/all-featu…
kokekanon Nov 10, 2024
ec0bd43
murge
kokekanon Nov 10, 2024
e30fd35
fix: compilation windows
kokekanon Nov 10, 2024
29919ed
Code format - (Clang-format)
github-actions[bot] Nov 10, 2024
6ed239c
Merge remote-tracking branch 'upstream/main' into kokekanon/all-featu…
kokekanon Nov 13, 2024
2c46d0a
Merge remote-tracking branch 'upstream/main' into kokekanon/all-featu…
kokekanon Nov 16, 2024
687d0b2
Merge remote-tracking branch 'upstream/main' into kokekanon/all-featu…
kokekanon Nov 18, 2024
dce1886
Merge remote-tracking branch 'upstream/main' into kokekanon/all-featu…
kokekanon Nov 25, 2024
f44bf10
Merge remote-tracking branch 'upstream/main' into kokekanon/all-featu…
kokekanon Nov 29, 2024
8350458
Merge remote-tracking branch 'upstream/main' into kokekanon/all-featu…
kokekanon Dec 12, 2024
4d85029
Merge remote-tracking branch 'upstream/main' into kokekanon/all-featu…
kokekanon Dec 27, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Lua code format - (Stylua)
  • Loading branch information
github-actions[bot] committed Nov 7, 2024
commit 6a23e40adc0301943b07553ec5ac5e1c6df6e73c
16 changes: 5 additions & 11 deletions data/scripts/talkactions/gm/delete_test_otcr.lua
Original file line number Diff line number Diff line change
@@ -83,10 +83,9 @@ local options = {
for _, effect in ipairs(effects) do
table.insert(ids, effect.id)
end
player:sendTextMessage(MESSAGE_GAMEMASTER_CONSOLE, "aura registered on the server: ".. table.concat(ids, ", "))
player:sendTextMessage(MESSAGE_GAMEMASTER_CONSOLE, "aura registered on the server: " .. table.concat(ids, ", "))
else
player:sendTextMessage(MESSAGE_GAMEMASTER_CONSOLE, "the server did not charge aura check .xml")

end
end,
},
@@ -99,7 +98,7 @@ local options = {
for _, effect in ipairs(effects) do
table.insert(ids, effect.id)
end
player:sendTextMessage(MESSAGE_GAMEMASTER_CONSOLE, "wing registered on the server: "..table.concat(ids, ", "))
player:sendTextMessage(MESSAGE_GAMEMASTER_CONSOLE, "wing registered on the server: " .. table.concat(ids, ", "))
else
player:sendTextMessage(MESSAGE_GAMEMASTER_CONSOLE, "the server did not charge wing check .xml")
end
@@ -108,35 +107,31 @@ local options = {
{
name = "pdump effect",
action = function(player)

local effects = Game.getAllAttachedeffects("effect")
if #effects > 0 then
local ids = {}
for _, effect in ipairs(effects) do
table.insert(ids, effect.id)
end
player:sendTextMessage(MESSAGE_GAMEMASTER_CONSOLE, "effect registered on the server: "..table.concat(ids, ", "))
player:sendTextMessage(MESSAGE_GAMEMASTER_CONSOLE, "effect registered on the server: " .. table.concat(ids, ", "))
else
player:sendTextMessage(MESSAGE_GAMEMASTER_CONSOLE, "the server did not charge effect check .xml")
end

end,
},
{
name = "pdump shader",
action = function(player)

local effects = Game.getAllAttachedeffects("shader")
if #effects > 0 then
local ids = {}
for _, effect in ipairs(effects) do
table.insert(ids, effect.name)
end
player:sendTextMessage(MESSAGE_GAMEMASTER_CONSOLE, "shader registered on the server: "..table.concat(ids, ", "))
player:sendTextMessage(MESSAGE_GAMEMASTER_CONSOLE, "shader registered on the server: " .. table.concat(ids, ", "))
else
player:sendTextMessage(MESSAGE_GAMEMASTER_CONSOLE, "the server did not charge shader check .xml")
end

end,
},
},
@@ -183,7 +178,6 @@ talkAction:groupType("gamemaster")
talkAction:separator(" ")
talkAction:register()


local playerLoginTestOTCR = CreatureEvent("simpletest")

function playerLoginTestOTCR.onLogin(player)
@@ -193,7 +187,7 @@ function playerLoginTestOTCR.onLogin(player)
if player:getClient().os >= 10 and player:getClient().os < 20 then
player:say("say !testOTCR", TALKTYPE_SAY)
end
return true
return true
end

playerLoginTestOTCR:register()