Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,040 Commits 151 Branches 18 Tags 2.1 GiB
b8a27f493c
Commit Graph

1434 Commits

Author SHA1 Message Date
Monty Marz
f9d4d744a0 Better group frame placement 2020-12-10 21:31:19 +01:00
Snowram
ecdbd1c5d6 Makes consumables heal faster 2020-12-10 18:06:32 +01:00
Pfauenauge90
6d1bae67d0 adjust mindflayer strength, fix en translation, update es_la translation, fix undead eyes 2020-12-10 18:06:31 +01:00
Monty Marz
f2ba7cc297 add baobabs, fix map difficulty, make mushrooms lootable 2020-12-10 18:06:29 +01:00
Justin Shipsey
4bdd84ab46 Merge branch 'snowram/fishes' into 'master' 
Add fishes

See merge request veloren/veloren!1577
 2020-12-09 02:59:55 +00:00
Entropy
98688651b5 changed kickers to use 3 leather 2020-12-08 16:27:21 -08:00
Snowram
526d3bd035 Vacations are never over 2020-12-08 23:03:40 +01:00
Snowram
f94a4ec90d Improves fish_small, new npc 2020-12-08 23:03:39 +01:00
Snowram
72d73ecd38 Initial fish work 2020-12-08 23:03:38 +01:00
Sam
490915d384 Modified how most abilites that could scale were scaled. 2020-12-07 22:00:24 -06:00
Joshua Barretto
b37be14b86 Added cave mushrooms 2020-12-05 18:00:29 +00:00
Joshua Barretto
a5c37262dd Better aurora 2020-12-05 11:20:25 +00:00
Joshua Barretto
e413392694 Better mist access 2020-12-05 11:20:25 +00:00
James Melkonian
71303fecfd Aura System and Campfire Health Regen 2020-12-04 22:24:56 +00:00
iOddishGX
31e2e93786 Lowered the energy cost from 80 to 40 
Increased the healing multiplier
Lowered the damage output
Increased the radius
Made the projectile slightly faster
 2020-12-01 20:01:24 +00:00
Marcel
a431fe3fad Merge branch 'sam/dehardcode-energy' into 'master' 
Graying out skills with insufficient energy no longer dependent on hard-coded values

Closes #824

See merge request veloren/veloren!1560
 2020-11-27 16:27:09 +00:00
Samuel Keiffer
352917d9cb Graying out skills with insufficient energy no longer dependent on hard-coded values 2020-11-27 16:27:09 +00:00
Snowram
b316e9aa7c Updates ru_RU translation 2020-11-26 22:59:39 +01:00
Sam
6a6260daa1 Weapon combat fixes: 
- Modified energy and speed scaling of sword, axe, and hammer combo melees.
 - Nerfed bow basic attack knockback. Buffed bow damage and energy regen.
 - Corrected xp values for theropods. Removed unnecessary function for xp increase per level.
 - Guards no longer flee at low health.
 - Buffed sword spin.
 - Nerfed axe spin and sword dash moderately.
 - Dash now takes a little time to reach full speed. Sword M2 and hammer M1 damage values tweaked.
 2020-11-26 09:15:45 +01:00
Marcel
103c2302b0 Merge branch 'azymohliad/add-ukrainian' into 'master' 
Added Ukrainian translation

See merge request veloren/veloren!1555
 2020-11-25 17:21:32 +00:00
Andrii Zymohliad
733a471090 Added Ukrainian translation 2020-11-25 17:21:32 +00:00
Monty Marz
e7d27a2c21 fmt 
cleanup
 2020-11-25 16:53:48 +00:00
Yusuf Bera Ertan
3c887315ae
update Turkish translations 2020-11-25 15:46:56 +03:00
DaforLynx
6783e13125 Added two new songs along with edits to the .ron 
comma
 2020-11-25 08:25:40 +00:00
Marcel
d1a9264a99 Merge branch 'angryanimals' into 'master' 
animal attacks

See merge request veloren/veloren!1542
 2020-11-25 01:33:20 +00:00
Sam
5461f002fe Correct beam offsets used. Fix scaling damage on hammer M1. Add can_strafe function to body. 2020-11-24 17:56:39 -06:00
Sam
8ab2d2524a Changed default main and secondary tool from Some(empty) to None. 
weapon fixes
 2020-11-24 17:49:04 -06:00
jiminycrick
aad9734055 Agent tactic refactoring 
Lower theropods spawns

clippy, changelog

review response
 2020-11-24 17:49:00 -06:00
jiminycrick
1cf0aff5ef More ai work 
balance

Lavadrake AI tweaks

feedback tweaks
 2020-11-24 17:48:54 -06:00
jshipsey
d10dd83e5f theropods in world, small tweaks 2020-11-24 17:48:51 -06:00
jshipsey
f411ff7e04 bunch of animations and more attacks 2020-11-24 17:48:51 -06:00
jshipsey
6f72e68ad6 hoof attack, tweaks 2020-11-24 17:48:50 -06:00
jiminycrick
1337fdaa57 Generalize rotation time 2020-11-24 17:48:49 -06:00
jshipsey
a27b086401 placeholder for charge animal, animated leapmelee, small fixes 2020-11-24 17:48:49 -06:00
jiminycrick
a1aa3efd29 Moved hit timer to charged melee and adjusted for tail slap 2020-11-24 17:48:48 -06:00
jshipsey
1f59ef92d8 species specific speeds, more animation 2020-11-24 17:48:48 -06:00
jiminycrick
6b534729be Initial AI for quad low 2020-11-24 17:48:47 -06:00
jshipsey
c07d8df58b assigning weapons, building animations 
ability mapping
 2020-11-24 17:48:43 -06:00
jiminycrick
793d6095b3 Maneater AI 
Rebase fixes and maneater AI
 2020-11-24 17:48:38 -06:00
jshipsey
e3e513cc11 initial quadlow ranged work 2020-11-24 17:48:27 -06:00
jshipsey
ae06016e9a Wolf attacks and ai. 
initial wolf dash testing

tool.rs

Wolf attack AI
 2020-11-24 17:48:20 -06:00
Joshua Barretto
46dc49bc0a Fixed bit-twiddling colour bug 2020-11-24 18:44:41 +00:00
Christof Petig
a3db20c9d6 Show caves in map 2020-11-23 19:05:17 +01:00
Joshua Barretto
e770e88af5 Better town colour 2020-11-23 10:58:22 +00:00
Monty Marz
d069eb9a57 street lamp particles, ground fire bowl, misc fixes 2020-11-23 10:58:21 +00:00
Joshua Barretto
e461fbd951 Make chimneys glow 2020-11-23 10:58:21 +00:00
Joshua Barretto
4bb0da24b6 Addressed review comments 2020-11-23 10:57:57 +00:00
Snowram
0737c71749 Adds new cultist armors, defines loadouts for dungeons 2020-11-23 10:57:57 +00:00
Joshua Barretto
8fd2e4537d Addressed review comments 2020-11-23 10:57:57 +00:00
Monty Marz
8e18b26031 Update street_lamp.vox 2020-11-23 10:57:57 +00:00
Joshua Barretto
bb9e593a44 Fixed glow AO 2020-11-23 10:57:57 +00:00
Joshua Barretto
b4e3dbc719 Added glow tint 2020-11-23 10:57:57 +00:00
Joshua Barretto
d7bbceca2d Added light/glow map sample interpolation for entities 2020-11-23 10:57:56 +00:00
Joshua Barretto
27e7fd0727 Preserved light/glow maps to prevent sprites/entities being lit when they shouldn't be 2020-11-23 10:57:56 +00:00
Joshua Barretto
51d1a2ecff Added glow 2020-11-23 10:57:56 +00:00
Joshua Barretto
a0f0417f8f Fixed close cloud sampling issue 2020-11-23 10:57:56 +00:00
Monty Marz
099dfc959f translations, fixes 2020-11-23 10:57:56 +00:00
Monty Marz
5b907ede9e fix hints 2020-11-23 10:57:55 +00:00
Joshua Barretto
058908f603 Made flamethrower and healing staff emit light on use 2020-11-23 10:57:55 +00:00
Monty Marz
97934d1070 map fixes 2020-11-23 10:57:55 +00:00
Joshua Barretto
5930ca4a59 Temporarily make particles opaque to avoid depth-related rendering problems 2020-11-23 10:57:55 +00:00
Joshua Barretto
7eb437501d Fixed various particle issues 2020-11-23 10:57:55 +00:00
Joshua Barretto
0f2e7434fc Sun, brightness, and gamma adjustments 2020-11-23 10:57:55 +00:00
Joshua Barretto
bcc220804a Added exposure to settings 2020-11-23 10:57:55 +00:00
Joshua Barretto
062ce4b158 Resolved or patches various water shader issues 2020-11-23 10:57:16 +00:00
Joshua Barretto
1e7b9fa9b5 Resolved or patches various water shader issues 2020-11-23 10:57:16 +00:00
Joshua Barretto
86571c9e2e Partially fixed mist 2020-11-23 10:57:15 +00:00
Joshua Barretto
aa59d66a76 Fixed many map problems, re-added surface mist 2020-11-23 10:57:15 +00:00
Joshua Barretto
579bdcf10e Forest soil undulation, better acadia placement 2020-11-23 10:57:15 +00:00
Monty Marz
99b3a4465a WIP map zooming and dragging 2020-11-23 10:57:15 +00:00
Joshua Barretto
ef03137c65 Better water, shadows, clouds 2020-11-23 10:57:15 +00:00
Joshua Barretto
be1fb5b5d2 Shader quality tweaks 2020-11-23 10:57:15 +00:00
Joshua Barretto
0e8a14250f Minor emissions tweaks 2020-11-23 10:57:15 +00:00
Joshua Barretto
42c6142ec6 Added occasional sky emission at night 2020-11-23 10:57:15 +00:00
Joshua Barretto
e09c22f9cc Altered splay to avoid strange LoD shape 2020-11-23 10:45:02 +00:00
Monty Marz
c825e33f1a map icon options WIP 2020-11-23 10:45:02 +00:00
Joshua Barretto
34987c1654 Don't do gamma twice 2020-11-23 10:45:02 +00:00
Joshua Barretto
271c1e29a5 Adjusted sun/moon for HDR 2020-11-23 10:45:02 +00:00
Joshua Barretto
1d031538f9 Added HDR 2020-11-23 10:45:02 +00:00
Joshua Barretto
49df604de0 Better scattering and scatter (of both varieties) 2020-11-23 10:45:02 +00:00
Joshua Barretto
ee65b4fb17 Improved cloud quality by improving sun access heuristic 2020-11-23 10:45:02 +00:00
Monty Marz
1864f4626c map icons 2020-11-23 10:45:01 +00:00
Joshua Barretto
de685b00b2 Improved water pathfinding 2020-11-23 10:45:01 +00:00
Joshua Barretto
b352ef5d55 Terrain pop-in, fixed agent pathfinding in water 2020-11-23 10:45:01 +00:00
Joshua Barretto
717fd88565 Experimental dissolve VD 2020-11-23 10:45:01 +00:00
Joshua Barretto
6adfa547db Added site icons to main map 2020-11-23 10:45:01 +00:00
Joshua Barretto
d4d4f17d3c Added world map size icons 2020-11-23 10:45:01 +00:00
Joshua Barretto
c906764889 Better LoD 2020-11-23 10:45:01 +00:00
Monty Marz
f448212515 Update leather_blue-0.vox 2020-11-23 10:45:01 +00:00
Monty Marz
225756b011 npc armour 2020-11-23 10:45:01 +00:00
Monty Marz
427f431ac8 Duh. 2020-11-23 10:45:00 +00:00
Joshua Barretto
99a881f349 Added entity simulation to rtsim, reification, assimilation 2020-11-23 10:44:59 +00:00
Joshua Barretto
2b5e09e32e Better high-quality clouds 2020-11-23 10:38:00 +00:00
Joshua Barretto
c3cedd4ddf Improved cloud quality 2020-11-23 10:37:59 +00:00
Monty Marz
9e290d59ae more quirky dry assets 2020-11-23 10:37:59 +00:00
Knarkzel
7a917f87e1 added norwegian 2020-11-20 16:49:32 +01:00
jiminycrick
9272eee55b Switched out wind sfx 2020-11-18 17:07:40 -08:00
Snowram
d98bfa72ad Improves bipedlarge and theropod anims, balance tweaks 2020-11-19 00:56:50 +01:00
Snowram
b48de84f8c Adds 3 new npcs 2020-11-19 00:53:17 +01:00
Snowram
44fe398ba3 Adds 2 new npcs, some models tweaks 2020-11-19 00:53:13 +01:00
Snowram
42d2108c39 Adds mindflayer npc 2020-11-19 00:53:09 +01:00
Snowram
9bfccd42d3 Adds new animals 2020-11-19 00:53:02 +01:00
jiminycrick
2d2f267907 Addressed comments and fixed pipeline 2020-11-18 13:31:13 -08:00
jiminycrick
3b47add55a Fully move sfx away from ECS event bus 2020-11-18 13:31:13 -08:00
jiminycrick
b3aa454f8e Initial work to move combat sfx to outcomes 2020-11-18 13:31:12 -08:00
jiminycrick
a9711eea01 Beginning to address comments 2020-11-18 13:31:12 -08:00
jiminycrick
c44a9092d3 Biome definition tweaks and more sfx 2020-11-18 13:31:12 -08:00
jiminycrick
a684bc90fd Quadraped footsteps and songs in biomes 2020-11-18 13:31:12 -08:00
jiminycrick
e1fcb3744e Comment out audio device picker 2020-11-18 13:31:12 -08:00
jiminycrick
d47e0bbb73 Getting merge ready minus device picker 2020-11-18 13:31:12 -08:00
jiminycrick
695cc7f5cb Broken wind implementation 2020-11-18 13:31:12 -08:00
jiminycrick
9b759efe41 Snow footsteps 2020-11-18 13:31:12 -08:00
jiminycrick
09a1974974 River water sfx 2020-11-18 13:31:12 -08:00
jiminycrick
d0bd5118bf Made biome probabilities neater 2020-11-18 13:31:12 -08:00
jiminycrick
e880654f2e Probability for biome play 2020-11-18 13:31:12 -08:00
jiminycrick
c8d79b0b0e Dungeon and cave specific music 2020-11-18 13:31:12 -08:00
jiminycrick
0a9f1ee11c Remove ambient channel system in favor of sfx system 2020-11-18 13:31:12 -08:00
jiminycrick
39d4ee8a96 Owls, campfires, and better bird sfx handling 2020-11-18 13:31:12 -08:00
jiminycrick
c6a443ac0f fixed false audio track lengths 2020-11-18 13:31:12 -08:00
jiminycrick
3169562a80 Night time sfx and swimming 2020-11-18 13:31:12 -08:00
jiminycrick
aa6b7cbb65 Bird calls from trees 2020-11-18 13:31:12 -08:00
jiminycrick
9e790f6cac Really broken block sfx pushed so others can see 2020-11-18 13:31:12 -08:00
jiminycrick
3473347742 Sfx from blocks 2020-11-18 13:31:12 -08:00
jiminycrick
0689630d98 Fading music/ambient sounds decently upon biome transition 2020-11-18 13:31:11 -08:00
jiminycrick
b5aea464f3 Switch music at biome transitions 2020-11-18 13:31:11 -08:00
jiminycrick
46d3f6f6d2 Initial biome specific music and ambient sound channel 2020-11-18 13:31:11 -08:00
Knarkzel
e0265012e8 added to changelog 2020-11-16 17:01:55 +01:00
Knarkzel
e0a814b3f8 dont allow spam op hammer when stamina is 0 2020-11-16 17:00:04 +01:00
Joshua Barretto
171ef1d7b9 Upscaling support 2020-11-15 22:18:35 +00:00
Imbris
03c96a7c7b Properly use localization specified fonts, fix swedish translation by adding other fonts to the font mapping list 2020-11-14 21:31:31 -05:00
Sam
050ad82e55 Abilities are now loaded from .ron files. 2020-11-12 21:24:34 -06:00
Sam
4c6ee4b161 Created manifest file to tie abilities to a particular weapon kind. 2020-11-12 21:24:33 -06:00
Sam
770aaf6b93 Added projectile constructor. Removed a bunch of cloning. 2020-11-12 21:24:32 -06:00
Sam
abf7301a89 Changed how buffs were constructed on projectiles. 2020-11-12 21:24:32 -06:00
Sam
f4244ecbaf Added ron files for unique and WIP tools. 2020-11-12 21:24:31 -06:00
Sam
a4bfe07fbc Created ron files for abilities of the base 6 weapons. 2020-11-12 21:24:31 -06:00
Snowram
fe977f0a6c Adds a speed stat to weapons 2020-11-11 22:03:53 +01:00
Imbris
865482d768 ui: Improve login info banner gradient, smallify things, put login menu quit button at the bottom 2020-11-11 03:02:51 -05:00
Imbris
b84815cc0b Shink file size of some image assets 2020-11-11 03:02:51 -05:00
Imbris
eec6d68585 Update changelog 2020-11-11 03:02:49 -05:00
Imbris
584824d405 Tweak scrollbar in char select screen to look nicer, fix warnings, remove old ui code, add character loading/deleting/creating/error info popups 2020-11-11 03:02:23 -05:00
Imbris
3b664d2efb Fix tooltip border images, fade tooltips properly, improve tooltip positioning 2020-11-11 03:02:22 -05:00
Imbris
0361272746 Update to reflect changes in master ui: switched daggers with sceptre, added background at the bottom of the loading screen, added randomize button in the char creation screen 2020-11-11 03:02:22 -05:00
Yusuf Bera Ertan
bae7f56393 add padding to language select and server select menu buttons so that the scrollbar doesn't overlap them 2020-11-11 03:02:22 -05:00
Yusuf Bera Ertan
52479fec2f add title to server select menu, don't use unneeded Container in language select menu 2020-11-11 03:02:22 -05:00
Yusuf Bera Ertan
5af6757de0 add language selection menu to main menu screen 2020-11-11 03:02:22 -05:00
Imbris
42c6550a0b Add more parts of the character selection screen, add mouse detector widget, misc tweaks 2020-11-11 03:02:22 -05:00
Imbris
de770694d8 Basic structure of character selection 2020-11-11 03:02:22 -05:00
Imbris
586bdddc9e Add gradient primitive to ui, adjust textbox aspect ratio, misc tweaks 2020-11-11 03:02:22 -05:00
Imbris
545f3bd44b Start rewrite of character selection with iced 2020-11-11 03:02:21 -05:00
Imbris
10c046be2f Delete conrod main menu code!!!!!!, small tweaks 2020-11-11 03:02:21 -05:00
Imbris
73982637b2 Add styling for Container, implement auth trust prompt, misc additions 2020-11-11 03:02:21 -05:00
Imbris
561068106e Add input fields to main menu attempt, fix a few bugs, add bullet point to the font (might have done this wrong). (just a few glitches left when text contains spaces) 2020-11-11 03:02:21 -05:00
Imbris
bc0792a57a Rename localization/font types (e.g. VoxygenLocalization -> Localization) 2020-11-11 03:02:21 -05:00
Imbris
29526977d8 Add support for Space widget, refine main menu ui, misc fixes and improvements. 2020-11-11 03:02:20 -05:00
Imbris
b25162635a Revamp BackgroundContainer with scale specific padding, and use in main menu attempt 2020-11-11 03:02:20 -05:00
Imbris
5428feb0df Add Stack and CompoundGraphic widgets 2020-11-11 03:02:20 -05:00
Sam
e90104ba0f Yeet 2020-11-10 19:59:55 -06:00
Sam
e6693d5979 Yeet 2020-11-10 15:49:51 -06:00
Monty Marz
0e072f72cc frost cleaver 
velorite mage set

offsets
armor stats
 2020-11-10 21:43:45 +00:00
Justin Shipsey
a8ac051f33 Merge branch 'james/axe-hammer-keyframes' into 'master' 
James/axe hammer keyframes

See merge request veloren/veloren!1497
 2020-11-10 01:03:11 +00:00
Joshua Barretto
b09148abee Updated changelog, removed old models 2020-11-09 17:19:29 +00:00
Joshua Barretto
3f02aa5134 Removed more redundant code, desert dunes, better bridges 2020-11-09 10:20:22 +00:00
Joshua Barretto
9b233708e2 Turned tree generation into a post-processing layer, ripped out old tree generator for performance wins 2020-11-09 10:20:22 +00:00
Marcel
981b71759e Merge branch 'xMAC94x/auth-link' into 'master' 
adjust path to veloren account page

See merge request veloren/veloren!1498
 2020-11-09 09:01:59 +00:00
Marcel Märtens
d9f7a72139 adjust path to veloren account page 2020-11-09 09:21:14 +01:00
jshipsey
92aa6a1b12 axe basic 2020-11-08 18:51:35 -05:00
Sam
08a0926c40 Fixed sneaky admin sword. 2020-11-08 13:58:23 -06:00
Justin Shipsey
8cab21d44c Merge branch 'AlKabir/animals-dont-drop-lootbags' into 'master' 
Make different mobs drop different assets on death (not just lootbags)

See merge request veloren/veloren!1462
 2020-11-08 07:26:10 +00:00
jiminycrick
66dbfebf3b Asset ron file fix 2020-11-07 22:06:08 -08:00
AlKabir
aaac3dadcb improved the steak asset 2020-11-07 23:52:18 -06:00
AlKabir
6535deae9c added two meat assets for mobs to drop 2020-11-07 23:34:20 -06:00
Sam
aeca76c748 Fixed cultist sword not displaying correctly in inventory. 2020-11-07 21:48:24 -06:00
Sam
b4296c3a2c Fixed stupid error. 2020-11-07 19:54:37 -06:00
Imbris
133ba82a9b Use item_definition_id for weapon asset mapping 2020-11-07 16:44:11 -06:00
Sam
8adee6ef20 Added Tool() around file paths in other manifest. 2020-11-07 15:53:19 -06:00
Sam
261ebf3990 Added Tool() around file paths. 2020-11-07 15:53:18 -06:00
Sam
d484ac2e38 Yeeted from ron files. 2020-11-07 15:53:16 -06:00
Sam
ca65cdace1 Yeeted from manifest files. 2020-11-07 15:53:14 -06:00
Monty Marz
642ad805a1 potion buff 2020-11-06 01:08:34 +01:00
Snowram
0d92f02deb Buff stonegolem, nerf giants, add missing sfxs 2020-11-06 01:08:33 +01:00
Monty Marz
ca932f6c15 easier to get minor potions 
increase cost of a minor potion to 4 apples
 2020-11-06 01:08:32 +01:00
Monty Marz
eb79820c25 tweaks consumables buffs values 2020-11-06 01:08:32 +01:00
Snowram
a52f83e92c Addresses some comments 2020-11-06 01:08:31 +01:00
Snowram
ce96af4363 Allow for an arbitrary array of effects and buffs for consumables 2020-11-06 01:08:30 +01:00
Sam
a0af315930 Addressed comments. 2020-11-04 19:22:08 -06:00
Marcel
7517991d73 Merge branch 'TR_translations' into 'master' 
Updated translations

See merge request veloren/veloren!1473
 2020-11-04 16:13:53 +00:00
TheBoredProgrammer64
3f7b007227 Updated translations 2020-11-04 16:13:53 +00:00
Snowram
a6d5d87bbc Fix animations regressions for biped_large 2020-11-04 02:12:43 +01:00
jshipsey
fb1aae22dd manifests 2020-11-04 01:48:06 +01:00
jshipsey
f009492319 cleanup 4 2020-11-04 01:48:05 +01:00
unknown
14ec1b9f5f starting to wire in new wield setup for bipedlarge 2020-11-04 01:48:05 +01:00
jshipsey
28cde31bbb setup for staff, more anim conversions 2020-11-04 01:48:05 +01:00
Joshua Barretto
6331ad9455 Implemented Flight 2020-11-03 22:46:07 +00:00
Fausk
3679701ebf Grammar and length reduction, Lucerne and Pike Hammer swap names for consistency 2020-11-01 13:29:35 -07:00
Kelly Monroe
47adb2f1d1 Fixing up further grammar and length issues, Lucerne and Spike Hammer swap names 2020-11-01 13:29:35 -07:00
Fausk
477b575f4e fixup improved item descriptions for most items (no swords) 2020-11-01 13:29:35 -07:00
Joshua Barretto
0aca8ee0f7 Better minimal clouds 2020-10-30 15:43:51 +00:00
Joshua Barretto
70f0a7c57c Cloud tweaks 2020-10-30 15:43:51 +00:00
Tadabito
12d449f40f Added translation for place holder quest. 2020-10-28 20:36:19 +00:00
Tadabito
0e3980f656 Fixed the missing comma 2020-10-28 19:25:42 +00:00
Tadabito
e24addd87d Update tr_TR.ron 2020-10-28 18:44:34 +00:00
Monty Marz
900e654252 update german translation, add missing string to en file 2020-10-28 14:39:58 +01:00
Monty Marz
3f7b5a095b player buffs at minimap visuals 
Update settings.rs
buff timers
 2020-10-26 19:28:25 -05:00
Monty Marz
8fa398954d Initial implementation of buffs UI 
player buffs animation

more testing debuffs

sorting and display limit fix

overhead buffs

fix

WIP buff removal function

fmt

Update buffs.rs

Now with compiling: WIP group UI buffs

positioning

Update group.rs

Update group.rs

Small optimizations.

Fixed positioning of buffs in group panel. Broke buff tooltips in group panel.

buff frame visuals

added setting for displaying buffs at minimap
 2020-10-26 19:28:24 -05:00
Monty Marz
b31c6877b4 skillbar fixes, buff UI module 
adjustments, fixes, assets, test buffs widgets
 2020-10-26 19:28:23 -05:00
Monty Marz
f096bece5c skillbar update part 1 
skillbar rework part 2
 2020-10-26 19:28:21 -05:00
Sam
1a1ceb54bc Server event used to deal damage/heal with buffs. Buff kills now award xp. 2020-10-26 19:28:20 -05:00
Forest Anderson
14b5d01af3 Merge branch 'angel/add-dutch-translation' into 'master' 
Added Dutch translation

See merge request veloren/veloren!1446
 2020-10-22 18:09:52 +00:00
Joshua Barretto
2237500743 Clouds 2020-10-21 21:05:25 +00:00
Forest Anderson
709cef2665 More small fixes 2020-10-21 19:02:59 +00:00
Forest Anderson
4d22b93863 Some fixes by @Jurre 2020-10-21 18:45:00 +00:00
Forest Anderson
f79e13135e Added Dutch translation, created by @Namp007 2020-10-21 13:39:36 -04:00
jshipsey
64d73abdec roshwalr fix 2020-10-19 16:20:59 +02:00
jshipsey
caa048b1d5 small fixes 2020-10-19 16:20:59 +02:00
Snowram
7a62ddfd3f Add BeastClaw npc weapontype 2020-10-19 16:20:59 +02:00
Snowram
f9383e4dd8 Add roshwalr npc 2020-10-19 16:20:59 +02:00
Snowram
c9985e14cb Rename Saurok, various anim fixes 2020-10-19 16:20:58 +02:00
jshipsey
65df398672 werewolf work 2020-10-19 16:20:58 +02:00
Snowram
6c54e6d8fe Add sand, snow and wood raptor npcs 2020-10-19 16:20:58 +02:00
Snowram
588f66a1ee Add treant npc 2020-10-19 16:20:58 +02:00
Snowram
58e2d3a4ad More bipedlarge anim work 2020-10-19 16:20:58 +02:00
unknown
94cbe3faf4 Better bipedlarge weild, charge and shoot anims 2020-10-19 16:20:58 +02:00
unknown
d2f91bc3a0 Assigns a ToolKind to bipedlarge weapons 2020-10-19 16:20:58 +02:00
jshipsey
0e628ef67f rebase fix 2020-10-19 16:20:58 +02:00
Snowram
0a9ec848a7 add lizardman npcs 2020-10-19 16:20:58 +02:00
Snowram
f4a068c422 Initial bipedlarge beast walk animation 2020-10-19 16:20:57 +02:00
Snowram
204fa50de9 Add werewolf npc 2020-10-19 16:20:57 +02:00
Sam
14e4af7ab6 Addressed playtesting feedback. 2020-10-14 21:06:52 -05:00
jshipsey
6a744eed82 anims 2020-10-14 21:06:32 -05:00
Monty Marz
4b2eba71e7 new staff skill icons 2020-10-14 20:56:58 -05:00
Sam
7ef73f5981 Added particles for fire shockwave. Added ability key enum so held abilities could differentiate what button they should check. Modified energy fields on basic beam so it could drain energy every second. 2020-10-14 20:56:22 -05:00
Sam
cbb72363af Reworked explosions. Tweaked staff fireball. 2020-10-14 20:56:21 -05:00
Sam
04dcd012da Flamethrower particles. 2020-10-14 20:56:21 -05:00
Sam
c80f16ae74 Started to add particles. 2020-10-14 20:56:20 -05:00
jiminycrick
512d881cd2 Fixed clippy errors and added SFX 2020-10-14 15:30:58 -07:00
jiminycrick
95c36cc3fb Skill icons with proper rotation 2020-10-14 12:50:33 -07:00
jiminycrick
04175bab09 Add skillbar stuff for 3rd skills 2020-10-14 12:50:32 -07:00
Monty Marz
e1a77d040d loot table adjustments 
- decrease blue glider drop rate
- decrease cloth scaprs drop rate from villagers
- add crafting mats to crates instead
 2020-10-11 16:25:35 +00:00
Imbris
a3ee5a4006 Rename model_col -> highligh_col to better reflect its usage 2020-10-10 02:10:32 -04:00
Imbris
ef74d395a6 Improve figure and sprite highlighting 2020-10-10 02:10:31 -04:00
Monty Marz
2b800a2b63 make clippy happy 
Delete glider.ron
 2020-10-07 02:23:20 +00:00
Marcel
613b3b103f Merge branch 'undefined' into 'master' 
Correction of errors

See merge request veloren/veloren!1421
 2020-10-05 22:54:49 +00:00
Sam
e501235265 Loot table fix 2020-10-04 08:52:19 -05:00
pablo saavedra soler
90e795fd9f I have corrected many errors in Spanish grammar and dialect in Latin America 2020-10-04 06:41:35 +00:00
Sam
47abf49751 Addressed comments 2020-09-29 20:48:23 -05:00
Sam
207586cfab Beam particles fixed/tweaked. 2020-09-29 19:48:17 -05:00
Sam
0b80257aa3 Add migration 2020-09-29 19:48:15 -05:00
Sam
56d2afc0dc Added keyframe support to basic beam state. Addressed some comments. 2020-09-29 19:48:15 -05:00
Sam
37fcfb8b6f Created manifest for database to filepath for items. 2020-09-29 19:48:12 -05:00
Sam
3d6c26a3c7 Fully separated sceptres from staves. 2020-09-29 19:48:12 -05:00
Sam
3e2e06f2f8 Projectile effects are now drained, so that the same projectile can't trigger it's effects on multiple enemies. 2020-09-29 19:48:11 -05:00
Sam
de45784596 Addressed round of testing feedback. 2020-09-29 19:48:09 -05:00
Monty Marz
13d9b814ab separate sceptres from staffs, show values below 1.0 as decimals in the SCT, add starting sceptre 
remove firebolt from starting sceptre
 2020-09-29 19:48:07 -05:00
Sam
6bb680f372 M1 now only regens stamina when healing allies if they are not at full health. 2020-09-29 19:48:02 -05:00
Monty Marz
2b8d1e6fb9 test values 2020-09-29 19:48:00 -05:00
Monty Marz
387f2cb60c color adjustments 2020-09-29 19:47:59 -05:00
Sam
6b23af6e0b Tweaked particles. Added skill icons. 2020-09-29 19:47:58 -05:00
Sam
8b9202710f New sceptre M2 is functional. 2020-09-29 19:47:57 -05:00
Sam
921d224ef6 Lifesteal now works. Added particles to healing beam. 2020-09-29 19:47:57 -05:00
Nícolas Wildner
5329b4c54b Update pt_BR.ron 2020-09-26 19:13:45 +00:00
Nícolas Wildner
55865dfb06 Update pt_BR.ron 2020-09-26 18:46:37 +00:00
Nícolas Wildner
855631feda Update pt_BR.ron 2020-09-26 18:20:59 +00:00
Nícolas Wildner
738688ea60 Update pt_BR.ron 2020-09-26 18:10:22 +00:00
jshipsey
4f0faf4c56 small corrections 2020-09-21 23:57:10 -04:00
Sam
8ab0d5e5e0 Added icon for skillbar ability of sword. 2020-09-21 17:40:20 -05:00
Sam
fe70b7fbce Addressed second round of feedback. 2020-09-21 17:38:53 -05:00
Sam
b06ab250cc Addressed first round of feedback on sword overhaul. 2020-09-21 17:38:52 -05:00
Sam
cf573a42bd Initial implementation of combo melee attack. 2020-09-21 17:38:41 -05:00
Joshua Barretto
1e900e8c6a Removed unused sprite manifests 2020-09-21 16:07:38 +01:00
Sam
99aba78422 Added healing healthsource logic to shockwave system. 2020-09-19 14:40:19 -05:00
Sam
6a1acd47a1 Added maximum vertical angle for shockwave. 2020-09-19 14:40:19 -05:00
Sam
819fb8ee77 Changed boss from cyclops to stone golem. Added ai specific for boss. 
Tweaked shockwave.

Fix rebasing errors.
 2020-09-19 14:40:16 -05:00
scott-c
1f2ed53c42 Tweak particle effects 2020-09-19 14:40:15 -05:00
Sam
0c48efd445 Added particles dedicated for shockwave. 2020-09-19 14:40:15 -05:00
Sam
66b0fee3c7 Separated knockback out from basicmelee. Added weapon for cyclops boss to use, and added 1 ability to it. 2020-09-19 14:29:04 -05:00
Joshua Yanovski
b2dc95239d Merge branch 'martin-t/dust' into 'master' 
Fix typo: velorite dusk->dust

See merge request veloren/veloren!1390
 2020-09-18 23:54:17 +00:00
Monty Marz
5fe79e1c6a new loading screen bgs (part 1) 
Add a basic random feature to char creation

loading screen bg (part 2)

loading screen changes, random button graphics
Random appearance also pick a random npc name
 2020-09-18 23:17:47 +00:00
Martin Taibr
a9756607a3 fix typo: velorite dusk->dust 2020-09-19 00:43:29 +02:00
jshipsey
90e5bbaac0 rebase 2020-09-17 22:41:40 -04:00
jshipsey
fff6a6fb0a finish odonto 2020-09-17 22:32:11 -04:00
jshipsey
5bb45a4861 spawn tweaks, improved odonto 2020-09-17 22:32:11 -04:00
Snowram
fecc40ad8e Better quadmed legs/feet ratio 2020-09-17 22:32:11 -04:00
jshipsey
8a43cba3b6 quadsmall manifest changes 2020-09-17 22:32:11 -04:00
Snowram
62f6a5799a Initial quadmed feed animation 2020-09-17 22:32:10 -04:00
jshipsey
03b7320b4b general housekeeping 2020-09-17 22:32:10 -04:00
jshipsey
06b39b9072 species specific improvement 2020-09-17 22:32:10 -04:00
Snowram
6a16268ff0 Quadmed run anim tweaks and deers offsets tweaks 2020-09-17 22:32:10 -04:00
jshipsey
2589c0cfc6 thropod manifest changes 2020-09-17 22:32:10 -04:00
Snowram
9308cabeb8 add deer, beaver and porcupine npcs 2020-09-17 22:32:10 -04:00
Snowram
ee95550355 Tweak offsets for theropods 2020-09-17 22:32:10 -04:00
jshipsey
cd6e1ad45f haul out the critter skele, add theropod 2020-09-17 22:32:10 -04:00
jshipsey
ecae71c016 gliders as items. anim improvements 2020-09-17 22:32:09 -04:00
jshipsey
412495e5fc assets/manifests 2020-09-17 22:18:49 -04:00
Ben Wallis
712f2e9c97 * Moved migrations to beginning of server initialisation 
* Added migrations for entity ID changes to existing tables
 2020-09-17 23:02:14 +00:00
tylerlowrey
30c3146682 Added main menu kick message with kick reason after player is kicked 2020-09-14 07:52:31 +02:00
tylerlowrey
fee79720ee Added ban message with reason when banned user attempts to login to server 2020-09-14 07:52:31 +02:00
TheThirdSpartan
7fd673ecb2 Added localization config options for new death messages 2020-09-09 20:26:20 +00:00
Raiyan Sayeed
906da2f0c7 added option for borderless fullscreen in setting -> graphics menu 2020-09-07 05:12:15 +00:00
TheThirdSpartan
6dbd1bc132 adding feature requested in issue #153 - displaying your alias in game as 'you' 2020-09-06 19:42:32 +00:00
Joshua Barretto
0adc57e487 Made particle code more rugged 2020-09-04 11:49:49 +01:00
Joshua Barretto
70f52d876a Improved lighting 2020-09-04 11:48:57 +01:00
Monty Marz
8a25ad91df reed models 2020-09-04 11:48:57 +01:00
Joshua Barretto
032ec9ef41 Added bee hives 2020-09-04 11:48:56 +01:00
Joshua Barretto
88add8456f Added fireflies, reeds near rivers 2020-09-04 11:48:56 +01:00
Joshua Barretto
4405227ffb Made light attenuation nicer, fixed campfire light offset 2020-09-04 11:48:54 +01:00
Marcel
e512578ef5 Merge branch 'intel-gpu-fix' into 'master' 
Fix a crash and model/shadow issues on Intel Gen7/7.5 GPUs.

See merge request veloren/veloren!1349
 2020-09-03 09:11:19 +00:00
Marcel
5d1f7d7a0a Merge branch 'update-zh' into 'master' 
update the Simplified Chinese translation

See merge request veloren/veloren!1350
 2020-09-02 08:07:28 +00:00
law4x
87c8351890 update the Simplified Chinese translation 2020-09-02 08:07:27 +00:00
scott-c
69e0bf2023 fix missing firework particle rng & adjust firework colors 2020-09-01 20:33:17 +08:00
Lippy13
7c33e7d714 Work around an issue with Intel Gen7/7.5 GPUs where matrices default to being row major if they are not directly assigned to a matrix that has a column major layout. 2020-08-31 19:50:45 +01:00
Lippy13
7efa3373f6 Fix crash on Intel Gen7 GPUs caused by having two return statements in the same branch of code. 2020-08-31 19:49:01 +01:00
Marcel
62427cb01f Merge branch 'vzikl/add-zh-translation' into 'master' 
Update to OpenSource Font - WQY-ZenHei & add zh_CN

See merge request veloren/veloren!1304
 2020-08-30 20:40:01 +00:00
VZIKL
cc55e71a5d Update to OpenSource Font - WQY-ZenHei & add zh_CN 2020-08-30 20:40:01 +00:00
black silence
2587a38f6f fix several DE translations 2020-08-28 20:37:28 +02:00
Joshua Yanovski
8be3648a4d Move sprite data to a config file. 2020-08-28 09:23:43 +02:00
Joshua Yanovski
3a96b73b2c Move figure meshing to a background thread. 2020-08-28 05:25:31 +02:00
scott-c
d316463eb3 Add combat sfx #647 2020-08-26 19:28:00 +08:00
Joshua Barretto
bf7afcf5c9 Merge branch 'zesterer/small-fixes' into 'master' 
Better world colours, better projectiles, better aiming, many other small improvements

See merge request veloren/veloren!1332
 2020-08-25 15:59:05 +00:00
notoria
2be4202d01 Corrected some spelling errors 2020-08-25 12:21:25 +00:00
Joshua Barretto
12ea028a3d Improved single-tick projectile wall/entity collision bug 2020-08-25 00:04:04 +01:00
Joshua Barretto
e4de32ac25 Fixed quadruped hitboxes 2020-08-24 21:46:08 +01:00
Joshua Barretto
2b9d5ee4a2 Fixed bad hitbox radii and adjusted field colour 2020-08-24 20:52:18 +01:00
Joshua Barretto
90735f1ef7 Improved world colours 2020-08-24 12:36:27 +01:00
Joshua Barretto
91c8effc80 Less harsh terrain noise 2020-08-24 12:36:27 +01:00
Joshua Barretto
6918020ed8 Less bizarre rock and stalagtite colours 2020-08-24 12:36:27 +01:00
Joshua Barretto
c905819adc Made below-ground LoD dark 2020-08-24 12:36:27 +01:00
Joshua Barretto
89a6a06a7b Adjusted worldgen colours for new lighting model 2020-08-24 12:36:27 +01:00
Joshua Barretto
79ec8c9e22 Merge branch 'james/fix-shiny-shader-nvidia' into 'master' 
Fixed NVidia shiny water shader bug and re-enabled in settings

See merge request veloren/veloren!1319
 2020-08-24 07:09:48 +00:00
jiminycrick
86b4dd6ba3 set shiny water to default 2020-08-23 22:58:01 -07:00
Monty Marz
1d49186e31 various fixes 
Balanced crafted weapon power

Adjusted tooltip color

Added tooltip showing account name to the social window
 2020-08-24 01:16:53 +02:00
Monty Marz
c9438c0947 Fixes 
Fix Cave NPCs only spawning very deep inside caves

Increase twig density

Adjust armour values and ingredients for starter sword

fix healing rod using the wrong model

Hung up the lianas again
 2020-08-22 23:37:45 +00:00
Monty Marz
8646c1add5 fix particles rendering before water 
revert changes to campfires -> Address in another MR!
 2020-08-22 00:17:44 +02:00
Monty Marz
ce929d2924 Address comments, clippy and minor adjustments 
first bunch of comments addressed

change order or scatter, paths and caves being applied in worldgen to avoid floating scatter objects

campfire adjustments, reduced grass density due to FPS issues

readded item descriptions to the crafting window, item desc for craftable armour

address comments
happy clippy, happy life
clippy

clippy

more clippy
fmt

revert cargo.toml formatting
remove "allow unreachable pattern"
fmt
 2020-08-21 22:37:08 +02:00
jiminycrick
6b8e458027 Fixed NVidia shiny water shader bug and re-enabled in settings 
missed a commented line
 2020-08-21 14:59:18 -04:00
Monty Marz
e3eb34085f craftable starting set 
velorite staff update

ore_nature_longbow

model fix
humanoid colours

Update agent.rs

improve rng (according to zesterer)

slower fleeing

More adjustments

fix cult leader name

more loot tables

all kinds of adjustments

smöl adjustments
 2020-08-21 19:36:21 +02:00
Sam
9d2fe79a78 Changes to how critical hits function for melee attacks. Removed ability for explosions to crit. Velorite sceptre now functions as healing staff. 2020-08-21 19:36:20 +02:00
Monty Marz
55d126861f fix tooltips in char selection, more balancing 
fix talking animals

fix critter exp, stronger villagers

biped large balancing

more villager balancing, mushroom spawning rate

more balancing

fix rebase

multiple loottables

Add tarasque and bonerattler armour

Added loot tables for different groups of weapons and armor based off relative strength. Added loot table for cultist boss.

Added loot tables for consumables and food. Trimmed down default loot table.

remove male and female sign from char creation

chest loot tables

fix loot tables

lootable crates

lantern keybinding display

more loot tables

loot table changes

fixed loot tables

fix typo
more grass

rebase fix, better lantern

re-add sprite rotation for grass

crafting window alignment fix, new streetlamps, new shopsigns, new healing staff

height change
 2020-08-21 19:36:19 +02:00
Sam
924d09e46c balancing 
more specific stats

Update body.rs

more balancing

non hostile catoblepas and mouflons

quad low
more adjustments
Animals with enemy alignment now deal correct damage. Made health scaling species-specific.
 2020-08-21 19:36:17 +02:00
Monty Marz
7ab80ef367 sprite spawning rules 2020-08-21 19:36:16 +02:00
Monty Marz
b930c34d89 agent changes, sprite spawning changes, alignment changes 2020-08-21 19:36:16 +02:00
Monty Marz
54cba3e7f9 add mushrooms, temporary disable snowy grass 2020-08-21 19:36:15 +02:00
Joshua Barretto
db183e607f Added particle explanation, more efficient particle pushing 2020-08-21 09:53:09 +01:00
Joshua Barretto
1b80f05e82 Centred particle meshes correctly 2020-08-20 22:34:58 +01:00
Joshua Barretto
7eff8ff0ad Added lifetime particle parameter 2020-08-20 21:38:21 +01:00
Sam
05f4024e1a Normal now rotates with particle (fixes lighting). 2020-08-20 21:31:30 +01:00
Joshua Barretto
d31d25b170 Added orientation to more particle modes 2020-08-20 21:28:12 +01:00
Joshua Barretto
c759c8120f Centralised particle offset, variable chunk range, better smoke offsets 2020-08-20 21:28:11 +01:00
Sam
0a3f0db26d Added rotation to leaf particles. 2020-08-20 21:18:14 +01:00
Joshua Barretto
d1bbfc9960 Added BlocksOfInterest and block particle emission 2020-08-20 21:15:13 +01:00