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

merge to main #2452

Merged
merged 81 commits into from
Dec 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
f74ec8f
Add confirmation step to destroy building
bob0005 Dec 11, 2024
abcce38
raise limits and remove chat (#2435)
edisontim Dec 11, 2024
32dd7ab
loading page loading itmes (#2436)
edisontim Dec 11, 2024
541ee6d
loaf-opti
ponderingdemocritus Dec 11, 2024
71d8df7
buildings
ponderingdemocritus Dec 12, 2024
0734b99
load
ponderingdemocritus Dec 12, 2024
c206709
push config
edisontim Dec 12, 2024
2166840
loading
ponderingdemocritus Dec 12, 2024
557945f
Merge branch 'loaf-opti' of https://github.com/BibliothecaDAO/eternum…
ponderingdemocritus Dec 12, 2024
c070d43
fix for 0 donkey bridge, base manifest on chain env
RedBeardEth Dec 12, 2024
d4b03f2
tiles
ponderingdemocritus Dec 12, 2024
6048689
merge
ponderingdemocritus Dec 12, 2024
5989d8e
do sync
edisontim Dec 12, 2024
90afac3
bank
ponderingdemocritus Dec 12, 2024
d69e713
merge
ponderingdemocritus Dec 12, 2024
9c20e36
market
ponderingdemocritus Dec 12, 2024
cb4ca20
merge
ponderingdemocritus Dec 12, 2024
32ee747
Merge pull request #2438 from BibliothecaDAO/loaf-opti
ponderingdemocritus Dec 12, 2024
1dbee97
bump
ponderingdemocritus Dec 12, 2024
cd6d228
queries
edisontim Dec 12, 2024
caeb821
reintroduce syncing and fetching
edisontim Dec 12, 2024
2e1c530
sync and get happening again
edisontim Dec 12, 2024
66a454e
working multi bridge out step 2, fix transaction success states
RedBeardEth Dec 12, 2024
009a771
tiles
edisontim Dec 12, 2024
a4e62aa
remove logging
edisontim Dec 12, 2024
c3b4971
memo
ponderingdemocritus Dec 12, 2024
ed8bb5e
merge
ponderingdemocritus Dec 12, 2024
fb4d8ab
world
ponderingdemocritus Dec 12, 2024
b4ac40d
set loading state
edisontim Dec 12, 2024
83d691d
chunk
ponderingdemocritus Dec 12, 2024
88d5523
Merge branch 'loaf-opti' of https://github.com/BibliothecaDAO/eternum…
ponderingdemocritus Dec 12, 2024
d3ba5e6
coords
ponderingdemocritus Dec 12, 2024
ddf663a
as
ponderingdemocritus Dec 12, 2024
e954997
bunk
ponderingdemocritus Dec 12, 2024
8286ec7
bridge styling
RedBeardEth Dec 12, 2024
6f9ed78
update
ponderingdemocritus Dec 12, 2024
2eb2ced
update dojo version
RedBeardEth Dec 12, 2024
a0a06cc
update dojo sync
RedBeardEth Dec 12, 2024
b0acc05
Fix hyperstructures
edisontim Dec 12, 2024
0319480
fix
ponderingdemocritus Dec 12, 2024
f868726
Merge branch 'loaf-opti' of https://github.com/BibliothecaDAO/eternum…
ponderingdemocritus Dec 12, 2024
78e0cfc
Merge pull request #2439 from BibliothecaDAO/loaf-opti
ponderingdemocritus Dec 12, 2024
61ca8cf
add back chat
aymericdelab Dec 12, 2024
b05c440
a
ponderingdemocritus Dec 12, 2024
8553c27
Merge pull request #2441 from BibliothecaDAO/raschel-dev
ponderingdemocritus Dec 12, 2024
441f27d
Merge pull request #2433 from BibliothecaDAO/fix/#2232
ponderingdemocritus Dec 12, 2024
0fc5a97
llint
ponderingdemocritus Dec 12, 2024
19fa295
✨ Add sub to all player structures
bal7hazar Dec 12, 2024
0ca8635
Merge remote-tracking branch 'origin/next' into bridge
RedBeardEth Dec 12, 2024
974d587
fix(social): get name from address directly
Larkooo Dec 12, 2024
99d2042
chore: add has not settled realm yet
Larkooo Dec 12, 2024
f23882e
undefined if no realm found
Larkooo Dec 12, 2024
b8df024
pretty
Larkooo Dec 12, 2024
e500824
Merge pull request #2444 from BibliothecaDAO/fix-social
Larkooo Dec 12, 2024
395b4a4
fix: trade history crash
r0man1337 Dec 12, 2024
fab0065
🐛 Fix
bal7hazar Dec 12, 2024
8e4f68a
config
ponderingdemocritus Dec 12, 2024
f4d6093
Merge branch 'next' of https://github.com/BibliothecaDAO/eternum into…
ponderingdemocritus Dec 12, 2024
00c5e76
Merge pull request #2442 from BibliothecaDAO/fix/structure-sub
ponderingdemocritus Dec 12, 2024
2eae96c
Merge pull request #2445 from BibliothecaDAO/fix/trade-history
ponderingdemocritus Dec 12, 2024
ddd42a2
Merge remote-tracking branch 'origin/next' into bridge
RedBeardEth Dec 12, 2024
f0a0e2a
add realm select border animation
RedBeardEth Dec 12, 2024
e7c3dee
Merge pull request #2440 from BibliothecaDAO/bridge
RedBeardEth Dec 12, 2024
2bb3892
hovered frag mine
ponderingdemocritus Dec 12, 2024
9fc09d6
hs cost (#2443)
aymericdelab Dec 12, 2024
1cc2263
load
ponderingdemocritus Dec 12, 2024
e795852
congif
ponderingdemocritus Dec 12, 2024
7990511
Fix/army stamina (#2448)
bob0005 Dec 12, 2024
337f111
Remove quest UI while syncing (#2449)
bob0005 Dec 12, 2024
2561533
Raschel-dev (#2447)
aymericdelab Dec 12, 2024
2e40452
trigger
bal7hazar Dec 12, 2024
fb47065
remove events
aymericdelab Dec 12, 2024
d2b406b
fix tile
aymericdelab Dec 12, 2024
395036d
fixes
aymericdelab Dec 12, 2024
6340a70
Merge branch 'next' of https://github.com/BibliothecaDAO/eternum into…
aymericdelab Dec 12, 2024
b25f153
remove loading
aymericdelab Dec 12, 2024
d259545
fix: transfer view styling bug (#2451)
r0man1337 Dec 12, 2024
232bdc3
Fix social tribe crash (#2450)
bob0005 Dec 12, 2024
2917167
fix build
aymericdelab Dec 12, 2024
1baceda
fix market
edisontim Dec 12, 2024
b8d1260
merge main into next
aymericdelab Dec 12, 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
4 changes: 2 additions & 2 deletions client/.env.production
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
VITE_PUBLIC_MASTER_ADDRESS=
VITE_PUBLIC_MASTER_PRIVATE_KEY=
VITE_PUBLIC_MASTER_ADDRESS=0x5013b17c43a2b664ec2a38aa45f6d891db1188622ec7cf320411321c3248fb5
VITE_PUBLIC_MASTER_PRIVATE_KEY=0x5013b17c43a2b664ec2a38aa45f6d891db1188622ec7cf320411321c3248fb5
VITE_PUBLIC_WORLD_ADDRESS="0x5013b17c43a2b664ec2a38aa45f6d891db1188622ec7cf320411321c3248fb5"
VITE_PUBLIC_ACCOUNT_CLASS_HASH="0x07dc7899aa655b0aae51eadff6d801a58e97dd99cf4666ee59e704249e51adf2"
VITE_PUBLIC_FEE_TOKEN_ADDRESS=0x49d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7
Expand Down
15 changes: 8 additions & 7 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,14 @@
"@bibliothecadao/eternum": "workspace:^",
"@cartridge/connector": "0.5.5",
"@cartridge/controller": "0.5.5",
"@dojoengine/core": "1.0.1",
"@dojoengine/create-burner": "1.0.1",
"@dojoengine/react": "1.0.1",
"@dojoengine/core": "1.0.3-alpha.1",
"@dojoengine/torii-wasm": "1.0.3-alpha.1",
"@dojoengine/create-burner": "1.0.3-alpha.1",
"@dojoengine/react": "1.0.3-alpha.1",
"@dojoengine/recs": "^2.0.13",
"@dojoengine/state": "1.0.1",
"@dojoengine/torii-client": "1.0.1",
"@dojoengine/utils": "1.0.1",
"@dojoengine/state": "1.0.3-alpha.1",
"@dojoengine/torii-client": "1.0.3-alpha.1",
"@dojoengine/utils": "1.0.3-alpha.1",
"@headlessui/react": "^1.7.18",
"@latticexyz/utils": "^2.0.0-next.12",
"@radix-ui/react-collapsible": "^1.1.1",
Expand Down Expand Up @@ -104,4 +105,4 @@
"vitest": "^2.0.5",
"workbox-window": "^7.3.0"
}
}
}
118 changes: 19 additions & 99 deletions client/src/dojo/contractComponents.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1902,26 +1902,6 @@ const eventsComponents = (world: World) => {
);
})(),

CancelOrder: (() => {
return defineComponent(
world,
{
taker_id: RecsType.Number,
maker_id: RecsType.Number,
trade_id: RecsType.Number,
timestamp: RecsType.BigInt,
},
{
metadata: {
namespace: "s0_eternum",
name: "CancelOrder",
types: ["u32", "u32", "u32", "u64"],
customTypes: [],
},
},
);
})(),

CreateGuild: (() => {
return defineComponent(
world,
Expand All @@ -1941,26 +1921,6 @@ const eventsComponents = (world: World) => {
);
})(),

CreateOrder: (() => {
return defineComponent(
world,
{
taker_id: RecsType.Number,
maker_id: RecsType.Number,
trade_id: RecsType.Number,
timestamp: RecsType.BigInt,
},
{
metadata: {
namespace: "s0_eternum",
name: "CreateOrder",
types: ["u32", "u32", "u32", "u64"],
customTypes: [],
},
},
);
})(),

GameEnded: (() => {
return defineComponent(
world,
Expand All @@ -1979,26 +1939,6 @@ const eventsComponents = (world: World) => {
);
})(),

FragmentMineDiscovered: (() => {
return defineComponent(
world,
{
entity_owner_id: RecsType.Number,
mine_entity_id: RecsType.Number,
production_deadline_tick: RecsType.BigInt,
discovered_at: RecsType.BigInt,
},
{
metadata: {
namespace: "s0_eternum",
name: "FragmentMineDiscovered",
types: ["u32", "u32", "u64", "u64"],
customTypes: [],
},
},
);
})(),

HyperstructureContribution: (() => {
return defineComponent(
world,
Expand All @@ -2020,45 +1960,6 @@ const eventsComponents = (world: World) => {
);
})(),

HyperstructureCoOwnersChange: (() => {
return defineComponent(
world,
{
id: RecsType.Number,
hyperstructure_entity_id: RecsType.Number,
co_owners: RecsType.StringArray,
timestamp: RecsType.Number,
},
{
metadata: {
namespace: "s0_eternum",
name: "HyperstructureCoOwnersChange",
types: ["u32", "u32", "array", "u64"],
customTypes: [],
},
},
);
})(),

HyperstructureStarted: (() => {
return defineComponent(
world,
{
id: RecsType.Number,
hyperstructure_entity_id: RecsType.Number,
creator_address_name: RecsType.BigInt,
timestamp: RecsType.Number,
},
{
metadata: {
namespace: "s0_eternum",
name: "HyperstructureStarted",
types: ["u32", "u32", "felt252", "u64"],
customTypes: [],
},
},
);
})(),
HyperstructureFinished: (() => {
return defineComponent(
world,
Expand Down Expand Up @@ -2287,6 +2188,25 @@ const eventsComponents = (world: World) => {
},
);
})(),
HyperstructureCoOwnersChange: (() => {
return defineComponent(
world,
{
id: RecsType.Number,
hyperstructure_entity_id: RecsType.Number,
co_owners: RecsType.StringArray,
timestamp: RecsType.Number,
},
{
metadata: {
namespace: "s0_eternum",
name: "HyperstructureCoOwnersChange",
types: ["u32", "u32", "array", "u64"],
customTypes: [],
},
},
);
})(),
},
};
};
Loading
Loading