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
Snowram
8f54a0bf31
More phoenix AI work
...
More phoenix AI work
2021-04-25 04:07:12 +02:00
James Melkonian
0cf7e7114f
Phoenix AI pass
2021-04-25 04:07:11 +02:00
Snowram
8cf8e51962
Phoenix npc + AI (WIP)
2021-04-25 04:07:11 +02:00
Snowram
ab26efa970
Improves bird_large anims
2021-04-25 04:07:09 +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
Ada Lovegirls
01c30868eb
Add option to load English string as fallback if string missing
2021-04-24 14:39:35 +00:00
Ben Wallis
c6205875ee
Merge branch 'xvar/server-version-check' into 'master'
...
Added client/server version mismatch warnings
See merge request veloren/veloren!2184
2021-04-24 09:05:45 +00:00
Ben Wallis
2e08c2f76f
Added client/server version mismatch message when a network error is encountered during client init.
...
Added warning banner on character select when successfully connected to a server with a mismatched version.
2021-04-24 09:08:30 +01:00
holychowders
516f2fec4a
Fix grammatical error in NPC message
2021-04-23 22:43:37 -07:00
Illia Denysenko
4e7aba5b3f
update uk_UA localization
2021-04-23 21:30:46 +00:00
Nícolas Wildner
6188bb9e96
update pt_br 20210422
2021-04-23 01:00:41 +00: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
Joshua Barretto
19184a49a7
Made the pit of tartarus less bad
2021-04-21 22:18:44 +01:00
Joshua Barretto
81ba200e48
Improve dynamic light reflection for hill climbing
2021-04-21 17:10:53 +01:00
Ludvig Böklin
762c68cfbb
Basic fluid dynamics and physical properties for entities
2021-04-20 17:38:19 +02:00
Monty
a1b4e0bdaf
remove old craftsman hammer, add migration
2021-04-20 03:34:11 +02:00
Joshua Barretto
11ba02130c
Made sprite/block selection effect more subtle
2021-04-20 02:46:07 +02:00
Joshua Barretto
483276b082
Made sprite/block selection effect more subtle
2021-04-20 02:46:06 +02:00
Monty
a4d56e7843
more sprite stuff and crafting UI update
...
fix item images
fix CR display
2021-04-20 02:46:06 +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
c5455fa1a1
Merge branch 'zesterer/small-fixes' into 'master'
...
Small fixes
See merge request veloren/veloren!2163
2021-04-19 21:54:26 +00:00
Joshua Barretto
4ad5257e40
Rebalanced mist
2021-04-19 22:26:56 +01:00
Joshua Barretto
86287e8f0a
Fixed negative cloud density bug
2021-04-19 22:02:47 +01:00
Imbris
8c9d4dc3dd
Merge branch 'capucho/inactive-master' into 'master'
...
Lower volume of window on focus loss
See merge request veloren/veloren!2150
2021-04-19 20:39:49 +00:00
Marcel
c5caec4921
Merge branch 'capucho/map-kb-zoom' into 'master'
...
Add keybindings for map/minimap zoom
See merge request veloren/veloren!2161
2021-04-19 19:52:27 +00:00
João Capucho
164411cb43
Voxygen: Added translations for map zoom
2021-04-19 20:27:02 +01:00
Marcel
3c3aa3d325
Merge branch 'juliancoffee/update-uk_UA' into 'master'
...
Update localization for uk_UA
See merge request veloren/veloren!2155
2021-04-19 19:26:20 +00:00
Illia Denysenko
ef8926bc5c
Update localization for uk_UA
2021-04-19 19:26:20 +00:00
João Capucho
f23b515dd8
Voxygen: Add master volume sliders to the settings
2021-04-19 19:58:14 +01:00
Joshua Barretto
f0f3da529b
Fixed water shader, sky shader
2021-04-19 14:42:49 +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
Samuel Keiffer
60d38cc03b
Merge branch 'aweinstock/dodgesplosion' into 'master'
...
Unlock dodge roll iframes and staff explosion by default.
See merge request veloren/veloren!2146
2021-04-18 20:46:15 +00:00
Avi Weinstock
0404250300
Unlock dodge roll iframes and staff explosion by default.
2021-04-18 16:16:06 -04:00
Marcel
62fcdcd998
Merge branch 'nwildner/update_pt_BR_20210417' into 'master'
...
update pt_br 20210417
See merge request veloren/veloren!2143
2021-04-18 19:33:39 +00:00
Nícolas Wildner
24b55d0f07
update pt_br 20210417
2021-04-18 19:33:39 +00: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
Joshua Barretto
250733a123
Better price rationalisation
2021-04-18 18:11:00 +01:00
Joshua Barretto
c0b71d0731
Removed legendaries from trading
2021-04-18 17:29:22 +01:00
Joshua Barretto
11683084ad
Use labour value for prices
2021-04-18 17:05:14 +01:00
Joshua Barretto
fcc23a4427
Normalised prices within sites
2021-04-18 15:09:21 +01:00
Joshua Barretto
b72e454148
Rebalanced economy somewhat
2021-04-18 14:08:48 +01:00
Ben Wallis
a4cdb89987
Implemented inventory sorting
2021-04-17 22:04:08 +01:00
Marcel
2a0c8e575f
Merge branch 'kinggred-master-patch-80352' into 'master'
...
Update main.ron
See merge request veloren/veloren!2123
2021-04-17 18:28:31 +00:00
Samuel Keiffer
a1d9ba15d9
Merge branch 'DaforLynx/normalize' into 'master'
...
Normalize + shrink all sfx; tweaks to combat music; change footstep sounds
See merge request veloren/veloren!2120
2021-04-16 00:35:15 +00:00
DaforLynx
f441c8c206
Normalize + shrink all sfx; tweaks to combat music; change footstep sounds
2021-04-16 00:35:13 +00:00
Samuel Keiffer
c962c5f12e
Merge branch 'gGmMsS/Burning' into 'master'
...
Added burning debuff for Staff M2
See merge request veloren/veloren!2134
2021-04-15 23:51:33 +00:00
Imbris
85ee4c8cd1
Merge branch 'aweinstock/server-authoritative-physics' into 'master'
...
Aweinstock/server authoritative physics
See merge request veloren/veloren!2126
2021-04-15 22:24:00 +00: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
Avi Weinstock
2fb7575d60
Address MR 2126 comments.
2021-04-15 15:17:39 -04:00
jshipsey
8f20d17c9a
attacking movement tweaks
2021-04-15 12:13:50 -04:00
jshipsey
896d2a5b63
combat tweaks
2021-04-15 11:43:52 -04:00
Avi Weinstock
50d0314a75
Add a toggle to negotiate the use of server-authoritative physics.
2021-04-15 08:50:17 -04:00
Sam
c88df846a7
Fixes animation parameters so a 2h weapon in the offhand slot doesn't look wonky.
2021-04-14 17:38:37 -04:00
Stanisław Grupiński
fd7bf41678
Update main.ron
2021-04-14 12:40:02 +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
jshipsey
42460f7e65
spins, combos
2021-04-13 20:18:59 -04:00
jshipsey
529f8eb5a6
more setups. chargeswing/dash anims
2021-04-13 20:18:59 -04:00
jshipsey
9a26024acb
alpha attacks
2021-04-13 20:18:59 -04:00
jshipsey
b53e1653f6
initial wield testing
2021-04-13 20:18:58 -04:00
Marcel
4c23be44dd
Merge branch 'socherbyc/assets' into 'master'
...
Updates the Brazilian Portuguese (pt-BR) translation
See merge request veloren/veloren!2118
2021-04-13 17:24:45 +00:00
Yuri Socher Bichibichi
c6dea3acca
Updates the Brazilian Portuguese (pt-BR) translation
2021-04-13 11:56:58 -03:00
Vincent Foulon
a4bd47f340
Support quantity + use Enum for autocompletion + Address comments
2021-04-12 20:07:34 +02:00
Vincent Foulon
0692562533
New Command: "kit" + Removed Command: "debug"
...
Update CHANGELOG.md
Update CHANGELOG.md
2021-04-12 18:53:36 +02:00
Samuel Keiffer
e1020945dd
Merge branch 'aweinstock/combat-music' into 'master'
...
Add combat music transitions based on number of enemies in player radius.
See merge request veloren/veloren!2077
2021-04-12 06:01:19 +00:00
Marcel
e4a67a9ba2
Merge branch 'juliancoffee/update-uk_UA' into 'master'
...
Update localization for Ukrainian
See merge request veloren/veloren!2107
2021-04-12 02:28:56 +00:00
Illia Denysenko
4ac8015ed9
Update localization for Ukrainian
2021-04-12 02:28:55 +00:00
Avi Weinstock
df4f44d946
Address MR 2077 review comments.
2021-04-11 22:08:42 -04:00
Avi Weinstock
7c34a96934
Make fade timings configurable, and stop combat music on death.
2021-04-11 22:08:41 -04:00
Avi Weinstock
f1b022cdee
Add new version of combat soundtrack, and change details of how transitions between tracks work.
2021-04-11 22:08:41 -04:00
Avi Weinstock
5bfdd5f1af
Add combat music transitions based on number of enemies in player radius.
2021-04-11 22:08:40 -04:00
Marcel
54024ce401
Merge branch 'DaforLynx/more-music' into 'master'
...
Adds many new songs; re-adds many old ones; revamped song distribution; reorganized music folders; better biome parameters; accurate day and night; new sounds
See merge request veloren/veloren!2102
2021-04-12 00:43:08 +00:00
DaforLynx
9db290d4ea
Adds many new songs; re-adds many old ones; revamped song distribution; reorganized music folders; better biome parameters; accurate day and night; new sounds
2021-04-12 00:43:08 +00:00
Marcel
5e7adc6767
Merge branch 'trade-help-tooltips' into 'master'
...
Show ctrl-click and shift-click usage in item tooltips during trades.
See merge request veloren/veloren!2101
2021-04-11 22:56:03 +00:00
Rickey Chamblee
8a25ebb59a
Show ctrl-click and shift-click usage in item tooltips during trades.
2021-04-11 22:56:02 +00:00
Marcel
d7a9ab7e23
Merge branch 'master' into 'master'
...
Update and fix zh_CN
See merge request veloren/veloren!2103
2021-04-11 22:56:00 +00:00
law4x
4403cd71a5
Update and fix zh_CN
2021-04-11 22:55:59 +00:00
Marcel
eca27a30b5
Merge branch 'danielduel/PL-local' into 'master'
...
Add/Extend PL locale
See merge request veloren/veloren!2091
2021-04-11 22:55:58 +00:00
BuildTools
c4294d968d
Add/modify Polish translations
2021-04-11 19:10:09 +02:00
Vincent Foulon
a2e92c6715
add new loader + move some images
2021-04-11 16:35:25 +02:00
Snowram
52a53963ec
Lossless compression of UI assets
2021-04-11 16:35:25 +02:00
Vincent Foulon
95f69fea36
remove unused images
2021-04-11 16:35:23 +02:00
Vincent Foulon
2097fbcacd
optimized all images
2021-04-11 16:35:23 +02:00
Vincent Foulon
7128c3d3f6
Asset reorganization + removed some unused and duplicates + reduce size of some images
2021-04-11 16:35:17 +02:00
Monty Marz
6772e71aaa
UI fixes and more
2021-04-11 03:49:47 +00:00
Marcel
99e494976d
Merge branch 'ccm7676/lang_bug_fix' into 'master'
...
fixed the Select a Language text on languages where it was broken
See merge request veloren/veloren!2089
2021-04-10 15:47:28 +00:00
Marcel
e6683bb764
Merge branch 'juliancoffee/uk_UA-localizaion' into 'master'
...
Update localization files for Ukrainian
See merge request veloren/veloren!2090
2021-04-10 14:54:13 +00:00
Illia Denysenko
4717ad25a8
Update localization files for Ukrainian
2021-04-10 14:54:12 +00:00
Marcel
12c3ee440e
Merge branch 'MigraineX/update-es-ES' into 'master'
...
Updated the Spanish (ES) translation
See merge request veloren/veloren!2094
2021-04-10 14:20:40 +00:00
MigraineX
07fd6f16f8
Updated the Spanish (ES) translation
2021-04-10 14:31:57 +02:00
Joshua Yanovski
af94753ad9
Remove panics and unwraps, part 1.
...
Also fixes various other miscellaneous bugs.
2021-04-10 10:03:21 +02:00
Carl Marino
d2151ad76c
fixed the Select a Language text on languages where it was broken
2021-04-09 18:39:53 +02:00
hqurve
be42cc60c4
Added search to crafting and social windows, added i18n support to crafting tabs, fixed social window offset when group open, removed tabs in social window
2021-04-07 20:24:22 +00:00
Vincent Foulon
5e23c164e6
Add missing translations + Add "enemy_killed" text for villagers
2021-04-07 13:26:15 +02:00
James Melkonian
16871208f2
Add topographic option to map
2021-04-06 09:16:17 -07:00
Marcel
187a85e056
Merge branch 'renamenorsk_norskbokmål' into 'master'
...
Rename Norsk to Norsk bokmål
See merge request veloren/veloren!2064
2021-04-06 11:37:54 +00:00
Kim André Moen Bjørkede
2380f9e8c2
Rename Norsk to Norsk bokmål
2021-04-06 11:37:51 +00:00
Marcel
2ed85a2dc0
Merge branch 'tonyvu0605/VietTranslation' into 'master'
...
Started Vietnamese Translation
See merge request veloren/veloren!2059
2021-04-06 10:48:03 +00:00
Joshua Barretto
de9ad0942f
Merge branch 'zesterer/follow-cam' into 'master'
...
Added auto camera setting
See merge request veloren/veloren!2071
2021-04-06 04:23:40 +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
Samuel Keiffer
f79493f7d0
Merge branch 'sam/sceptre-nerfs' into 'master'
...
Sam/sceptre nerfs
See merge request veloren/veloren!2072
2021-04-06 02:41:56 +00:00
Joshua Barretto
60e2ed3e7d
Added auto camera setting
2021-04-05 23:24:31 +01: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
theCow61
b99c02401d
Change to auto walk/glide.
2021-04-05 16:07:17 -05:00
Marcel
88079cfd30
Merge branch 'japanese' into 'master'
...
Add Japanese message translation
See merge request veloren/veloren!2049
2021-04-05 13:38:30 +00:00
Monty Marz
06bbb7f0ff
Crafting Tabs and more item tags
2021-04-04 13:02:27 +00:00
DaforLynx
6734198104
Adds on-hit combat sfx
2021-04-04 03:04:02 +00:00
tonyvu0605
e0dbd5566d
Started Vietnamese Translation
2021-04-03 22:17:57 -04:00
Samuel Keiffer
8d9f63404e
Merge branch 'sam/combat-ratings' into 'master'
...
Tweaks to Combat Rating Calculation
See merge request veloren/veloren!2051
2021-04-03 17:33:34 +00:00
Sam
ca1a93ba21
Actually committed bone staff fix.
2021-04-03 10:26:32 -04:00
Justin Shipsey
debf88e42f
Merge branch 'vfoulon80/refine-item-icons' into 'master'
...
Refine some item icons
See merge request veloren/veloren!2045
2021-04-03 11:19:36 +00:00
Snowram
9a3f6d8261
Substitutes DPS for CR in item tooltip
2021-04-03 00:10:31 -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
9ad5b0f6b7
Changelog. Fixed a few qualities.
2021-04-02 23:04:36 -04:00
Sam
7c8242b5b1
Added unit test to validate contents of loot tables.
2021-04-02 23:04:35 -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
67916b44a7
Staff weapon tiering shuffle.
2021-04-02 23:04:30 -04:00
Sam
a2fc2abf83
Made staff and sceptre balancing sane. Created loot tables for staffs and sceptres.
2021-04-02 23:04:30 -04:00
Sam
2e37cefce5
Created weapon loot tables.
2021-04-02 23:04:29 -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
247004d180
Loot tables can now recursively specify loot tables. Mercahnts broken.
2021-04-02 23:04:25 -04:00
Jun NOGATA
129a3de2eb
Add Japanese message translation
2021-04-03 01:50:10 +09:00
Vincent Foulon
62b2ad80fb
Refine Sewing Set
2021-04-02 18:19:39 +02:00
Vincent Foulon
49be1fd70c
Refine some item icons
2021-04-01 21:46:57 +02:00
Vincent Foulon
dcde8df365
address review comments
2021-04-01 19:13:08 +02:00
Vincent Foulon
c2a8feada5
Add dialogue when the Merchant is busy and randomize some trading dialogues
2021-03-31 19:06:41 +02:00
Snowram
4128f7fe45
Merge branch 'snowram/new-weapons-fix' into 'master'
...
Fix a staff icon, some offset fixes, lower wolf spawn rate
See merge request veloren/veloren!2025
2021-03-30 01:04:37 +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
Snowram
606dd64741
Fix a staff icon, some offset fixes, lower wolf spawn rate
2021-03-30 00:27:03 +02: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
8f3233365d
Improved hit particles
2021-03-29 21:52:05 +01:00
Joshua Barretto
b0acbda236
Improved archery with feedback sfx and particles
2021-03-29 21:52:04 +01:00
Snowram
6adaac8106
Addresses comments
2021-03-29 18:35:12 +02:00
Snowram
b8ac90d049
Changelog, cleanup, clippy
2021-03-29 18:35:10 +02:00
Snowram
508e35ca17
Add several new i18n lines
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
Sam
71ba9b6a54
Mindflayer balance tweaks.
2021-03-29 10:44:46 -04:00
Sam
f6e4626887
Fix emerald sceptre. Remove duplicate asset.
2021-03-28 21:19:01 -04:00
Snowram
c8e191e138
Merge branch 'snowram/new-scepters-starves' into 'master'
...
Add new batch of starves and scepter (by Gemu)
See merge request veloren/veloren!2022
2021-03-29 00:08:19 +00:00
Snowram
5295894105
Add new batch of starves and scepter (by Gemu)
2021-03-29 01:27:55 +02:00
Joshua Barretto
b660c53b4c
Revert to old sky colours for no clouds
2021-03-28 17:07:41 +01:00
Joshua Barretto
34a7667410
Toned down aurora
2021-03-28 17:07:41 +01:00
Treeco
ab596d2ae8
New default world map, default continent scale doubled
2021-03-28 17:07:38 +01:00
Joshua Barretto
f16c2b8b4c
Made clouds adjust to world dimensions correctly
2021-03-28 17:02:17 +01:00
Joshua Barretto
d8117b3b3d
Make caves and rtsim entities scale with map size, more cloud detail
2021-03-28 17:02:16 +01:00
Joshua Barretto
0bed52f63c
Properly simulate atmospheric scattering
2021-03-28 17:01:53 +01:00
Joshua Barretto
d53042c852
Client-side time of day interpolation
2021-03-28 17:01:53 +01:00
Joshua Barretto
19ef00085d
Softer and faster clouds with more verticality
2021-03-28 17:01:51 +01:00
Scott Williams
ef43d29627
Fix husk drops in miniboss rooms.
2021-03-28 10:39:20 +00:00
Sam
f117a57083
Switched to using ForceUpdate to forcefully update the client position after a blink
2021-03-27 21:33:45 -04:00
Monty
345ef1ca22
decay display for groups and overhead bars
2021-03-27 21:05:17 -04:00
jshipsey
558c82ee54
flayer anims
2021-03-27 21:05:16 -04:00
Sam
b0b114a7f8
Balance tweaks
2021-03-27 21:05:15 -04:00
Monty Marz
345b725478
decayed health texture
2021-03-27 21:05:14 -04:00
Monty Marz
cc70560027
WIP animation
2021-03-27 21:05:13 -04:00
Sam
1edf79d109
Moved all legendaries to mindflayer loot table.
2021-03-27 21:05:12 -04:00
Sam
6c611d632a
Mindflayer now only summons minions at set thresholds of health.
2021-03-27 21:05:11 -04:00
Sam
5966b1541d
Mindflayer can now lifesteal off of its own minions
2021-03-27 21:05:11 -04:00
Sam
50e832b6d0
Mindflayer summons husks instead of dogs now
2021-03-27 21:05:10 -04:00
Snowram
39c8efe11f
Adds husk npc
2021-03-27 21:05:09 -04:00
Sam
f9835e78da
Pets no longer drop loot on death. Code to determine targeting of pets is less hacky and now takes into account alignment of their owner.
2021-03-27 21:05:07 -04:00
Sam
8e4aeff705
Improved mindflayer AI. Tweake some abilities.
2021-03-27 21:05:07 -04:00
Sam
720482d994
Gave mindflayer AI.
...
Fixed particles and made them sync across network.
2021-03-27 21:05:06 -04:00
Sam
a5b7477e96
Added summon minions ability to mindflayer
2021-03-27 21:05:05 -04:00
Sam
30da614e89
Added dimensional door ability for mindflayer
2021-03-27 21:05:05 -04:00
Sam
f1156c9ce5
Added necrotic vortex attack to mindflayer
2021-03-27 21:05:03 -04:00
Sam
0d3795112c
Added cursed flame attack to mindflayer
2021-03-27 21:05:03 -04:00
Marcel
79cc3af058
Merge branch 'swilliams/character-randomization-fix' into 'master'
...
Character Creation Randomization Fix
See merge request veloren/veloren!2004
2021-03-27 15:58:34 +00:00
Scott Williams
9ca0388561
Character Creation Randomization Fix
2021-03-27 15:58:34 +00:00
Avi Weinstock
4b62a99ed9
Improve econsim's handling of diamond prices by lowering the implied homicide rate.
2021-03-27 10:50:16 -04:00
Marcel
da5c73c84b
Merge branch 'refactor-login' into 'master'
...
refactor handling of duplicate login #1015
Closes #1015
See merge request veloren/veloren!1992
2021-03-27 13:49:09 +00:00
Sam
6c2de7d70e
Fixed boost having ridiculous velocity.
2021-03-26 16:11:25 -04:00
Scott Williams
aa9180b20f
Moved rugged armour to cloth_item
2021-03-26 16:51:43 +00:00
Scott Williams
d35475eaef
Added leather scraps recipe
2021-03-26 16:44:38 +00:00
aljazerzen
0ea102dc9c
refactor handling of duplicate login
2021-03-25 12:33:56 +01:00
Lippy13
ff2583b3b9
Add missing seashells to the sprite manifest
2021-03-25 04:37:27 +00:00
Avi Weinstock
4ec6b43693
Add a vertical camera clamp option and toggle to voxygen.
2021-03-23 18:22:32 -04:00
Samuel Keiffer
8ed7da7c49
Merge branch 'master' into 'master'
...
Update short_1.ron to make eligible for cloth scrap recipe
See merge request veloren/veloren!1981
2021-03-23 19:29:56 +00:00
steanne
818aaed32a
Update short_1.ron to make eligible for cloth scrap recipe
2021-03-23 18:16:30 +00:00
Sam
31f4ef684d
Tweaked numbers
2021-03-22 17:26:55 -04:00
Justin Shipsey
f57af6f776
Merge branch 'slipped/animtweaks' into 'master'
...
airship movement bits
See merge request veloren/veloren!1967
2021-03-22 08:49:04 +00:00
Joshua Barretto
6690854687
Merge branch 'zesterer/better-particle-emission' into 'master'
...
Smoother particle emission for moving objects
See merge request veloren/veloren!1965
2021-03-22 06:15:20 +00:00
Samuel Keiffer
1374900928
Merge branch 'sam/combat-fixes' into 'master'
...
Fixes gaining combo by shooting loot bag
See merge request veloren/veloren!1953
2021-03-22 02:01:22 +00:00
jshipsey
31747d8ff1
airship movement bits
2021-03-21 21:43:49 -04:00
