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
11,373 Commits 151 Branches 18 Tags 2.1 GiB
618d4b2340
Commit Graph

11373 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oolnokk
b6f137bb7a Changes to formatting 2021-10-31 23:49:46 -04:00
Oolnokk
3618a0e5f5 Changes to formatting 2021-10-31 23:44:29 -04:00
Oolnokk
b67558c1ba 2 new beards, four new hairstyles and 1 new eye option for dwarf males 2021-10-31 22:58:25 -04:00
Samuel Keiffer
e692f49463 Merge branch 'sam/potion-tweaks' into 'master' 
Potion tweaks

See merge request veloren/veloren!2976
 2021-10-31 21:12:08 +00:00
Sam
560f73d296 Addressed review feedback. 2021-10-31 16:39:47 -04:00
Samuel Keiffer
be64c3687e Merge branch 'slipped/tweaks' into 'master' 
hats

See merge request veloren/veloren!2966
 2021-10-31 05:35:11 +00:00
jshipsey
913a2725e8 changelog 2021-10-31 01:19:21 -04:00
jshipsey
b1e9d9664b adjust models, last fixes 2021-10-30 23:42:18 -04:00
Justin Shipsey
beefdfe840 Delete frame-trace_1635388024283.json 2021-10-30 23:42:17 -04:00
jshipsey
f69e3c9fbc more hats 2021-10-30 23:42:17 -04:00
jshipsey
c2b7d3bb44 good hat rendering 2021-10-30 23:42:16 -04:00
jshipsey
a05c1ea4c5 switch to new matcell variant 2021-10-30 23:42:15 -04:00
jshipsey
97a3c1e713 simple hats 2021-10-30 23:42:15 -04:00
jshipsey
3915aa7aac support for hollow voxels ty zesterer 2021-10-30 23:42:14 -04:00
jshipsey
5cc54b34bd headbands 2021-10-30 23:42:13 -04:00
Justin Shipsey
85abea5814 Merge branch 'evelyntsmg/more_gliders' into 'master' 
Add new gliders

See merge request veloren/veloren!2785
 2021-10-30 20:48:04 +00:00
Evelyn
91477f7a5c Add new gliders 2021-10-30 20:48:04 +00:00
Treeco
e380425001 Add continent_scale_hack setting 2021-10-30 16:40:37 +01:00
Marcel
bcba2aae7e Merge branch 'juliancoffee/fix_testserver' into 'master' 
Make test-server compile again

See merge request veloren/veloren!2974
 2021-10-30 09:27:27 +00:00
Sam
ad257410e9 Merchants now have less potion stock. 2021-10-29 19:58:38 -04:00
Sam
41effe61d0 Being knocked out of item use or sprite interact states forces a poise state. 2021-10-29 19:24:40 -04:00
Samuel Keiffer
9a2bc830c0 Merge branch 'sam/explosions' into 'master' 
Staff Rebalancing

See merge request veloren/veloren!2970
 2021-10-29 22:20:53 +00:00
juliancoffee
84e04fa906 Add size parameter to map_file opts 2021-10-30 01:06:40 +03:00
Sam
aad2384622 Addressed review, changelog. 2021-10-29 17:57:00 -04:00
Sam
ca292a53ea All aspects of an attack now scale with the modifier. 2021-10-29 17:37:12 -04:00
Sam
57851b7df3 Fixed buff applied. 2021-10-29 17:37:10 -04:00
Sam
f339793911 Buffed staff firebomb a little. 2021-10-29 17:37:07 -04:00
Sam
696da74c94 Fixed falloff calculations 2021-10-29 17:37:05 -04:00
Sam
2b447852fd Added min fall off to explosions. 2021-10-29 17:37:02 -04:00
juliancoffee
1dc53dad3a Make test-server compile again 2021-10-29 23:49:37 +03:00
Joshua Barretto
098c10eb39 Merge branch 'sam/salvage-ui-fix' into 'master' 
Fix salvage

See merge request veloren/veloren!2972
 2021-10-29 20:22:51 +00:00
Sam
15a8c31383 Hack to make salvage go away when leaving station. 2021-10-29 13:25:38 -04:00
tijnvdheuvel
05f943f09b You guessed it, yet another missed comma -,- Update sfx.ron 2021-10-29 14:57:36 +00:00
tijnvdheuvel
80438fa582 Fixed another missing comma sfx.ron 2021-10-29 14:28:59 +00:00
tijnvdheuvel
a36106eb22 Update mod.rs missed a comma 2021-10-29 13:09:21 +00:00
socksonme
2ef668a16c removed unnecessary self 2021-10-29 15:23:49 +03:00
socksonme
42ed5c43f5 fixed code quality 2021-10-29 15:01:21 +03:00
socksonme
584e379e40 Removed beams and shockwaves from phys.rs 
calc_z_limit doesn't use an Opyion anymore, construct_spacial_grid also doesn't check for beams or shockwaves, collider_other in apply_pushback is also required now and resolve_e2e_pushback also doesn't use Options anymore.
 2021-10-29 09:43:01 +03:00
tijnvdheuvel
3dbd553997 Fixed bug truffler quadruped small 2021-10-28 17:37:29 +00:00
tijnvdheuvel
d4df012835 Added mod.rs entries for truffler and Fungome 2021-10-28 13:48:22 +00:00
tijnvdheuvel
377afc410d Update sfx.ron 2021-10-28 13:34:46 +00:00
Kali
768911aebe tweak chat scroll issue 2021-10-28 02:55:38 -07:00
Samuel Keiffer
fef9fd5893 Merge branch 'sam/crafting-tweaks' into 'master' 
Better salvaging and other crafting tweaks

See merge request veloren/veloren!2903
 2021-10-27 21:33:21 +00:00
Marcel
a602d4e373 Merge branch 'isse/remove-print' into 'master' 
remove print

See merge request veloren/veloren!2969
 2021-10-27 21:33:19 +00:00
Sam
ee2a7d625c Changelog 2021-10-27 17:02:36 -04:00
Snowram
02930dd2ed Uses a list for item tooltips 2021-10-27 17:02:36 -04:00
Sam
fbd742abdb Changed crafting to only consume items after checking that the crafting would be successful instead of consuming items first and reinserting on failure. 2021-10-27 17:02:36 -04:00
Sam
4b9e9c506b Fixed opening salvaging station not showing salvage text. 2021-10-27 17:02:35 -04:00
Monty Marz
727295aec1 text and alignment WIP 2021-10-27 17:02:35 -04:00
Monty Marz
a97cc95496 crafting station model, explanatory text part 1 2021-10-27 17:02:34 -04:00