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

8757 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam
da65a1c166 Max energy stat functional. 2021-06-07 10:58:37 +02:00
Sam
4b91bea700 Energy recovery stat functional. 2021-06-07 10:58:32 +02:00
jshipsey
9379c2a2e7 icon work, more models 2021-06-07 10:58:27 +02:00
Sam
1a4b39e283 Recipe book fix 2021-06-07 10:58:07 +02:00
jshipsey
edd9e447ff recipes, re-organization, cleanup 2021-06-07 10:58:05 +02:00
jshipsey
7e6c01c9e9 cloth/metallic armor 2021-06-07 10:56:54 +02:00
jshipsey
b55bc7b003 crafting item partial re-organization, armor recipes, some specific animal drops 2021-06-07 10:56:35 +02:00
jshipsey
6d2e3e6f8c more drops, armors 2021-06-07 10:56:16 +02:00
jshipsey
77a1f779be hides/leathers 2021-06-07 10:56:04 +02:00
jshipsey
04bec5f7f3 more meat 2021-06-07 10:55:50 +02:00
jshipsey
d0134ebf82 added some meat 2021-06-07 10:55:34 +02:00
Marcel
6c21e52e49 Merge branch 'imbris/small-fixes' into 'master' 
Remove unused fields from UI stuff

Closes #1012

See merge request veloren/veloren!2388
 2021-06-07 08:37:11 +00:00
Marcel
eeed5fd2df Merge branch 'xMAC94x/log_spam' into 'master' 
XMAC94x/log spam

See merge request veloren/veloren!2385
 2021-06-07 07:55:27 +00:00
Imbris
16168a6159 Remove unused velocity field in the Hud and remove unused fields from 
the image slider widget code
 2021-06-07 02:49:35 -04:00
Imbris
96b7f027e3 Make handling of shortcut keywords for commands clearer and revise a TODO related to how chat messages are stored and renamed with alias changes 2021-06-06 23:45:51 -04:00
Marcel
a3cc752bbf Merge branch 'pfau/loading_screen_bgs' into 'master' 
Add 0.10 login background and new loading screens

See merge request veloren/veloren!2386
 2021-06-06 18:17:42 +00:00
Marcel Märtens
b48c3ca80c adjust tracing 2021-06-06 19:31:25 +02:00
Monty
82440de48f new bgs 2021-06-06 19:30:37 +02:00
Marcel
3182724b66 Merge branch 'aweinstock/add-models-20210603' into 'master' 
Add Basilisk and Cyclops models by Gemu, and AirBalloon model by SarraKitty.

See merge request veloren/veloren!2371
 2021-06-06 16:56:21 +00:00
Marcel
3b73986af2 Merge branch 'hqurve/crafting-sorting2' into 'master' 
Widened recipe list in crafting menu and added quality indicators to names in the list

See merge request veloren/veloren!2378
 2021-06-06 15:55:11 +00:00
hqurve
8da6cbe414 Widened recipe list in crafting menu and added quality indicators to names in the list 2021-06-06 15:55:11 +00:00
Filip Bengtsson
f2dd0d0297 Missed strings 2021-06-06 17:48:09 +02:00
Ben Wallis
15a9df880f Merge branch 'Extract-unlock-skill-from-diary-update' into 'master' 
Extract 'unlock_skill' function from 'update'

See merge request veloren/veloren!2383
 2021-06-06 14:14:53 +00:00
Jonathan Berglin
9b064e289d Extract 'create_unlock_skill_button' function from 'update' in diary.rs 2021-06-06 14:14:53 +00:00
Snowram
b1a2d0b698 Cyclops, basilisk, air balloon offsets 2021-06-06 14:12:08 +02:00
Samuel Keiffer
a57a8de23a Merge branch 'sam/yeti' into 'master' 
Yeti Rework

See merge request veloren/veloren!2359
 2021-06-05 23:15:20 +00:00
Filip Bengtsson
52fa777b12 Strings in various files 2021-06-06 01:05:08 +02:00
Filip Bengtsson
b17a54558f Translate trade.ron 2021-06-06 00:42:50 +02:00
Filip Bengtsson
de7269c6cc Translate social.ron 2021-06-06 00:42:07 +02:00
Filip Bengtsson
ebdb750b9a Translate sct.ron 2021-06-06 00:40:30 +02:00
Filip Bengtsson
68c44055c6 Translate misc.ron 2021-06-06 00:39:55 +02:00
Filip Bengtsson
f8dee5d03e Translate hud/map.ron 2021-06-06 00:34:06 +02:00
Filip Bengtsson
353160619e Translate hud/hud_setting.ron 2021-06-06 00:32:16 +02:00
Snowram
29d1d127d3 Yeti combat anims 2021-06-06 00:17:23 +02:00
Sam
a73e7c78e0 Balance tweaks. 2021-06-05 17:15:04 -05:00
Filip Bengtsson
83561f78be Translate hud/group.ron 2021-06-06 00:07:53 +02:00
Filip Bengtsson
5a43080d5b Translate hud/crafting.ron 2021-06-06 00:07:03 +02:00
Filip Bengtsson
0e82ea1299 Translate hud/chat.ron 2021-06-06 00:06:05 +02:00
Filip Bengtsson
9c3f6c5c9a Translate hud/char_window.ron 2021-06-06 00:00:51 +02:00
Filip Bengtsson
8006f0033c Translate hud/bag.ron 2021-06-05 23:39:24 +02:00
Filip Bengtsson
7f6c95805c template.ron boilerplate 2021-06-05 23:33:54 +02:00
Filip Bengtsson
e8c20d2cff Start translating skills.ron 2021-06-05 23:25:11 +02:00
Filip Bengtsson
5e09ba7ec7 Translate main.ron 2021-06-05 23:13:42 +02:00
Filip Bengtsson
57ee1ec2dd Translate most of gameinput.ron 2021-06-05 23:08:59 +02:00
Filip Bengtsson
c0925c8c0d Translate esc_menu.ron 2021-06-05 23:04:55 +02:00
Filip Bengtsson
acf02ad8cc Translate most of common.ron 2021-06-05 23:03:48 +02:00
Ben Wallis
a6a340af69 Merge branch 'capucho/scissor-panic' into 'master' 
Fix scissor panics when window height is 1

See merge request veloren/veloren!2379
 2021-06-05 20:46:43 +00:00
Filip Bengtsson
2a4787bccf Translate char_selection.ron 2021-06-05 22:45:55 +02:00
Filip Bengtsson
7928569c44 Translate buff.ron 2021-06-05 22:28:01 +02:00
João Capucho
b150a2ab3b
Fix scissor panics when window height is 1 2021-06-05 20:36:27 +01:00