Joshua Barretto
|
e6e4f8f77a
|
Merge branch 'zesterer/shaders' into 'master'
Fixed bloom sample UV, added Cinematic shader
See merge request veloren/veloren!4002
|
2023-06-29 18:12:39 +00:00 |
|
Joshua Barretto
|
ffabace13d
|
Fixed bloom sample UV, added Cinematic shader
|
2023-06-28 12:21:16 +01:00 |
|
Marcel
|
99d2dc3817
|
Merge branch 'login_bg' into 'master'
New login BG
See merge request veloren/veloren!4001
|
2023-06-27 19:51:23 +00:00 |
|
Monty Marz
|
5c3ab74bdf
|
login background
|
2023-06-27 21:37:19 +02:00 |
|
Marcel
|
c0e227272f
|
Merge branch 'xMAC94x/cidb2' into 'master'
move translations over too
See merge request veloren/veloren!3999
|
2023-06-27 06:11:04 +00:00 |
|
Sam
|
c4b316af19
|
Durability tweaks
|
2023-06-26 20:49:03 -04:00 |
|
Marcel Märtens
|
9009491f5c
|
move translations over too
|
2023-06-27 00:13:01 +02:00 |
|
Avi Weinstock
|
ced6880168
|
Added additional confirmation when trading for nothing.
|
2023-06-26 10:39:30 -04:00 |
|
Joshua Barretto
|
2a4187e769
|
Merge branch 'zesterer/anticheat' into 'master'
Improved Anticheat
See merge request veloren/veloren!3993
|
2023-06-23 12:10:34 +00:00 |
|
Joshua Barretto
|
9c1a06d1b2
|
Upped maximum vertical speed
|
2023-06-22 19:34:18 +01:00 |
|
Joshua Barretto
|
98493fd511
|
Better rejection logs
|
2023-06-22 13:14:07 +01:00 |
|
Joshua Barretto
|
dda28d5621
|
Overhauled and improved anticheat
|
2023-06-22 12:25:08 +01:00 |
|
Joshua Barretto
|
8480cb4a7a
|
Apply client physics once per server tick
|
2023-06-22 10:43:02 +01:00 |
|
Samuel Keiffer
|
57539803d2
|
Merge branch 'small_tweaks' into 'master'
Small balance changes
See merge request veloren/veloren!3989
|
2023-06-19 01:16:43 +00:00 |
|
Youssef Fahmy
|
65ea69bef3
|
Small balance changes
|
2023-06-19 01:16:42 +00:00 |
|
Samuel Keiffer
|
079e7bfed6
|
Merge branch 'uniior/cacti' into 'master'
New/revamped cacti sprites
See merge request veloren/veloren!3986
|
2023-06-18 01:22:33 +00:00 |
|
unknown
|
413befadae
|
Lowercase asset files
|
2023-06-17 20:35:28 -04:00 |
|
unknown
|
1269cfe00d
|
Lowercase asset files
|
2023-06-17 20:20:05 -04:00 |
|
Marcel
|
05adddb3f9
|
Merge branch 'xMAC94x/swap_cidb' into 'master'
xmac94x/swap cidb
See merge request veloren/veloren!3990
|
2023-06-16 16:25:36 +00:00 |
|
Marcel Märtens
|
6d4338943d
|
swap out cidb server and give it an own dns entry
|
2023-06-16 15:22:07 +02:00 |
|
Monty Marz
|
138e7bf0a2
|
Merge branch 'mkatsenelson/focused_chat_border' into 'master'
add focus chat borders with avarage opacity of chat and input text color
See merge request veloren/veloren!3984
|
2023-06-16 08:29:39 +00:00 |
|
mkatsenelson
|
7d39d3e30e
|
changing margin from 3px to 2px size
|
2023-06-15 09:31:36 +03:00 |
|
unknown
|
6684685679
|
Attempt to fix BarrelCactus
|
2023-06-14 13:49:40 -04:00 |
|
unknown
|
8978bc9dc4
|
Test
|
2023-06-14 13:14:33 -04:00 |
|
Marcel
|
fdad31b16b
|
Merge branch 'update-nix-lockfile' into 'master'
Update nix flake dependencies
See merge request veloren/veloren!3982
|
2023-06-14 16:07:24 +00:00 |
|
mkatsenelson
|
db5fe2210c
|
add focus chat borders with avarage opacity of chat and input text color
|
2023-06-13 11:58:48 +03:00 |
|
Archit Gupta
|
8bb5f33558
|
flake.lock: Update
Flake lock file updates:
• Updated input 'nci':
'github:yusdacra/nix-cargo-integration/30787e470b77f6d76a9d4e5878ab3dbfc28c6984' (2023-02-25)
→ 'github:yusdacra/nix-cargo-integration/acb9cf3a5e31b791d675515eac4d73df13555061' (2023-06-12)
• Updated input 'nci/dream2nix':
'github:nix-community/dream2nix/28b973a8d4c30cc1cbb3377ea2023a76bc3fb889' (2023-02-25)
→ 'github:nix-community/dream2nix/0c064fa9dd025069cc215b0a8b4eb5ea734aceb0' (2023-06-06)
• Removed input 'nci/dream2nix/alejandra'
• Updated input 'nci/dream2nix/crane':
'github:ipetkov/crane/59b31b41a589c0a65e4a1f86b0e5eac68081468b' (2022-12-13)
→ 'github:ipetkov/crane/445a3d222947632b5593112bb817850e8a9cf737' (2023-04-11)
• Added input 'nci/dream2nix/drv-parts':
'github:davhau/drv-parts/e8c2ec1157dc1edb002989669a0dbd935f430201' (2023-04-05)
• Added input 'nci/dream2nix/drv-parts/flake-compat':
follows 'nci/dream2nix/flake-compat'
• Added input 'nci/dream2nix/drv-parts/flake-parts':
follows 'nci/dream2nix/flake-parts'
• Added input 'nci/dream2nix/drv-parts/nixpkgs':
follows 'nci/dream2nix/nixpkgs'
• Added input 'nci/dream2nix/flake-compat':
'github:edolstra/flake-compat/35bb57c0c8d8b62bbfd284272c928ceb64ddbde9' (2023-01-17)
• Added input 'nci/dream2nix/nixpkgsV1':
'github:NixOS/nixpkgs/5eb98948b66de29f899c7fe27ae112a47964baf8' (2023-03-11)
• Updated input 'nci/mk-naked-shell':
'github:yusdacra/mk-naked-shell/aeca9f8aa592f5e8f71f407d081cb26fd30c5a57' (2023-02-16)
→ 'github:yusdacra/mk-naked-shell/7612f828dd6f22b7fb332cc69440e839d7ffe6bd' (2023-04-12)
• Updated input 'nci/parts':
'github:hercules-ci/flake-parts/47478a4a003e745402acf63be7f9a092d51b83d7' (2023-02-09)
→ 'github:hercules-ci/flake-parts/71fb97f0d875fd4de4994dfb849f2c75e17eb6c3' (2023-06-01)
• Updated input 'nci/rust-overlay':
'github:oxalica/rust-overlay/b91706f9d5a68fecf97b63753da8e9670dff782b' (2023-02-24)
→ 'github:oxalica/rust-overlay/e75da5cfc7da874401decaa88f4ccb3b4d64d20d' (2023-06-12)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/988cc958c57ce4350ec248d2d53087777f9e1949' (2023-02-22)
→ 'github:nixos/nixpkgs/21951114383770f96ae528d0ae68824557768e81' (2023-06-10)
• Updated input 'parts':
'github:hercules-ci/flake-parts/47478a4a003e745402acf63be7f9a092d51b83d7' (2023-02-09)
→ 'github:hercules-ci/flake-parts/71fb97f0d875fd4de4994dfb849f2c75e17eb6c3' (2023-06-01)
• Updated input 'parts/nixpkgs-lib':
'github:NixOS/nixpkgs/e1e1b192c1a5aab2960bf0a0bd53a2e8124fa18e?dir=lib' (2023-01-31)
→ 'github:NixOS/nixpkgs/4f53efe34b3a8877ac923b9350c874e3dcd5dc0a?dir=lib' (2023-05-31)
|
2023-06-12 00:05:33 -07:00 |
|
Samuel Keiffer
|
fa4939a31f
|
Merge branch 'tormod/optimal-capital-placement' into 'master'
Optimally place towns.
See merge request veloren/veloren!3973
|
2023-06-11 01:36:25 +00:00 |
|
Tormod G. Hellen
|
cf002478b8
|
Optimally place towns.
This gets rid of the arbitrary threshold values for what is and
isn't an acceptable town.
|
2023-06-09 13:44:01 +02:00 |
|
Imbris
|
69dcc12dcd
|
Merge branch 'gradientsobel' into 'master'
Add `GradientSobel` experimental filter that adds object outlines based on the normal map.
See merge request veloren/veloren!3975
|
2023-06-08 16:59:20 +00:00 |
|
Avi Weinstock
|
d023f9db54
|
Only bind the materials texture in the postprocess bindgroup if it's needed.
|
2023-06-07 16:21:28 -04:00 |
|
Avi Weinstock
|
025831d9a2
|
Add GradientSobel experimental filter that adds object outlines based on the normal map.
|
2023-06-07 15:39:57 -04:00 |
|
unknown
|
526386e51c
|
Initial cacti work
|
2023-06-07 14:46:54 -04:00 |
|
Isse
|
28ee38ad1b
|
Merge branch 'clifftown_rework' into 'master'
clifftown rework
See merge request veloren/veloren!3968
|
2023-06-07 18:45:17 +00:00 |
|
flo
|
02bba1e343
|
clifftown rework
|
2023-06-07 18:45:12 +00:00 |
|
Marcel
|
caf33b69d9
|
Merge branch 'walpo/update-translation-files' into 'master'
Make i18n language identifiers comply with IETF BCP 47
See merge request veloren/veloren!3964
|
2023-06-07 13:12:35 +00:00 |
|
walpo
|
b919312d1b
|
Make i18n language identifiers comply with IETF BCP 47
|
2023-06-07 13:12:34 +00:00 |
|
Imbris
|
f8ae6cdbbe
|
Merge branch 'imbris/id-maps' into 'master'
IdMaps: Uid refactor and adding mappings from rtsim entities and character IDs to ecs entity IDs.
See merge request veloren/veloren!3971
|
2023-06-05 20:21:23 +00:00 |
|
Imbris
|
0b213b6149
|
Move common code into a separate function to avoid the complexity of calling delete_entity_recorded from handle_exit_ingame
|
2023-06-04 22:29:19 -04:00 |
|
Imbris
|
599e25c9c6
|
Address review on !3971
|
2023-06-04 21:12:39 -04:00 |
|
Imbris
|
9a12de5fcf
|
rebase fix
|
2023-06-04 14:24:01 -04:00 |
|
Imbris
|
b72bf74563
|
Update TODO after re-reading code and seeing that it was slightly inaccurate
|
2023-06-04 12:59:09 -04:00 |
|
Imbris
|
b96e7e1b26
|
Adjust tests to match changes
|
2023-06-04 12:59:09 -04:00 |
|
Imbris
|
ea77a443a2
|
Fix conditions on some error logging spots
|
2023-06-04 12:59:09 -04:00 |
|
Imbris
|
77e1b1919a
|
Use new id mappings to improve lookup_actor function
|
2023-06-04 12:59:09 -04:00 |
|
Imbris
|
ab946a0d60
|
Update changelog
|
2023-06-04 12:59:07 -04:00 |
|
Imbris
|
42ba445ea2
|
Add RtsimEntity mapping if it is included as a component on a newly
created npc.
Also, improve wording of a comment.
|
2023-06-04 12:58:16 -04:00 |
|
Imbris
|
01df87bdb4
|
Address/cleanup a couple TODOs, mainly comment improvements
|
2023-06-04 12:58:16 -04:00 |
|
Imbris
|
a976aa3f40
|
fmt after rebase
|
2023-06-04 12:58:16 -04:00 |
|
Imbris
|
b8af76deff
|
Remove potential for client to delete its own entity.
Also:
* Fix some clippy warnings
* Remove unused clippy allow
* Document semantics of `DeletedEntities`
|
2023-06-04 12:58:16 -04:00 |
|