juliancoffee
1eb9c165be
(uk_UA) small fitting fix
2021-06-24 19:52:38 +03:00
Samuel Keiffer
e3bf77298b
Merge branch 'sam/harvester' into 'master'
...
Harvester
See merge request veloren/veloren!2413
2021-06-24 04:15:56 +00:00
Sam
645cc60dc0
Balance tweaks.
2021-06-23 22:38:37 -05:00
Sam
f0c5ed1397
Added sparseness field to sprite summon.
2021-06-23 22:38:16 -05:00
Sam
68c6a0a495
Balance tweaks for harvester.
2021-06-23 22:38:16 -05:00
Sam
aac24ad601
Added ensnared debuff icon.
2021-06-23 22:38:16 -05:00
Snowram
47cc040301
Adds SpriteSummon animation
2021-06-23 22:38:16 -05:00
Sam
c162827f97
Harvester AI
2021-06-23 22:38:16 -05:00
Sam
0a32b676c8
Vines now ensnare you by applying a buff.
2021-06-23 22:38:16 -05:00
Sam
763461ebef
Ensnaring vines now ensnare you.
2021-06-23 22:38:16 -05:00
Sam
ed503236d6
Slightly functional sprite summon.
2021-06-23 22:38:16 -05:00
Snowram
15a2fbc555
3 attack anims done
2021-06-23 22:38:16 -05:00
Sam
879aafad5c
3 attacks done
2021-06-23 22:38:16 -05:00
Avi Weinstock
033dbbf02a
Add pillars and wall sconces to site2 dungeons.
2021-06-23 23:22:14 -04:00
Avi Weinstock
c68d79315e
Add wall contours and sprites to site2 dungeon. Also add septagon decal in boss rooms.
2021-06-23 23:22:14 -04:00
Avi Weinstock
c8383aba38
Traverse the dungeon tile structure to create the rooms, and align the stairs.
2021-06-23 23:22:14 -04:00
Avi Weinstock
c6bb61f2e6
Add Primitive::Prefab and Fill::Prefab for coloring dungeon entrances.
2021-06-23 23:22:14 -04:00
Avi Weinstock
95214649db
Get structures loading via sampling primitive.
2021-06-23 23:22:14 -04:00
Avi Weinstock
df4f536523
Progress on converting dungeons to site2. Adds Sampling and Translate primitives.
2021-06-23 23:22:14 -04:00
Samuel Keiffer
46e93ba563
Merge branch 'juliancoffee/slow_food' into 'master'
...
Balance food to have sane health per second regen
See merge request veloren/veloren!2490
2021-06-24 01:45:10 +00:00
AldanTanneo
f1b83962bd
Fixed smooth layer at z=434 (and a few other)
2021-06-23 21:13:15 +02:00
Marcel
87c86b919b
Merge branch 'yusdacra/chore/nix' into 'master'
...
build(nix): update audio resource patch
See merge request veloren/veloren!2493
2021-06-23 06:46:02 +00:00
Yusuf Bera Ertan
1b3a8db8d4
build(nix): update audio resource patch
2021-06-23 08:52:04 +03:00
Justin Shipsey
16633cc3ec
Merge branch 'slipped/movetweak' into 'master'
...
strafe side speed tweak
See merge request veloren/veloren!2492
2021-06-23 02:48:38 +00:00
jshipsey
81aaf30d00
stride speed backwardd-dependence
2021-06-22 22:08:34 -04:00
juliancoffee
ced180bbc9
changelog
2021-06-22 20:52:44 +03:00
juliancoffee
ccf7c7a0e4
Balance food to have sane health per second regen
...
* Gatherable food gives you slightly variable regen with variable time
based on tier and that fact that we have x2 health on endgame character.
For example while mushroom gives you 5 health over 10 seconds (0.5 health-per-second),
mushroom curry will give you 120 health over 80 seconds (1.5 health-per-second).
* Meat gives you twice powerful regen strength, but with twice shorter
duration
2021-06-22 20:51:31 +03:00
Dominik Broński
8356e2ffca
Merge branch 'aweinstock/lava' into 'master'
...
Lava
See merge request veloren/veloren!2482
2021-06-21 20:49:44 +00:00
Joshua Barretto
011f76dbf2
Merge branch 'zesterer/small-fixes' into 'master'
...
Small improvements
See merge request veloren/veloren!2488
2021-06-21 20:49:41 +00:00
Joshua Barretto
e930ff6779
Sanitise controller inputs
2021-06-21 21:13:49 +01:00
Joshua Barretto
90e5bac395
Made movement slower when strafing in non-forward directions
2021-06-21 20:32:20 +01:00
Joshua Barretto
b84708ca75
Added chat toggle
2021-06-21 20:16:03 +01:00
Joshua Barretto
8ab222bf80
Selectively disable glow flicker for small wins on low-end systems
2021-06-21 17:06:43 +01:00
Joshua Barretto
f85a59d33a
Merge branch 'zesterer/small-fixes' into 'master'
...
A plethora of improvements
See merge request veloren/veloren!2486
2021-06-21 14:19:13 +00:00
Joshua Barretto
288f2c13d4
Enable strafing in first-person mode
2021-06-21 13:27:19 +01:00
Justin Shipsey
c744cd4365
Merge branch 'donovanlank/Cool_Blue_Lantern' into 'master'
...
made it so Cool Blue Lantern is actually blue
See merge request veloren/veloren!2474
2021-06-21 05:37:49 +00:00
Marcel
ec7d3b5e37
Merge branch 'swilliams/give_item_fix' into 'master'
...
Fix for Issue 1210
See merge request veloren/veloren!2484
2021-06-20 23:26:59 +00:00
Marcel
b0574b4ddc
Merge branch 'imbris/tracy' into 'master'
...
Refactor Client message handling, improve use of tracy, increase coverage of profiling spans in voxygen
See merge request veloren/veloren!2479
2021-06-20 23:17:08 +00:00
Marcel
4e600814ee
Merge branch 'yusdacra/chore/nix' into 'master'
...
build(nix): fix git ref not found and git lfs check
See merge request veloren/veloren!2480
2021-06-20 22:54:37 +00:00
Scott Williams
80c45b6396
Added another .replace
2021-06-20 22:55:58 +01:00
Dominik Broński
3f45f7f250
Merge branch 'jshipsey-master-patch-07838' into 'master'
...
Update difficulty_distribution.ron
See merge request veloren/veloren!2483
2021-06-20 20:40:07 +00:00
Justin Shipsey
667e667ac8
Update difficulty_distribution.ron
2021-06-20 19:42:21 +00:00
Dominik Broński
b046541b69
Merge branch 'christof/trade_optimization' into 'master'
...
Accelerate econsim using arrays instead of hashmaps
See merge request veloren/veloren!2216
2021-06-20 16:00:37 +00:00
Christof Petig
79d7e79776
Accelerate econsim using arrays instead of hashmaps
2021-06-20 16:00:37 +00:00
Avi Weinstock
0f9181cbcb
Address MR 2482 comments.
...
- Change lava density to 3x water density.
- Use `ServerEvent::Buff` instead of modifying the buff component directly.
- Revert commented-out changes to fluid shaders.
2021-06-20 11:32:05 -04:00
Samuel Keiffer
b37106e71f
Merge branch 'juliancoffee/hot_reload_dungeon_difficulty' into 'master'
...
Add config file for dungeon distribution
See merge request veloren/veloren!2481
2021-06-20 04:07:26 +00:00
juliancoffee
0ec6a4e5ff
Create distribution map for dungeons
...
* tl;dr T0 - 27%, T1/T2 - 22%, T3/T4 - 11%, T5 - 5%.
Before every dungeon had 16% chance to be created.
2021-06-20 00:14:54 +03:00
Avi Weinstock
f1a1160b80
Make lava solid w.r.t. rendering while still being liquid w.r.t. physics.
2021-06-19 16:52:21 -04:00
juliancoffee
ecd61df49b
Tip how to make map with dungeons of same level
2021-06-19 23:32:54 +03:00
Avi Weinstock
2226a4c6a9
Add lava to caves, which sets you on fire if you swim in it. Currently requires uncommenting #define LAVA in the shaders, and only looks good with cheap fluid mode.
2021-06-19 16:31:21 -04:00
