ninefox
8ca627342a
Changed how the lantern swap is caught
2022-01-18 20:21:12 -08:00
floppy
51356d5fad
in terrain.mod.rs, return name as Option in fn name
2022-01-18 19:53:20 +01:00
Joshua Barretto
c4706078c4
Merge branch 'zesterer/experimental-shaders' into 'master'
...
Fixed minor shader issues, added curved world effect
See merge request veloren/veloren!3112
2022-01-18 17:30:49 +00:00
Joshua Barretto
2f3b14f2e1
Improved glow lighting
2022-01-18 16:52:35 +00:00
Samuel Keiffer
d40e4d3df9
Merge branch 'juliancoffee/remove_equiprating' into 'master'
...
Add lower cap to equip_time from weapon CR calculation
See merge request veloren/veloren!3116
2022-01-18 15:17:47 +00:00
juliancoffee
14cf272c8e
Change equip_time CR weapon calculation
2022-01-18 16:44:23 +02:00
floppy
ceb3507e50
-remove line breaks from biome names
...
-disable Wilderness world message in unspecified mini-biomes
-remove duplicate name in Grasslands name pattern
2022-01-18 11:27:55 +01:00
IsseW
40580578a0
Don't add unnecessary biome pois
2022-01-18 10:07:40 +01:00
floppy
28a7b00445
tweak biome icon
2022-01-18 09:19:55 +01:00
floppy
dcf36df781
tweak biome icon
2022-01-18 09:17:51 +01:00
floppy
4a8c428a3f
update/add namegen-bricks for forest and grassland
2022-01-18 08:36:40 +01:00
Samuel Keiffer
e20c98189f
Merge branch 'roidujeu/fix_combat_rating' into 'master'
...
changed the combat rating equation to a simpler one, which results in a better combat rating overall
See merge request veloren/veloren!3095
2022-01-18 07:35:49 +00:00
roidujeu
7da9f7dd47
changed the range of CRs
2022-01-18 12:27:13 +05:30
roidujeu
85965b7161
let fmt/clippy do it's thing
2022-01-18 11:19:30 +05:30
roidujeu
a6a825a97f
gave speed more weight, reduced equip_time_weight, etc
2022-01-18 10:48:53 +05:30
roidujeu
f77baeac4b
normalised crit_chance, zeroed out some stats(for now)
2022-01-18 10:48:53 +05:30
roidujeu
d6ca1bfd93
reverted accidental change
2022-01-18 10:48:53 +05:30
roidujeu
3f43610cfd
made stats separate and gave them different weights
2022-01-18 10:48:53 +05:30
roidujeu
13b0ad8c0e
included other stats, gave constant definition for some constants
...
reduced weight for poise
refuced weight for equipment time
2022-01-18 10:48:53 +05:30
roidujeu
dcc6b75c1c
fixed equip_time reverse logic, dimished effect_power's effect on CR
2022-01-18 10:48:53 +05:30
roidujeu
773bf9d9fd
changed the combat rating equation to a simpler one, which results in a more accurate weapon ranting.
2022-01-18 10:48:52 +05:30
Samuel Keiffer
a6877d3a60
Merge branch 'james/agent-cleanup' into 'master'
...
Move agent code into separate files
See merge request veloren/veloren!3102
2022-01-18 03:02:44 +00:00
James Melkonian
ac6f53922f
Move agent code into separate files
2022-01-18 03:02:43 +00:00
Joshua Barretto
b85aac6e23
Fixed minor shader issues, added curved world effect
2022-01-18 01:47:06 +00:00
Sam
b0644ca767
Melee attacks are now created through a melee constructor.
2022-01-17 20:41:24 -05:00
floppy
1a5c1ae319
length comparison to zero in /civ/mod.rs
...
warning: length comparison to zero
--> world/src/civ/mod.rs:482:15
|
482 | while to_explore.len() > 0 {
| ^^^^^^^^^^^^^^^^^^^^ help: using `!is_empty` is clearer and more explicit: `!to_explore.is_empty()`
|
= note: `#[warn(clippy::len_zero)]` on by default
= help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#len_zero
warning: length comparison to zero
--> world/src/civ/mod.rs:489:19
|
489 | while to_floodfill.len() > 0 {
| ^^^^^^^^^^^^^^^^^^^^^^ help: using `!is_empty` is clearer and more explicit: `!to_floodfill.is_empty()`
|
= help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#len_zero
2022-01-18 00:41:59 +01:00
Joshua Barretto
bb21dc2708
Merge branch 'zesterer/experimental-shaders' into 'master'
...
Added support for experimental shaders
See merge request veloren/veloren!3110
2022-01-17 22:59:19 +00:00
floppy
fd920cea1d
allow enabling/disabling biome names on map
2022-01-17 23:47:27 +01:00
floppy
a836b61190
allow enabling/disabling biome names on map
2022-01-17 23:45:51 +01:00
Joshua Barretto
1a0c5c1773
Updated changelog
2022-01-17 22:22:45 +00:00
Joshua Barretto
cd428d9267
Added support for experimental shaders
2022-01-17 22:20:33 +00:00
ninefox
64f6faece5
Switched to using existing swap_lantern
function
...
Removed unnecessary function
2022-01-17 11:24:18 -08:00
floppy
0c97a6e91a
add synonyms for biomes
2022-01-17 20:14:16 +01:00
Imbris
9b85a01df6
Merge branch 'inputmeta' into 'master'
...
Add Input methods to metainfo.xml
See merge request veloren/veloren!3093
2022-01-17 18:30:28 +00:00
floppy
88a39476bc
tweak fn generate_biome in namegen
2022-01-17 19:03:15 +01:00
Maveth
b9ad0307b5
idek where most of these came from
2022-01-17 10:50:18 -06:00
Maveth
fa6e5f2cec
Add a comment explaining something unintuitive
2022-01-17 10:39:58 -06:00
Maveth
b8a12b582d
Revert "Thank you clippy, very cool"
...
This reverts commit c8f083aa44
.
2022-01-17 10:18:32 -06:00
JakobDev
860f802afa
Add Gamepad to supported controls
2022-01-17 15:09:03 +00:00
floppy
609d23ae4f
- make individual size thresholds for biome name generation to include small lakes
...
- add original Lake naming pattern, partly (no water_alt check)
2022-01-17 16:02:52 +01:00
Joshua Barretto
9c565dadc5
Merge branch 'zesterer/mount-everest' into 'master'
...
Mount Everest
See merge request veloren/veloren!3101
2022-01-17 13:21:38 +00:00
Joshua Barretto
60b7528199
Improved rtsim entity pathfinding
2022-01-17 12:34:31 +00:00
jshipsey
1d76d484bb
anim tweaks
2022-01-17 06:45:26 -05:00
floppy
ced1a82824
- add size threshold for biomes to name, to exclude mini-biomes from clogging the map.
...
- fmt, clippy
2022-01-17 11:19:34 +01:00
Joshua Barretto
c9762568d6
Don't block teleportation when mounted
2022-01-17 09:47:29 +00:00
Joshua Barretto
d0c101ed06
Remove redundant orientation
2022-01-17 09:25:46 +00:00
jshipsey
41ed0f284f
swivel, quadsmall/quadlow offsets
2022-01-17 03:42:56 -05:00
floppy
18c434c613
tweak generate_biome
2022-01-17 09:04:12 +01:00
floppy
c00f5bafee
add fn generate_forest in namegen to name forest biomes
2022-01-17 08:36:35 +01:00
Imbris
8078ed39e1
Merge branch 'kemper/negative-energy-diffs' into 'master'
...
Fix energy stat comparisons with negative diffs in item tooltips
See merge request veloren/veloren!3109
2022-01-17 05:54:18 +00:00