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,841 Commits 151 Branches 18 Tags 2.1 GiB
ff57cb93bc
Commit Graph

8841 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
João Capucho
b647cd35f1
Don't draw when window size is minimized 2021-06-04 23:37:33 +01:00
Ben Wallis
059dfd2602 Merge branch 'hqurve/fix-lootscrller' into 'master' 
Fixed loot scroller collisions and cleaned up previous changes

See merge request veloren/veloren!2358
 2021-06-04 20:00:18 +00:00
João Capucho
36c28af46d
Regenerate the swapchain if the frame is outdated 2021-06-04 20:37:39 +01:00
Ben Wallis
0b10752a7d Added egui Inspection, Settings and Memory windows. Refactored selected entity window. 2021-06-04 20:20:09 +01:00
Ben Wallis
0296bbe696 Addressed MR comments 2021-06-04 20:19:52 +01:00
Ben Wallis
24134af4a7 Pulled library hot-reloading code into a separate crate and removed duplicated code from anim and egui crates 2021-06-04 20:19:49 +01:00
Ben Wallis
6163ddbb68 Pulled library hot-reloading code into a separate crate and removed duplicated code from anim and egui crates 2021-06-04 20:19:25 +01:00
Ben Wallis
d87cc5104d x 2021-06-04 20:18:24 +01:00
Ben Wallis
e6eaba038e fixup after rebase 2021-06-04 20:18:22 +01:00
Ben Wallis
1c80ab705f Added debug cylinder for selected entity. Added frame time graph. 2021-06-04 20:16:55 +01:00
Ben Wallis
483711ba67 Initial entity viewer implementation 2021-06-04 20:16:53 +01:00
Ben Wallis
0654d78260 Implemented hot reloading for EGUI (needs duplicated code from anim crate refactoring out) 2021-06-04 20:16:15 +01:00
Ben Wallis
63b8fe1a5f changed runner tags 2021-06-04 20:15:52 +01:00
Ben Wallis
ebcf59fb8c cleanup 2021-06-04 20:12:08 +01:00
Ben Wallis
8c57091401 Moved egui state to own struct, cleaned up a bunch of stuff 2021-06-04 20:11:43 +01:00
Ben Wallis
4d1da112c1 wip 2021-06-04 20:06:27 +01:00
Samuel Keiffer
f574015c39 Merge branch 'juliancoffee/bow_tweaks' into 'master' 
Bow Tweaks

See merge request veloren/veloren!2375
 2021-06-04 18:33:35 +00:00
juliancoffee
554828e1a1 Bow Tweaks 
- M1 (charged) got faster charge, but lesser damage and energy regen
- M2 (repeater) got faster charge, but lesser damage and max speed
- S1 (shotgun) got less energy cost
 2021-06-04 20:58:08 +03:00
Marcel Märtens
1015af13d4 update dependencies 2021-06-04 09:44:30 +02:00