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

1485 Commits

Author SHA1 Message Date
Marcel
54e29cc2e1 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
e0e7ab8fa2 Character Creation Randomization Fix 2021-03-27 15:58:34 +00:00
Avi Weinstock
6c5697915f Improve econsim's handling of diamond prices by lowering the implied homicide rate. 2021-03-27 10:50:16 -04:00
Marcel
757692edb6 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
7a3a5330dd Fixed boost having ridiculous velocity. 2021-03-26 16:11:25 -04:00
Scott Williams
fd501b68df Moved rugged armour to cloth_item 2021-03-26 16:51:43 +00:00
Scott Williams
d767c2f21d Added leather scraps recipe 2021-03-26 16:44:38 +00:00
aljazerzen
06f860e2a0 refactor handling of duplicate login 2021-03-25 12:33:56 +01:00
Lippy13
41f3bcee97 Add missing seashells to the sprite manifest 2021-03-25 04:37:27 +00:00
Avi Weinstock
db7d0af951 Add a vertical camera clamp option and toggle to voxygen. 2021-03-23 18:22:32 -04:00
Samuel Keiffer
a7828e14e9 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
1eb00cabff Update short_1.ron to make eligible for cloth scrap recipe 2021-03-23 18:16:30 +00:00
Sam
19d326f962 Tweaked numbers 2021-03-22 17:26:55 -04:00
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