Sam
|
398370ca51
|
Changed lifesteal beam particles to look better.
Warding aura now just provides damage reduction instead of invulnerability. Also with a longer duration and less movespeed penalty.
|
2021-03-09 17:59:41 -05:00 |
|
Sam
|
c6a222340e
|
Particles for lifesteal beam. Changed how frontend recognized beams.
|
2021-03-09 17:59:39 -05:00 |
|
Marcel
|
ee0ab197da
|
Merge branch 'updated_spanish_es_strings' into 'master'
Updated strings Added missing translations in Spanish es_ES and retrieving localized text
See merge request veloren/veloren!1866
|
2021-03-09 12:59:03 +00:00 |
|
tukilo
|
cea895ea24
|
Updated strings Added missing translations in Spanish es_ES and retrieving localized text
|
2021-03-09 12:30:53 +01:00 |
|
Adam Blanchet
|
16b66f9cd6
|
Add reset button to graphics settings
|
2021-03-08 18:48:38 +01:00 |
|
Marcel
|
e29964ead1
|
Merge branch 'sarrakitty/fireworks' into 'master'
added a white firework
See merge request veloren/veloren!1856
|
2021-03-07 18:37:35 +00:00 |
|
Joshua Barretto
|
36d20e6990
|
Better docs, faster terrain meshing
|
2021-03-07 14:25:07 +00:00 |
|
Joshua Barretto
|
9910398917
|
Fixed snow biome trees
|
2021-03-07 14:25:07 +00:00 |
|
Joshua Barretto
|
0cbdc2b1b7
|
Better tree names
|
2021-03-07 14:25:07 +00:00 |
|
Joshua Barretto
|
db573f6b2d
|
Turn giant trees into proper sites
|
2021-03-07 14:25:07 +00:00 |
|
Monty
|
b6ac4e46fb
|
tree icon UI works and hover icon
|
2021-03-07 14:25:07 +00:00 |
|
Joshua Barretto
|
a54a3da102
|
Added tree map icon
|
2021-03-07 14:25:05 +00:00 |
|
Joshua Barretto
|
d4ce69df99
|
Static light flickering
|
2021-03-07 14:25:02 +00:00 |
|
Joshua Barretto
|
1d16f14dd5
|
Small fixes
|
2021-03-07 14:25:02 +00:00 |
|
Joshua Barretto
|
331375fd8f
|
Adjusted static lighting
|
2021-03-07 14:25:02 +00:00 |
|
Joshua Barretto
|
fe2479ee4c
|
Better LoD water prediction
|
2021-03-07 14:25:01 +00:00 |
|
Monty
|
8214c9df82
|
PoI icon
|
2021-03-07 14:25:01 +00:00 |
|
Joshua Barretto
|
31832e1245
|
Fixed wall leaking with dynamic light ambiance
|
2021-03-07 14:25:01 +00:00 |
|
Joshua Barretto
|
aabe1d7cfd
|
Point light ambiance for less harsh shadows
|
2021-03-07 14:25:01 +00:00 |
|
Joshua Barretto
|
100cafa91b
|
Directional baked lights for figures
|
2021-03-07 14:25:01 +00:00 |
|
Joshua Barretto
|
0c302bb020
|
Lanterns in trees
|
2021-03-07 14:25:01 +00:00 |
|
Joshua Barretto
|
185b1c3053
|
Specialised giant trees
|
2021-03-07 14:25:01 +00:00 |
|
Joshua Barretto
|
7d526da735
|
Experimental giant mother trees
|
2021-03-07 14:25:01 +00:00 |
|
Sarra
|
db3bc1b9bb
|
added a white firework
|
2021-03-07 03:48:50 -05:00 |
|
Imbris
|
e724ac072e
|
Merge branch 'sarrakitty/fireworks' into 'master'
made firework explosions colorful
See merge request veloren/veloren!1851
|
2021-03-05 17:48:56 +00:00 |
|
Snowram
|
e2d4799f7d
|
Merge branch 'vfoulon80/convert-fr-translations' into 'master'
Split the french translation into multiple files
See merge request veloren/veloren!1672
|
2021-03-05 12:23:08 +00:00 |
|
Vincent Foulon
|
6e66cecce7
|
Split the french translation into multiple files
|
2021-03-05 12:23:08 +00:00 |
|
Sarra
|
4284ce0411
|
made firework explosions colorful
|
2021-03-05 01:22:29 -05:00 |
|
Marcel
|
cb305536e8
|
Merge branch 'vfoulon80/skilltree-icons' into 'master'
implement the new skilltree icons
See merge request veloren/veloren!1794
|
2021-03-04 18:37:33 +00:00 |
|
Vincent Foulon
|
fb953cc7f4
|
implement the new skilltree icons
|
2021-03-04 18:37:32 +00:00 |
|
Snowram
|
2b7b9f887b
|
Fixes leather sets
|
2021-03-02 19:28:29 +01:00 |
|
Justin Shipsey
|
9ad8804b60
|
Merge branch 'armor-org' into 'master'
armor org
See merge request veloren/veloren!1835
|
2021-03-02 01:29:46 +00:00 |
|
jshipsey
|
308045cfc9
|
final asset corrections, fix glider anim
|
2021-03-01 17:37:47 -05:00 |
|
Samuel Keiffer
|
0497a437a4
|
Merge branch 'sam/invulnerability-buff' into 'master'
Invulnerability Buff
Closes #965
See merge request veloren/veloren!1834
|
2021-03-01 05:46:46 +00:00 |
|
jshipsey
|
8944115f8e
|
more asset organization
|
2021-02-28 22:18:43 -05:00 |
|
Samuel Keiffer
|
537efdd47e
|
Merge branch 'aweinstock/trade-requestitem' into 'master'
During a trade, allow requesting items from the counterparty's inventory...
See merge request veloren/veloren!1829
|
2021-03-01 02:39:36 +00:00 |
|
Sam
|
6ab4e2264e
|
Buff icon
|
2021-02-28 17:31:35 -05:00 |
|
Sam
|
531c38c3ad
|
Factored formatting of buff text out to a single function.
|
2021-02-28 16:04:33 -05:00 |
|
Imbris
|
b7bd0306e6
|
Merge branch 'Lerg/Issue_#976' into 'master'
Issue #976 Some inputs are missing the ability to be rebound
See merge request veloren/veloren!1832
|
2021-02-28 18:23:30 +00:00 |
|
Justin Shipsey
|
13df691f69
|
Merge branch 'heydabop/966-controller-y-invert' into 'master'
#966 - Setting to invert controller Y axis
See merge request veloren/veloren!1817
|
2021-02-28 18:02:04 +00:00 |
|
Lerg
|
94bd1f2605
|
Issue #976 Some inputs are missing the ability to be rebound because they are missing from the input iterator
|
2021-02-28 19:02:32 +03:00 |
|
Avi Weinstock
|
7e458ecd40
|
During a trade, allow requesting items from the counterparty's inventory (prequisite for NPC trading).
|
2021-02-28 10:13:49 -05:00 |
|
Monty Marz
|
e5273e3a8e
|
reroute the F1 key to open the controls settings, removed loading screen tips about levels and the stats button
|
2021-02-27 19:02:26 +00:00 |
|
jshipsey
|
16720a6826
|
weapon/manifest tweaks
|
2021-02-27 10:44:55 -05:00 |
|
jshipsey
|
0a353576dc
|
address comments
|
2021-02-27 01:42:47 -05:00 |
|
Snowram
|
17112926e7
|
Adds harvester npc
|
2021-02-27 01:42:47 -05:00 |
|
jshipsey
|
51bc74b2a5
|
visual weapon variation, adjust minotaur dash, keyframed golem quake
|
2021-02-27 01:42:47 -05:00 |
|
jshipsey
|
16a44cd532
|
minotaur moves, added claygolem
|
2021-02-27 01:42:47 -05:00 |
|
jshipsey
|
e06ebf3507
|
initial balance
|
2021-02-27 01:42:47 -05:00 |
|
Snowram
|
858fbe1a6c
|
Adds yeti npc
|
2021-02-27 01:42:46 -05:00 |
|
Snowram
|
1b9815dc34
|
Adds 3 new npcs, tusk ram new design
|
2021-02-27 01:42:46 -05:00 |
|
Sam
|
53b0ba286a
|
Ice particles for Wendigo
|
2021-02-27 01:42:46 -05:00 |
|
jshipsey
|
ce3b2141e1
|
theropod retrofit, some more moves
|
2021-02-27 01:42:46 -05:00 |
|
jshipsey
|
5792faa992
|
some new moves, combine biped weapons into one file
|
2021-02-27 01:42:46 -05:00 |
|
jshipsey
|
57d5e90ddd
|
full bipedsmall armor swaps
|
2021-02-27 01:42:46 -05:00 |
|
Sam
|
df70976ff5
|
Fixed particles.
|
2021-02-27 01:42:46 -05:00 |
|
jshipsey
|
cb59c8017e
|
anim tweaks, more loadout setup
|
2021-02-27 01:42:46 -05:00 |
|
Timo Kösters
|
a4513fe09d
|
Improve particles
|
2021-02-27 01:42:46 -05:00 |
|
jshipsey
|
aa4237b019
|
BL improvements, various fixes
|
2021-02-27 01:42:45 -05:00 |
|
jshipsey
|
0dc8b2e482
|
rendering
|
2021-02-27 01:42:45 -05:00 |
|
jshipsey
|
ca3248cc93
|
new dungeon setups, new npcs, weapon specific loadouts, anims
|
2021-02-27 01:42:45 -05:00 |
|
jshipsey
|
ac16a8900d
|
bow
|
2021-02-27 01:42:45 -05:00 |
|
jshipsey
|
66664f3f89
|
the stabs
|
2021-02-27 01:42:45 -05:00 |
|
jshipsey
|
6a57dd25d0
|
wielding
|
2021-02-27 01:42:45 -05:00 |
|
jshipsey
|
31208e29ee
|
run anim tweaks
|
2021-02-27 01:42:45 -05:00 |
|
unknown
|
559ece5ede
|
More npcs work
|
2021-02-27 01:42:45 -05:00 |
|
unknown
|
6f18d16aa2
|
Add new quadmeds npcs with rough offsets
|
2021-02-27 01:42:44 -05:00 |
|
Snowram
|
f48fea57f4
|
Sahagin, Adlet npcs
|
2021-02-27 01:42:43 -05:00 |
|
jshipsey
|
7cf723bb9d
|
gnome
|
2021-02-27 01:42:43 -05:00 |
|
jshipsey
|
266986626d
|
biped_small setup
|
2021-02-27 01:42:43 -05:00 |
|
Snowram
|
1172c2f2c3
|
Merge branch 'Sarrakitty/OceanFlora' into 'master'
added coral reefs, kelp forests, and seagrass
See merge request veloren/veloren!1819
|
2021-02-27 01:52:33 +00:00 |
|
Sarra
|
02eb76416f
|
tweaking coral models and seagrass spawns
|
2021-02-25 23:39:41 -05:00 |
|
Samuel Keiffer
|
8e07174c1d
|
Merge branch 'aweinstock/coin-item' into 'master'
Add a coin item and make amounts visible on dropped items.
See merge request veloren/veloren!1821
|
2021-02-26 04:17:12 +00:00 |
|
Avi Weinstock
|
7d2e8f72eb
|
Add a coin item and make amounts visible on dropped items.
|
2021-02-25 21:31:30 -05:00 |
|
Sarra
|
1d4b8d4d99
|
correcting formatting and removing commented out code that wasn't supposed to be there
|
2021-02-25 20:41:57 -05:00 |
|
Snowram
|
2bab3cdced
|
Fixes weapons model and icon offsets
|
2021-02-26 02:37:59 +01:00 |
|
Sarra
|
f39f5ab5d3
|
added coral reefs, kelp forests, and seagrass
|
2021-02-25 05:33:18 -05:00 |
|
Sam
|
017e037e69
|
Weapon offsets in humanoid manifest
|
2021-02-24 21:52:32 -05:00 |
|
Sam
|
b0b4a07b9e
|
Bows
|
2021-02-24 20:37:43 -05:00 |
|
Sam
|
84a5b3dcc5
|
Axes
|
2021-02-24 19:11:41 -05:00 |
|
Sam
|
ee5c9d78ca
|
Swords
|
2021-02-24 18:54:06 -05:00 |
|
heydabop
|
d4e3a3f29f
|
#966 - Add setting to invert controller camera Y axis
|
2021-02-24 10:39:44 -06:00 |
|
Snowram
|
914266c705
|
Merge branch 'nwildner/pt_BR_trade-updates' into 'master'
pt br trade updates
See merge request veloren/veloren!1810
|
2021-02-23 23:21:30 +00:00 |
|
Nícolas Wildner
|
e4f8a9ed6c
|
pt br trade updates
|
2021-02-23 23:21:30 +00:00 |
|
Snowram
|
14c252d8b2
|
Merge branch 'snowram/turret' into 'master'
Object animation, beam fixes, turret implementation
See merge request veloren/veloren!1805
|
2021-02-23 20:16:56 +00:00 |
|
Imbris
|
f33d3873b4
|
Merge branch 'aweinstock/modular-weapon-rigging' into 'master'
Support modular weapon voxel meshes being made by assembling their components.
See merge request veloren/veloren!1806
|
2021-02-23 00:45:26 +00:00 |
|
Avi Weinstock
|
c3ac8a1b51
|
Support modular weapon voxel meshes being made by assembling their components.
|
2021-02-23 00:45:26 +00:00 |
|
Marcel
|
72bd0f42fc
|
Merge branch 'xMAC94x/prot_improvements' into 'master'
xMAC94x/prot_improvements
See merge request veloren/veloren!1796
|
2021-02-22 22:47:43 +00:00 |
|
Justin Shipsey
|
56f8e66d5d
|
Merge branch 'steanne-master-patch-91284' into 'master'
Update _manifest.ron for minor typos in villager statements
See merge request veloren/veloren!1807
|
2021-02-22 22:10:38 +00:00 |
|
Snowram
|
684961b15c
|
Adds look_dir to anims, humanoid heads pivot fixes
|
2021-02-22 20:00:06 +01:00 |
|
Marcel Märtens
|
3f5c64bec0
|
Client::new can now resolve DNS requests, better networking error messages
|
2021-02-22 17:35:19 +01:00 |
|
steanne
|
838a0d8928
|
Update _manifest.ron for minor typos in villager statements
|
2021-02-22 00:04:02 +00:00 |
|
Snowram
|
4078eeb877
|
Various fixes to object animation, cleanup
|
2021-02-21 19:56:46 +01:00 |
|
Snowram
|
775224983b
|
Initial turret implementation
|
2021-02-21 18:23:54 +01:00 |
|
Samuel Keiffer
|
479cf9fc4e
|
Merge branch 'sam/dual-wielding' into 'master'
Dual wielding backend
See merge request veloren/veloren!1787
|
2021-02-20 05:12:17 +00:00 |
|
Sam
|
eaf3e02e39
|
Addressed comments
Fixed audio test
|
2021-02-19 19:55:23 -05:00 |
|
Sam
|
cfadd6da04
|
Added 1h swords.
|
2021-02-19 19:33:26 -05:00 |
|
Sam
|
d5ccc33abc
|
Factored out duplicate code into closures, consolidated ability handling logic to a single function.
|
2021-02-19 18:45:48 -05:00 |
|
Sam
|
411b4083b1
|
Added 1h hammers.
Fixed audio tests.
|
2021-02-19 17:30:24 -05:00 |
|
Sam
|
50cbe42b07
|
Added one-handed axes.
|
2021-02-19 17:30:23 -05:00 |
|