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
6,257 Commits 151 Branches 18 Tags 2.1 GiB
331f19dd8b
Commit Graph

1169 Commits

Author SHA1 Message Date
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