Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 5 additions & 6 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ sys-locale = "0.2.1"
thiserror = "1.0.31"
unic-langid = "0.9.0"
turborand = { version = "0.8.0", features = ["atomic", "serialize"] }
mimalloc = "0.1.32"
mimalloc = { version = "0.1.32", default-features = false }

[dependencies.bevy]
version = "0.8"
Expand All @@ -95,3 +95,6 @@ debug = true
[profile.release]
lto = true
codegen-units = 1 # Improved rapier physics perf, so it might help other stuff, too

[patch.crates-io]
bevy_hierarchy = { git = "https://github.com/zicklag/bevy.git", branch = "dont-error-on-non-mapped-children-entities" }
2 changes: 1 addition & 1 deletion assets/default.game.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ camera_height: 448
clear_color: 27233B
physics:
terminal_velocity: 30
friction_lerp: 0.96
friction_lerp: 0.85
stop_threshold: 1.0

players:
Expand Down
4 changes: 4 additions & 0 deletions assets/map/elements/item/grenade/explosion.atlas.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
image: ./explosion.png
tile_size: [144, 112]
rows: 1
columns: 11
Binary file added assets/map/elements/item/grenade/explosion.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions assets/map/elements/item/grenade/grenade.atlas.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
image: ./grenade.png
tile_size: [25, 52]
rows: 2
columns: 3
17 changes: 17 additions & 0 deletions assets/map/elements/item/grenade/grenade.element.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Grenades
category: Weapons
builtin: !Grenades
atlas: ./grenade.atlas.yaml
explosion_atlas: ./explosion.atlas.yaml
fuse_time: 1.0
throw_velocity: [7, 5]
damage_region_size: [60, 60]
damage_region_lifetime: 0.6
explosion_lifetime: 1.0
explosion_frames: 12
explosion_fps: 8

body_size: [18, 18]
grab_offset: [-7, -6]
body_offset: [0, 2]
can_rotate: false
Binary file added assets/map/elements/item/grenade/grenade.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 0 additions & 4 deletions assets/map/elements/item/grenades/grenades.element.yaml

This file was deleted.

1 change: 0 additions & 1 deletion assets/map/elements/item/grenades/sproinger.ts

This file was deleted.

Loading