Samuel Keiffer
|
771a8db2a8
|
Merge branch 'slipped/oritweak' into 'master'
ori tweaks, animal adjusts
See merge request veloren/veloren!2234
|
2021-05-03 18:49:22 +00:00 |
|
jshipsey
|
63fdc4f590
|
animal adjustments
|
2021-05-02 23:17:58 -04:00 |
|
jshipsey
|
769e21104e
|
higher health lower damage
|
2021-05-01 12:29:28 -04:00 |
|
jshipsey
|
dc5a38f1e8
|
ori addition to combomelee
|
2021-05-01 12:29:28 -04:00 |
|
Sam
|
d500a00414
|
Made naming of fields more explicit.
|
2021-05-01 09:25:56 -04:00 |
|
Sam
|
708cb12086
|
Fixed tests.
|
2021-05-01 09:25:55 -04:00 |
|
Sam
|
d3d4ee8bb0
|
Formatting stuffs.
|
2021-05-01 09:25:53 -04:00 |
|
Sam
|
3cb0ee98c8
|
Removed all unique and simple tool kinds.
|
2021-05-01 09:25:51 -04:00 |
|
Sam
|
a35b8b4aad
|
Removed ability set as field on items.
|
2021-05-01 09:25:49 -04:00 |
|
DaforLynx
|
7334cce426
|
Poise (stun) SFX and fix for town music
|
2021-04-29 23:36:22 +00:00 |
|
Samuel Keiffer
|
e177aebd9e
|
Merge branch 'lboklin/lower-zero-lift-drag' into 'master'
Lower zero-lift drag
See merge request veloren/veloren!2223
|
2021-04-29 19:11:12 +00:00 |
|
Ludvig Böklin
|
c4444a908a
|
Lower zero-lift drag
|
2021-04-29 19:22:09 +02:00 |
|
Ludvig Böklin
|
6b52ea89b4
|
Add more specific masses to objects
|
2021-04-29 11:46:03 +02:00 |
|
Ben Wallis
|
b0aca9a348
|
Merge branch 'xvar/item-serialization' into 'master'
Changed Item serialization to not send ItemDef struct across the network
See merge request veloren/veloren!2215
|
2021-04-28 20:50:32 +00:00 |
|
Ben Wallis
|
14caae3667
|
Changed Item serialization to only send item_definition_id across the network rather than the whole ItemDef
|
2021-04-28 21:00:25 +01:00 |
|
Ludvig Böklin
|
34660462e9
|
Glider physics
|
2021-04-27 14:41:48 +00:00 |
|
Sam
|
d2d8d43410
|
Addressed testing feedback.
Particles better.
|
2021-04-25 13:09:08 -04:00 |
|
Sam
|
b9d6bd2fd2
|
Parrying no longer requires releasing the block button, and instead can parry if block happened in buildup.
|
2021-04-25 13:09:07 -04:00 |
|
Sam
|
288a6f3a82
|
Blocking now works if no weapon is equipped in main hand.
Added temp sfx for blocking and parrying.
Added temp particles for successful parry.
Tweaked values of default block ability.
|
2021-04-25 13:09:02 -04:00 |
|
Sam
|
f5ec23df48
|
Parrying
|
2021-04-25 13:08:42 -04:00 |
|
Sam
|
91c6288213
|
Melee weapons can now block.
|
2021-04-25 13:08:42 -04:00 |
|
Sam
|
0170a38ebc
|
Removed unwraps in buffs
|
2021-04-25 12:01:21 -04:00 |
|
Snowram
|
c16ec43938
|
Body specific beam offsets
|
2021-04-25 04:07:12 +02:00 |
|
Snowram
|
8f54a0bf31
|
More phoenix AI work
More phoenix AI work
|
2021-04-25 04:07:12 +02:00 |
|
Snowram
|
8cf8e51962
|
Phoenix npc + AI (WIP)
|
2021-04-25 04:07:11 +02:00 |
|
Snowram
|
fd177c9669
|
Breathe and stun anims
|
2021-04-25 02:14:50 +02:00 |
|
Snowram
|
eb98360183
|
Cockatrice bird_large conversion
|
2021-04-25 02:14:50 +02:00 |
|
Snowram
|
bc95484863
|
Swaps bird_small skeleton to a new bird_large
|
2021-04-25 02:14:49 +02:00 |
|
Monty Marz
|
b69eb61e7b
|
Add handles to lanterns, fix cooking pot scale
|
2021-04-22 17:12:07 +00:00 |
|
jshipsey
|
9d82b20891
|
remove 0.8, add snow's mixed_vel idea for other bodies
|
2021-04-22 00:04:39 -04:00 |
|
Dominik Broński
|
1d25016459
|
Merge branch 'lboklin/arrow-turret-drag-fix' into 'master'
Fix ArrowTurret drag coefficient
See merge request veloren/veloren!2175
|
2021-04-21 20:17:44 +00:00 |
|
Ludvig Böklin
|
37713cb4ad
|
Fix ArrowTurret drag coefficient
|
2021-04-21 18:26:23 +02:00 |
|
Joshua Barretto
|
ed7cc12213
|
Made characters carry lanterns higher when possible
|
2021-04-21 15:59:29 +01:00 |
|
Ludvig Böklin
|
762c68cfbb
|
Basic fluid dynamics and physical properties for entities
|
2021-04-20 17:38:19 +02:00 |
|
Monty
|
86445af09c
|
change cauldron spawning
cooking pot height
fmt
fmt, changelog
|
2021-04-20 02:48:13 +02:00 |
|
Monty
|
a1fe7c12c3
|
fmt, add sprites
|
2021-04-20 02:46:04 +02:00 |
|
Joshua Barretto
|
5598d07944
|
Added crafting stations
|
2021-04-20 02:45:59 +02:00 |
|
Joshua Barretto
|
b700d9a641
|
Merge branch 'zesterer/econ-tweaks' into 'master'
Limit trading currency to sane amounts
See merge request veloren/veloren!2154
|
2021-04-19 10:46:17 +00:00 |
|
Joshua Barretto
|
324148d9a3
|
Limit trading currency to sane amounts
|
2021-04-19 10:04:28 +01:00 |
|
Sam
|
ce7581037c
|
Overhauled dash melee.
|
2021-04-18 18:36:12 -04:00 |
|
Joshua Barretto
|
cb817c0313
|
Merge branch 'zesterer/econ-tweaks' into 'master'
Rebalanced economy somewhat
See merge request veloren/veloren!2148
|
2021-04-18 21:20:49 +00:00 |
|
Avi Weinstock
|
0404250300
|
Unlock dodge roll iframes and staff explosion by default.
|
2021-04-18 16:16:06 -04:00 |
|
Joshua Barretto
|
352fce239e
|
Allow trading items not sold by merchants
|
2021-04-18 20:07:00 +01:00 |
|
Joshua Barretto
|
cac9ac6807
|
Trading stock limits
|
2021-04-18 18:58:26 +01:00 |
|
Ben Wallis
|
a4cdb89987
|
Implemented inventory sorting
|
2021-04-17 22:04:08 +01:00 |
|
gGmMsS123
|
d5a887f195
|
m2 staff
|
2021-04-16 00:48:20 +03:00 |
|
gGmMsS123
|
e33961e1fa
|
M2 Staff Final Touch
|
2021-04-16 00:34:24 +03:00 |
|
gGmMsS123
|
0d956610ec
|
Added burning debuff for Staff M2
|
2021-04-15 23:34:28 +03:00 |
|
Sam
|
94042bdf79
|
Stats adjusted for 2h. Poise adjusted by handedness.
|
2021-04-14 15:03:37 -04:00 |
|
holychowders
|
568a8d9666
|
Resolve Issue #978 - Extract SkillSet Into Its Own Component
|
2021-04-14 15:35:34 +00:00 |
|
jshipsey
|
161382d06a
|
changelog
|
2021-04-13 20:19:35 -04:00 |
|
jshipsey
|
ea9b871374
|
loot tables, clippy, animation tweaks
|
2021-04-13 20:18:59 -04:00 |
|
Sam
|
0b10ffc715
|
You can now roll without a weapon equipped.
|
2021-04-13 20:18:58 -04:00 |
|
Avi Weinstock
|
ddf6a26577
|
Give NPCs the ability to use potions.
|
2021-04-11 23:47:29 +00:00 |
|
Joshua Yanovski
|
af94753ad9
|
Remove panics and unwraps, part 1.
Also fixes various other miscellaneous bugs.
|
2021-04-10 10:03:21 +02:00 |
|
Vincent Foulon
|
d80db38bc9
|
Remove TRADE capability, use trade_site attribute instead
|
2021-04-08 19:06:57 +02:00 |
|
Vincent Foulon
|
bc1797a240
|
Address comments
|
2021-04-08 18:33:00 +02:00 |
|
Vincent Foulon
|
a30cbaf735
|
Move Behavior to Agent's Component
|
2021-04-07 22:11:29 +02:00 |
|
Vincent Foulon
|
dbee13f9be
|
Finally Behavior isn't good enough as a component, Remove it from ECS and include it onto Agent directly
|
2021-04-07 22:02:57 +02:00 |
|
Vincent Foulon
|
45fb9f3211
|
Address comments
- make Behavior's capabilities and state private
- Typo in a comment
- add basic tests
Apply 1 suggestion(s) to 1 file(s)
Remove comments in agent.rs
|
2021-04-07 22:02:42 +02:00 |
|
Vincent Foulon
|
a0157ac5f5
|
use bitflags instead of HashSet
|
2021-04-07 17:37:21 +02:00 |
|
Vincent Foulon
|
114715908a
|
fix tag removing
|
2021-04-07 17:26:54 +02:00 |
|
Vincent Foulon
|
b1718cf578
|
Use HashSet instead of Vec
|
2021-04-07 17:26:48 +02:00 |
|
Vincent Foulon
|
211ab02897
|
Use Behavior::CanTrade instead of Agent::trade_for_site + addressed comments
|
2021-04-07 17:26:42 +02:00 |
|
Vincent Foulon
|
18694b30ad
|
Use Behavior into Agent
|
2021-04-07 17:26:12 +02:00 |
|
Vincent Foulon
|
41314e9098
|
Create Behavior component
|
2021-04-07 17:21:53 +02:00 |
|
Avi Weinstock
|
2c4612bff1
|
Fix loadout_builder panic.
|
2021-04-06 10:34:13 -04:00 |
|
Marcel
|
f0cabf1add
|
Merge branch 'aweinstock/stackable-merchants' into 'master'
Make merchants spawn with stacks of stackable items.
See merge request veloren/veloren!2062
|
2021-04-06 08:14:33 +00:00 |
|
Samuel Keiffer
|
3c50321a80
|
Merge branch 'sam/consolidate-roll' into 'master'
Flattened roll progression.
See merge request veloren/veloren!2073
|
2021-04-06 03:31:46 +00:00 |
|
Sam
|
ba0b6c309b
|
Flattened roll progression.
|
2021-04-05 17:50:53 -04:00 |
|
Sam
|
a7e39bc8c9
|
Nerfs
|
2021-04-05 17:38:52 -04:00 |
|
Avi Weinstock
|
56137aff92
|
Address MR 2062 comments: avoid an expect-equivalent pattern.
|
2021-04-05 11:29:10 -04:00 |
|
Marcel
|
69891f0b70
|
Merge branch 'login-trim-username' into 'master'
login trim username, improve validation, social ordering #1040
Closes #1040
See merge request veloren/veloren!2042
|
2021-04-04 22:09:16 +00:00 |
|
Marcel
|
958c75642c
|
Merge branch 'christof/stats_per_price' into 'master'
output stats per value for all categories in the trade pricing test
See merge request veloren/veloren!2057
|
2021-04-04 18:35:39 +00:00 |
|
Avi Weinstock
|
a1cfd9ea3c
|
Make merchants spawn with stacks of stackable items.
|
2021-04-04 13:47:05 -04:00 |
|
Monty Marz
|
06bbb7f0ff
|
Crafting Tabs and more item tags
|
2021-04-04 13:02:27 +00:00 |
|
Christof Petig
|
d3bdaaec1a
|
output stats per value for all categories in the trade pricing test
|
2021-04-03 23:22:34 +02:00 |
|
Sam
|
18eed650f4
|
Changed touch_entities from a vec to a hashset.
|
2021-04-03 15:13:04 -04:00 |
|
Sam
|
27f178286d
|
Removed all rng matches in code to determine loot tables, and moved to loot tables specific for each sprite, creature, or dungeon.
|
2021-04-02 23:24:55 -04:00 |
|
Sam
|
c8b8cd436e
|
Made item prices sane.
|
2021-04-02 23:04:34 -04:00 |
|
Sam
|
7eb1eefa13
|
Re-created item_price_calculation with new loot tables.
|
2021-04-02 23:04:34 -04:00 |
|
Sam
|
a2906168a6
|
Moved materials into their own loot tables.
|
2021-04-02 23:04:33 -04:00 |
|
Sam
|
cb638180f8
|
Moved food items into their own loot tables.
|
2021-04-02 23:04:32 -04:00 |
|
Sam
|
31e69021cb
|
Switched loot tables from declaring each weapon individually to just referencing a different loot table.
|
2021-04-02 23:04:31 -04:00 |
|
Sam
|
833f1f3309
|
Converted all armor in loot tables to reference armor set loot tables.
|
2021-04-02 23:04:28 -04:00 |
|
Sam
|
96b354c178
|
Consolidated loot tables by switching to CreatureMaterial where possible
|
2021-04-02 23:04:27 -04:00 |
|
Sam
|
ab2fca21cf
|
Fixed trading
|
2021-04-02 23:04:26 -04:00 |
|
Sam
|
cbca2a66b6
|
Support for creature specific materails and materials having a quantity.
|
2021-04-02 23:04:25 -04:00 |
|
Sam
|
247004d180
|
Loot tables can now recursively specify loot tables. Mercahnts broken.
|
2021-04-02 23:04:25 -04:00 |
|
aljazerzen
|
08146f6a3a
|
login trim username, improve validation, social ordering
|
2021-04-01 16:43:27 +02:00 |
|
aljazerzen
|
8ac879e4c1
|
after leaving group, issue warning instead of changing chat mode
|
2021-04-01 15:43:50 +02:00 |
|
Joshua Barretto
|
3c19713e63
|
Merge branch 'zesterer/sprite-text' into 'master'
Added text prompts to sprites
See merge request veloren/veloren!2034
|
2021-03-30 11:41:14 +00:00 |
|
Joshua Barretto
|
92afdaf423
|
Merge branch 'zesterer/small-fixes' into 'master'
Bow improvements
See merge request veloren/veloren!2032
|
2021-03-30 00:16:45 +00:00 |
|
Joshua Barretto
|
bed863c50c
|
Added indicator text to terrain sprites
|
2021-03-30 01:04:23 +01:00 |
|
Samuel Keiffer
|
12ec46c572
|
Merge branch 'sam/mindflayer-balancing' into 'master'
Mindflayer balance tweaks.
See merge request veloren/veloren!2031
|
2021-03-29 21:05:49 +00:00 |
|
Joshua Barretto
|
85237c7a32
|
Fixed training dummy hitbox
|
2021-03-29 21:52:05 +01:00 |
|
Snowram
|
6adaac8106
|
Addresses comments
|
2021-03-29 18:35:12 +02:00 |
|
Snowram
|
d1e734b9b1
|
Tooltip now use ItemDesc instead of Item
|
2021-03-29 18:34:45 +02:00 |
|
Snowram
|
2c09180189
|
Set the item tooltip for every bag slots
|
2021-03-29 18:34:45 +02:00 |
|
Snowram
|
aa71dcb9c7
|
Make the new tooltip item specific
|
2021-03-29 18:34:45 +02:00 |
|