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,810 Commits 151 Branches 18 Tags 2.1 GiB
0cf42e9c84
Commit Graph

8810 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcel
27e505e79d 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
95bfcde6d1 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
0b92c72096 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
bb0bb38108 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
26160df8e5 adjust tracing 2021-06-06 19:31:25 +02:00
Monty
336d83fc49 new bgs 2021-06-06 19:30:37 +02:00
Marcel
521e1eacf3 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
45741b0dbd 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
39fc48ac17 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
172c96d83d Missed strings 2021-06-06 17:48:09 +02:00
Ben Wallis
efbfc20c04 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
38c0e02114 Extract 'create_unlock_skill_button' function from 'update' in diary.rs 2021-06-06 14:14:53 +00:00
Ben Wallis
da2fd8c7bf egui feature 2021-06-06 14:42:56 +01:00
Snowram
edfe713076 Cyclops, basilisk, air balloon offsets 2021-06-06 14:12:08 +02:00
Samuel Keiffer
85b8d4e7c0 Merge branch 'sam/yeti' into 'master' 
Yeti Rework

See merge request veloren/veloren!2359
 2021-06-05 23:15:20 +00:00
Filip Bengtsson
cba9affbb3 Strings in various files 2021-06-06 01:05:08 +02:00
Filip Bengtsson
fcc266bfa8 Translate trade.ron 2021-06-06 00:42:50 +02:00
Filip Bengtsson
1b6c43dfe2 Translate social.ron 2021-06-06 00:42:07 +02:00
Filip Bengtsson
3e37549518 Translate sct.ron 2021-06-06 00:40:30 +02:00
Filip Bengtsson
5191a90432 Translate misc.ron 2021-06-06 00:39:55 +02:00
Filip Bengtsson
3cbf362462 Translate hud/map.ron 2021-06-06 00:34:06 +02:00
Filip Bengtsson
28c44b6bb9 Translate hud/hud_setting.ron 2021-06-06 00:32:16 +02:00
Snowram
864f230a3c Yeti combat anims 2021-06-06 00:17:23 +02:00
Sam
acf7ad27f1 Balance tweaks. 2021-06-05 17:15:04 -05:00
Filip Bengtsson
12ba5e1848 Translate hud/group.ron 2021-06-06 00:07:53 +02:00
Filip Bengtsson
1841923795 Translate hud/crafting.ron 2021-06-06 00:07:03 +02:00
Filip Bengtsson
f9e42f4107 Translate hud/chat.ron 2021-06-06 00:06:05 +02:00
Filip Bengtsson
10ac6b3d4c Translate hud/char_window.ron 2021-06-06 00:00:51 +02:00
Filip Bengtsson
fd608ccb6f Translate hud/bag.ron 2021-06-05 23:39:24 +02:00
Filip Bengtsson
f111b87fe5 template.ron boilerplate 2021-06-05 23:33:54 +02:00
Filip Bengtsson
6277106e78 Start translating skills.ron 2021-06-05 23:25:11 +02:00
Filip Bengtsson
cf051fd9fb Translate main.ron 2021-06-05 23:13:42 +02:00
Filip Bengtsson
37c12977c1 Translate most of gameinput.ron 2021-06-05 23:08:59 +02:00
Filip Bengtsson
cb0f00d447 Translate esc_menu.ron 2021-06-05 23:04:55 +02:00
Filip Bengtsson
35f7c206e5 Translate most of common.ron 2021-06-05 23:03:48 +02:00
Ben Wallis
8c825305e9 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
8db65e0554 Translate char_selection.ron 2021-06-05 22:45:55 +02:00
Filip Bengtsson
d663d05f4f Translate buff.ron 2021-06-05 22:28:01 +02:00
João Capucho
a148d4d01a
Fix scissor panics when window height is 1 2021-06-05 20:36:27 +01:00
Sam
74b7039219 Yeti AI 2021-06-05 13:25:47 -05:00
Ben Wallis
7b8a398234 Merge branch 'xvar/title-screen-fps-cap' into 'master' 
Added 60 FPS framerate cap for title/menu screens

See merge request veloren/veloren!2377
 2021-06-05 14:00:57 +00:00
Ben Wallis
1a93e3d84f Added 60 FPS framerate cap for title/menu screens 2021-06-05 14:13:53 +01:00
Ben Wallis
cc19e70ae6 Tidied up egui windows 2021-06-05 13:33:53 +01:00
Filip Bengtsson
d0bb260057 Translate _manifest.ron 2021-06-05 14:26:00 +02:00
Filip Bengtsson
6df35564c2 Copy files from English 2021-06-05 13:26:41 +02:00
Marcel
01e2b69fda Merge branch 'xMAC94x/update_deps' into 'master' 
update dependencies

See merge request veloren/veloren!2374
 2021-06-05 11:10:22 +00:00
Ben Wallis
e9a5fe1b4d Merge branch 'capucho/wgpu-outdated-swapchain' into 'master' 
Rebuild swapchain on Outdate error

See merge request veloren/veloren!2376
 2021-06-05 10:27:32 +00:00
Sam
93f90d514c Particles for ice spikes 2021-06-04 18:17:15 -05:00
Sam
81f7e690fd Snowball attack. 2021-06-04 18:17:15 -05:00
Sam
a82984b925 Added base ability set 2021-06-04 18:17:14 -05:00