Knightress Paladin
|
63c5d9f7df
|
Fixed formatting
|
2021-07-07 20:00:35 -07:00 |
|
Knightress Paladin
|
ba35aaaf90
|
Add check to see if cultist already has ward buff
|
2021-07-07 20:00:35 -07:00 |
|
Knightress Paladin
|
35242c71e1
|
Added sceptre tactic and sceptre cultists
|
2021-07-07 20:00:01 -07:00 |
|
Knightress Paladin
|
4aa623d6c2
|
Added check to prevent sceptre AI from canceling its own ward
|
2021-07-07 19:21:30 -07:00 |
|
Knightress Paladin
|
abe2e4d2ea
|
Clean up sceptre ai code before merge
|
2021-07-07 17:56:47 -07:00 |
|
Knightress Paladin
|
08cc63c19a
|
Fixed formatting
|
2021-07-07 17:06:02 -07:00 |
|
Dominik Broński
|
e6af005ed1
|
Merge branch 'pfau/stuff' into 'master'
Minimap modes, Danari customizations update & bald hairstyles
See merge request veloren/veloren!2576
|
2021-07-08 00:01:09 +00:00 |
|
Monty Marz
|
7c8d73a0c6
|
Minimap modes, Danari customizations update & bald hairstyles
|
2021-07-08 00:01:08 +00:00 |
|
Samuel Keiffer
|
d4be464e9f
|
Merge branch 'sam/energy-stat' into 'master'
Added energy efficiency stat to weapons.
See merge request veloren/veloren!2571
|
2021-07-07 22:57:58 +00:00 |
|
Joshua Barretto
|
092229432c
|
Merge branch 'revert-fc835f67' into 'master'
Revert "Merge branch 'xvar/wgpu-0.9' into 'master'"
See merge request veloren/veloren!2575
|
2021-07-07 22:47:42 +00:00 |
|
Joshua Barretto
|
ad1f6a5304
|
Revert "Merge branch 'xvar/wgpu-0.9' into 'master'"
This reverts merge request !2566
|
2021-07-07 22:07:00 +00:00 |
|
Joshua Barretto
|
9333afc6f1
|
Merge branch 'DixieDev/569-fix-inventory-and-lantern-usage-while-dead' into 'master'
Fix players having inventory and lantern control while dead
Closes #569
See merge request veloren/veloren!2569
|
2021-07-07 18:44:01 +00:00 |
|
juliancoffee
|
066e0a0323
|
Revert non-ui code changes
|
2021-07-07 17:53:17 +03:00 |
|
juliancoffee
|
034b032954
|
Add tests
|
2021-07-07 17:51:30 +03:00 |
|
juliancoffee
|
20c0c7f44f
|
Use code-spliced values for i18n skill description
|
2021-07-07 17:51:30 +03:00 |
|
juliancoffee
|
67f22baed5
|
Add support for splicing numbers into skill desc
|
2021-07-07 17:51:30 +03:00 |
|
juliancoffee
|
274acae939
|
Move skill boost modifiers to skills module
|
2021-07-07 17:51:30 +03:00 |
|
DixiE
|
76fe63ed9a
|
Fix players having inventory and lantern control while dead
|
2021-07-07 13:18:24 +01:00 |
|
Marcel
|
e387617017
|
Merge branch 'Swagazaki-master-patch-23928' into 'master'
Just updated common.ron to correct a few French translations!
See merge request veloren/veloren!2573
|
2021-07-07 11:53:01 +00:00 |
|
Swagazaki
|
cb3e932832
|
Just updated common.ron to correct a few French translations!
|
2021-07-07 10:55:15 +00:00 |
|
Knightress Paladin
|
598d6594ff
|
Add check to see if cultist already has ward buff
|
2021-07-06 21:10:33 -07:00 |
|
Sam
|
509461763b
|
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
|
2021-07-06 22:54:23 -05:00 |
|
Samuel Keiffer
|
2d7a4d6bee
|
Merge branch 'snowram/dungeon-entraces-biomes' into 'master'
Spawn dungeon entrances depending on the Site origin biome
See merge request veloren/veloren!2554
|
2021-07-07 02:47:34 +00:00 |
|
Snowram
|
5dfef5a563
|
Spawn dungeon entrances depending on the Site origin biome
|
2021-07-07 00:35:50 +02:00 |
|
Samuel Keiffer
|
01a8f53ba3
|
Merge branch 'aweinstock/improve-airship-pid' into 'master'
Fix integral error calculations in PID controller, and change coefficients for...
See merge request veloren/veloren!2568
|
2021-07-06 21:38:07 +00:00 |
|
Samuel Keiffer
|
bc47991592
|
Merge branch 'sam/fix-network-test' into 'master'
Fix network test
See merge request veloren/veloren!2567
|
2021-07-06 21:29:51 +00:00 |
|
Samuel Keiffer
|
e5a5d28246
|
Merge branch 'sam/range-stat' into 'master'
Added range stat to weapons.
See merge request veloren/veloren!2563
|
2021-07-06 21:18:47 +00:00 |
|
Avi Weinstock
|
1a60ebd5db
|
Fix integral error calculations in PID controller, and change coefficients for airship and hot air balloon.
|
2021-07-06 16:52:12 -04:00 |
|
Sam
|
04e8138b60
|
Fix test
|
2021-07-06 15:49:57 -05:00 |
|
Sam
|
1c3bd13afa
|
Addressed review comments. Removed individual stat assignments.
|
2021-07-06 15:27:49 -05:00 |
|
Marcel
|
0a57bf4367
|
Merge branch 'master' into 'master'
Add Hungarian translation
See merge request veloren/veloren!2559
|
2021-07-06 11:44:58 +00:00 |
|
Knightress Paladin
|
98dc0f19b7
|
Merge branch 'knightresspaladin/sceptre-ai' of https://gitlab.com/veloren/dev/veloren into knightresspaladin/sceptre-ai
|
2021-07-06 01:48:11 -07:00 |
|
Knightress Paladin
|
2d1799e6f1
|
Added sceptre tactic and sceptre cultists
|
2021-07-06 01:47:22 -07:00 |
|
Knightress Paladin
|
510591dee3
|
Added sceptre tactic and sceptre cultists
|
2021-07-06 01:29:11 -07:00 |
|
Marcel
|
fc835f675e
|
Merge branch 'xvar/wgpu-0.9' into 'master'
Updated wgpu to 0.9.0 and egui to 0.13.0
See merge request veloren/veloren!2566
|
2021-07-06 07:27:45 +00:00 |
|
Ben Wallis
|
88bb160336
|
Updated wgpu to 0.9.0 and egui to 0.13.0
|
2021-07-06 07:32:27 +01:00 |
|
Samuel Keiffer
|
1fa586f3f9
|
Merge branch 'caldog20/fix-beam-turning-rate-#1088' into 'master'
Fixed fast turning rate for BasicBeam abilities
See merge request veloren/veloren!2565
|
2021-07-06 04:23:33 +00:00 |
|
Samuel Keiffer
|
5cfe701914
|
Merge branch 'knightresspaladin/fix-block-discoloration' into 'master'
Added check for exploding lava and glowing blocks
See merge request veloren/veloren!2564
|
2021-07-06 03:28:11 +00:00 |
|
Caleb
|
559111283f
|
Lowered ori_rate to 0.3 for BasicBeam abilities
|
2021-07-05 22:08:52 -05:00 |
|
Knightress Paladin
|
0cf92321f1
|
Merge branch 'knightresspaladin/fix-block-discoloration' of https://gitlab.com/veloren/dev/veloren into knightresspaladin/fix-block-discoloration
|
2021-07-05 19:43:19 -07:00 |
|
Knightress Paladin
|
2bcfa0df7a
|
Formatted code to omit continue keyword
|
2021-07-05 19:41:25 -07:00 |
|
Knightress Paladin
|
5c5b8ed94e
|
Added check for exploding lava and glowing blocks
|
2021-07-05 19:41:25 -07:00 |
|
Knightress Paladin
|
081c8bed77
|
Added check for exploding lava and glowing blocks
|
2021-07-05 19:13:11 -07:00 |
|
Sam
|
e8e953ffab
|
Added range stat to weapons.
|
2021-07-05 20:32:12 -05:00 |
|
Marcel
|
af8ced310f
|
Merge branch 'alphyr/disable_hot_reloading' into 'master'
Add a feature to optionnally disable hot-reloading
See merge request veloren/veloren!2562
|
2021-07-06 00:11:21 +00:00 |
|
Benoît du Garreau
|
110b9742b7
|
Add a feature to optionnally disable hot-reloading
|
2021-07-06 00:27:09 +02:00 |
|
Marcel
|
c86118ee2c
|
Merge branch 'aweinstock/fix-keyedjobs-warning' into 'master'
Fix spurious warning in KeyedJobs.
See merge request veloren/veloren!2561
|
2021-07-05 21:41:00 +00:00 |
|
Marcel
|
572a41b029
|
Merge branch 'juliancoffee/trade_rebalancing' into 'master'
Make trade_pricing great again
See merge request veloren/veloren!2546
|
2021-07-05 21:40:58 +00:00 |
|
Marcel
|
cc996a63f6
|
Merge branch 'juliancoffee/small_fixes' into 'master'
Remove `load_expect_dir` as it's misused
See merge request veloren/veloren!2560
|
2021-07-05 20:57:30 +00:00 |
|
Avi Weinstock
|
86f5564dc7
|
Fix spurious warning in KeyedJobs.
|
2021-07-05 13:52:34 -04:00 |
|