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,214 Commits 151 Branches 18 Tags
Commit Graph

1472 Commits

Author SHA1 Message Date
Justin Shipsey
fef5607829 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
2a0cff370e 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
d495459a12 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
87b3cb8270 airship movement bits 2021-03-21 21:43:49 -04:00
Joshua Barretto
716b51c4ee Made pickaxe obtainable 2021-03-22 00:24:07 +00:00
Joshua Barretto
17548c3ddb Merge branch 'zesterer/pick' into 'master' 
Pickaxe

See merge request veloren/veloren!1959
 2021-03-22 00:19:42 +00:00
Joshua Barretto
abdba70178 Faster pick, less vibrant block selection 2021-03-21 20:38:08 +00:00
Joshua Barretto
0f201c5e09 Outcome for block destruction, take select_pos from ControllerInputs 2021-03-21 20:10:05 +00:00
Marcel
88c156a3ac Merge branch 'vfoulon80/climbing-skill' into 'master' 
Add climbing speed and cost

See merge request veloren/veloren!1950
 2021-03-21 18:35:44 +00:00
Joshua Barretto
4b7f69f850 Switched to BasicMelee 2021-03-21 17:45:01 +00:00
Joshua Barretto
3aad8818fa Initial implementation of pickaxe 2021-03-21 16:09:16 +00:00
Vincent Foulon
50af548636 Add skill for swimming speed 2021-03-21 15:58:38 +01:00
Vincent Foulon
e49b56847e improve climbing icon 2021-03-21 13:26:44 +01:00
Vincent Foulon
8ed66af349 fix typo in sceptre aura skill 2021-03-20 22:12:43 +01:00
Sam
5de4011221 Rebalanced a few stats 2021-03-20 16:28:03 -04:00
Vincent Foulon
b45ba8f4d7 fix one line from custist_alarm vector 2021-03-20 20:53:27 +01:00
Vincent Foulon
6da415e410 Translate cultist_alarm in FR 2021-03-20 17:37:59 +01:00
Vincent Foulon
902029e977 Add climbing speed and cost 2021-03-20 17:17:28 +01:00
Snowram
49f0d41eb8 Fix a missing dwarf hairstyle 2021-03-19 12:45:08 +01:00
Snowram
0dabf089f2 Various visual fixes 2021-03-18 22:53:06 +01:00
Sarra
6ab109221e cleaning up some tools 2021-03-18 22:52:50 +01:00
Sarra
fc5d448e12 tweaking glow and shine 2021-03-18 22:52:40 +01:00
Marcel
e7ad2bf2d9 Merge branch 'vfoulon80/loading-animations' into 'master' 
Add new random loading animations

See merge request veloren/veloren!1931
 2021-03-18 02:28:34 +00:00
DaforLynx
53362d02ed Adds sfx for Sceptre aura 2021-03-17 23:54:49 +00:00
Vincent Foulon
b5a9481a33 allow loading animations to be contributed from a manifest file 2021-03-17 23:41:28 +01:00
Vincent Foulon
0b884c7099 Add new random loading animations 2021-03-17 18:15:25 +01:00
Marcel
07f2cdc64e Merge branch 'tormeh/add-monologue-strings' into 'master' 
Add monologue strings.

See merge request veloren/veloren!1925
 2021-03-17 08:45:27 +00:00
Marcel
20f24896db Merge branch 'vfoulon80/fr-skills' into 'master' 
[FR] translate skills.ron + missing keys

See merge request veloren/veloren!1901
 2021-03-17 01:25:12 +00:00
Vincent Foulon
a7ebe97f7b [FR] translate skills.ron + missing keys 2021-03-17 01:25:11 +00:00
Tormod G. Hellen
998010bd6d Add monologue strings. 2021-03-17 01:58:12 +01:00
Monty Marz
d8d965a66a new loading bg, staff models 
item images

fix paths

loot tables, adjustments

Update main.ron
 2021-03-16 23:23:24 +00:00
Marcel
998b03c154 Merge branch 'sam/nerfs' into 'master' 
Nerfs

See merge request veloren/veloren!1922
 2021-03-16 22:22:04 +00:00
James Melkonian
aef24832b3 Various RtSim and Agent Interaction Fixes 2021-03-16 01:30:35 +00:00
Marcel
6bd2adab2b Merge branch 'sam/explosion-fix' into 'master' 
Explosions now take into account hitbox of entity.

See merge request veloren/veloren!1905
 2021-03-15 22:26:28 +00:00
Sam
65012cba32 Nerfs 2021-03-15 17:36:58 -04:00
Sam
9aef296854 Nerfed aura 2021-03-15 14:23:28 -04:00
Sam
cea87d2e9a Rebalanced explosion strengths 2021-03-15 00:36:07 -04:00
Joshua Barretto
1637a5e889 Fixed airship manifest offset 2021-03-14 23:17:29 -04:00
Avi Weinstock
ee7f760e78 Address MR 1888 review comments. 
- Delete obsolete symbolic links.
- Add suggested comments.
- Remove dead code.
 2021-03-14 23:17:28 -04:00
Avi Weinstock
c191b66371 Account for model translation in the physics. The voxel collider still needs to be north-aligned for now. 2021-03-14 23:09:52 -04:00
James Melkonian
acf8b1b5cd Allow spawned airships to move 2021-03-14 23:09:52 -04:00
Avi Weinstock
c5c9855ab8 Airship fixes: figure culling, player hitbox bounds w.r.t. airships, physics state unioning. 2021-03-14 23:09:51 -04:00
Avi Weinstock
711509d0c1 Airship progress: now possessable, and physics kind of works (desyncs from the visuals by a shift + scale, and rotation isn't done at all yet, but the contours are correct). 2021-03-14 23:09:51 -04:00
Avi Weinstock
ff3f3d1271 Draft of airships (spawn command, visuals, some physics refactoring, no collision yet). 2021-03-14 23:09:49 -04:00
Marcel
5ac731254d Merge branch 'sam/yeet-inputs' into 'master' 
Reworked Controller Inputs to use Control Actions

See merge request veloren/veloren!1900
 2021-03-15 01:32:02 +00:00
Imbris
83c6a546d4 Merge branch 'snowram/new-npcs' into 'master' 
Snowram/new npcs

See merge request veloren/veloren!1896
 2021-03-15 00:10:46 +00:00
Sam
37705fee6d Primary ability fully functional. 2021-03-14 17:26:53 -04:00
DaforLynx
ba7d33179e Renamed 'Upscale Factor' to 'Internal Resolution' as per what was decided in #981 2021-03-14 12:18:29 -07:00
Snowram
9c45f5c32d Theropod charge attack 2021-03-14 18:10:40 +01:00
PersianKnight
8daca45957 Bug fix debug info hotkey and axe skill tree text 2021-03-14 20:16:54 +03:30