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
4,018 Commits 151 Branches 18 Tags 2.1 GiB
475f62b57f
Commit Graph

1613 Commits

Author SHA1 Message Date
Pfauenauge90
85f9f80024 starter equip 2020-04-12 18:41:00 +02:00
Pfauenauge
6dcdd80ec8 smarter code 2020-04-12 18:40:59 +02:00
Pfauenauge
c6eda08679 fmt 2020-04-12 18:40:59 +02:00
Pfauenauge
d5128b751d png item images, fix map cursor 2020-04-12 18:40:59 +02:00
Pfauenauge90
ca667fd02b tooltips 2020-04-12 18:40:58 +02:00
jshipsey
ea2c646df3 initial cape implementation 2020-04-12 18:40:57 +02:00
Pfauenauge90
fa03f9ddb9 slot kinds 2020-04-12 18:40:56 +02:00
Pfauenauge90
f5a768dccf more armour types 2020-04-12 18:40:56 +02:00
Pfauenauge90
7f97fbac0b cape item 2020-04-12 18:40:56 +02:00
Pfauenauge90
771baaaae5 cape item 2020-04-12 18:40:55 +02:00
Imbris
1f31b7f123 Drag things! 2020-04-12 18:40:55 +02:00
Imbris
6c336c015e Make remove skin in armor item images 2020-04-12 18:40:54 +02:00
Imbris
77948d27ca Scale content image based on slot size, fix weapon images not showing, stop selection of empty slots 2020-04-12 18:40:54 +02:00
Imbris
4c5f668203 Don't show icon when slot is filled and have a separate image for filled 
slot backgrounds
 2020-04-12 18:40:54 +02:00
Pfauenauge
cac2321464 armor slot visuals 2020-04-12 18:40:53 +02:00
Imbris
0b932ae99a Use new slot widget for armor slots 2020-04-12 18:40:53 +02:00
Imbris
968c064874 Restore slot interaction functionality 2020-04-12 18:40:52 +02:00
Imbris
9c76bdde0e Setup basic generic slot system and used it for the inventory slots 2020-04-12 18:40:52 +02:00
Olexorus
4bd7e5ab67 Allow passwords with up to 35 characters 2020-04-12 13:52:39 +02:00
Carbonhell
c0c92c4259 Fixes mouse_input event not being pushed everytime 2020-04-09 18:43:12 +02:00
Carbonhell
20ec77eeb0 Fixes mouseinput event ignoring cursor_grabbed being true 2020-04-08 23:46:42 +02:00
Capucho
b6078d832a Fixed the player being rendered after dying 2020-04-08 21:28:33 +01:00
Carbonhell
198c875559 Carbonhell/keybindings 2020-04-08 17:36:37 +00:00
Capucho
8f6686adc1 Fix the problems of players walking over water with dithering 2020-04-07 22:50:01 +00:00
Monty Marz
32db0df208 Merge branch 'pfau/small_ui_fixes' into 'master' 
Small UI fixes

See merge request veloren/veloren!888
 2020-04-04 21:51:06 +00:00
Monty Marz
07242644ca Small UI fixes 2020-04-04 21:51:06 +00:00
Imbris
e2c818b556 Merge branch 'imbris/fix' into 'master' 
Remove newline from password when pressing enter

See merge request veloren/veloren!887
 2020-04-04 21:45:30 +00:00
Capucho
a21ae27a77 Add player transparency and silhouette 2020-04-04 19:36:55 +00:00
Imbris
d36c2cac99 Trim newlines from password when pressing enter 2020-04-04 13:55:25 -04:00
Songtronix
4fdf6896ab Merge branch 'shandley/fix-sfx' into 'master' 
Fix run SFX

See merge request veloren/veloren!880
 2020-04-02 07:05:33 +00:00
Shane Handley
3e4b40380f fix: Restore run SFX when the character is using a weapon other than the sword. 2020-04-02 14:47:26 +11:00
Imbris
831d7c77a6 Make Asset impls avoid panics when parsing fails 2020-04-01 20:06:15 -04:00
Imbris
97148cb6bb Merge branch 'master' into 'combat' 
# Conflicts:
#   CHANGELOG.md
 2020-04-01 20:42:27 +00:00
Imbris
87a82bb59a Fix tests 2020-04-01 11:41:26 -04:00
Marli Frost
3806f08eb0
feat: configure audio output using an enum 2020-03-31 22:29:30 +01:00
Marli Frost
a83f09bd60
fix: avoid rodio API when audio is disabled 2020-03-31 21:28:09 +01:00
Marli Frost
c82d1b9316
allow the game to start without an audio device 2020-03-31 21:27:55 +01:00
Imbris
508def2701 Merge branch 'capucho/resume-do-not-eject-cursor' into 'master' 
Don't eject mouse on resume

Closes #307

See merge request veloren/veloren!873
 2020-03-31 16:50:45 +00:00
Imbris
b3791a2b4e Upgrade vek version so that it actually uses the patch 2020-03-30 19:44:51 -04:00
Capucho
3f1f9b9ab0 Make so that the resume button doesn't eject the mouse 2020-03-30 22:00:46 +01:00
Capucho
abc1a041fa Added a portuguese translation 2020-03-30 22:57:26 +02:00
AdamWhitehurst
d3b99fc026 Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat 2020-03-29 13:40:08 -07:00
AdamWhitehurst
dcc9d44b1c remove unused timed_combo 2020-03-29 13:40:03 -07:00
jshipsey
ff56e5f9f9 fireball damage tweaks/staff shooting anim 2020-03-29 14:00:05 -04:00
jshipsey
fa54c90558 cleanup, tweak to triplestrike stage 1 2020-03-29 03:53:52 -04:00
Pfauenauge90
e3a5051b52 small fix 2020-03-28 18:06:00 +01:00
Imbris
d3b5b1e637 Remove None variant fromm armor types 2020-03-28 03:51:24 -04:00
Imbris
f551c4a2c5 Move armor types to a new location, use a const for the moving cutoff in voxygen anims 2020-03-28 01:52:12 -04:00
jshipsey
8fd774f21a Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat 2020-03-27 23:59:45 -04:00
jshipsey
49ba196671 proper bow animation 2020-03-27 23:59:05 -04:00
Imbris
ba3fa16c33 Create Dir type for better enforcement of non NaN, normalized representations of directions 2020-03-27 22:02:07 -04:00
Capucho
15d2a6d3dc Fix the wrong default keybind change 2020-03-27 19:36:20 +00:00
Capucho
15ecdfb9b4 Added an option for hold and added everything to the settings 2020-03-27 18:35:52 +00:00
AdamWhitehurst
d774091fa4 Add triple_strike anims for axe and hammer 2020-03-27 11:00:58 -07:00
Pfauenauge90
0b3fb2dd3c fire bolt visuals 2020-03-27 18:31:45 +01:00
timokoesters
6fe5c5724c Fix char selection not showing tools 2020-03-27 18:17:41 +01:00
Pfauenauge90
c3a4f897da update help screen 2020-03-27 17:50:34 +01:00
Pfauenauge90
11be9c10b2 remapped default look key, removed unused keys 2020-03-27 16:09:51 +01:00
jshipsey
0ffff86e25 third attack for triple strike 2020-03-27 01:57:30 -04:00
jshipsey
1c3d1d260c small animation tweaks 2020-03-26 23:51:55 -04:00
Pfauenauge90
50b7206577 asset cleanup, map visuals 2020-03-27 04:06:27 +01:00
Shane Handley
362771be4b SFX and unit test fixes. 2020-03-27 12:06:25 +11:00
timokoesters
fe2aa7da7b Merge remote-tracking branch 'origin/master' into combat 2020-03-26 23:43:33 +01:00
jshipsey
7692f1d354 fixed wield feet while jumping, tweaked charge anim 2020-03-26 18:26:23 -04:00
Capucho
03396eb77e Implement #505 2020-03-26 21:22:21 +00:00
jshipsey
175fea98ef more cleanup, WIP fake swimming 2020-03-26 01:35:25 -04:00
Pfauenauge90
5f10cdf0c6 adjusted foot step sounds, inventory space above bag 2020-03-25 21:06:01 +01:00
Pfauenauge90
8b05dda1d9 assset cleanup, transparency, new icons 2020-03-25 16:47:48 +01:00
Imbris
3889ec7292 climbing tweaks, fix triple strike overflow, fix Last<CharacterState> 
not registered
 2020-03-25 02:05:28 -04:00
Imbris
6ba158b7e1 Input handling changes 2020-03-25 01:38:37 -04:00
Adam Whitehurst
37ec191021 update controller tick fn 2020-03-25 01:38:25 -04:00
jshipsey
c7d9b5ae0f fixed critter animation 2020-03-25 01:29:55 -04:00
jshipsey
047f6b8a01 fixed swimming, better charge 2020-03-25 01:22:07 -04:00
jshipsey
a6537ed69b starting foot movement with attacks, clearing some dead code 2020-03-25 00:15:06 -04:00
Pfauenauge90
550dd144bc new icon art 2020-03-25 01:41:43 +01:00
timokoesters
58585e0810 Better climbing, fireball impl 2020-03-24 20:09:23 +01:00
timokoesters
99e7e1f785 Split staff into 3 abilities 2020-03-24 14:00:22 +01:00
jshipsey
7a4f0fa9ac climb fix, const tweak update, trying equip anims 2020-03-24 00:24:31 -04:00
Pfauenauge90
7f30ec3d55 colors for inventory space counter 2020-03-24 01:31:14 +01:00
timokoesters
43d4e8aad2 Better inventory counter 2020-03-24 00:38:00 +01:00
timokoesters
1c145e8d3a Add inventory counter 2020-03-24 00:23:21 +01:00
timokoesters
c01cd62f5f Move meta.dat to ron, so we don't create memory allocation errors 2020-03-23 14:18:05 +01:00
timokoesters
fb16106960 Merge remote-tracking branch 'origin/master' into combat 2020-03-23 11:30:47 +01:00
jshipsey
eddf3ec658 raised run anim speed 20% 2020-03-22 21:32:34 -04:00
Capucho
0358caa173 Fix the wrong logs directory being displayed on panic 2020-03-22 22:06:05 +00:00
jshipsey
9cbbe0311f rewrote the whole stupid skeleton to work much smarter 2020-03-22 16:06:53 -04:00
jshipsey
3baa0471ec Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat 2020-03-22 11:55:35 -04:00
jshipsey
0773524031 wield idle, wield run 2020-03-22 11:55:28 -04:00
Pfauenauge90
662f5b1037 removed warnings and item test values 2020-03-22 14:55:08 +01:00
Adam Whitehurst
db8d89a4d9 * rename CharacterState equals() -> same_variant() 2020-03-22 05:46:09 -07:00
Imbris
41c424ac13 Optimized uses of emitters, cleanup 2020-03-22 00:49:46 -04:00
jshipsey
eafd761d5a Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat 2020-03-22 00:14:11 -04:00
jshipsey
32c85d1bab axe attack 2020-03-22 00:11:24 -04:00
Imbris
f399085974 Flip models for hands, shoulders, and feet of humanoids 2020-03-21 18:48:21 -04:00
Adam Whitehurst
c5378b7065 Better triple_strike handling 2020-03-21 14:55:04 -07:00
Adam Whitehurst
819c2767bc * move swap loadout to handle_swap_loadout util fn 
* impl From<JoinData> for StateUpdate
 2020-03-21 14:16:26 -07:00
jshipsey
a861f6ad26 Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat 2020-03-21 15:47:28 -04:00
jshipsey
14f560f21b proper hammer smash, small tweaks 2020-03-21 15:47:16 -04:00
jshipsey
221f675217 spin attack 2020-03-21 14:54:29 -04:00
Adam Whitehurst
3ae2b8de2e Remove excess code 2020-03-21 10:32:32 -07:00
Adam Whitehurst
180ec89060 add SwapLoadout 2020-03-21 10:26:38 -07:00
jshipsey
49986a0e09 bow work 2020-03-21 03:40:14 -04:00
Imbris
08db424169 Add safe_slerp function that ensures that slerping returns non-NaN normalized values 2020-03-21 00:53:41 -04:00
jshipsey
514d65eb7c Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat 2020-03-20 18:54:54 -04:00
jshipsey
a0785e693a shooting anim state, cast anim, small tweaks 2020-03-20 18:54:27 -04:00
Adam Whitehurst
0cdb80427d better triple_strike 2020-03-20 15:03:29 -07:00
Pfauenauge90
4153df66ea stat icons, frame colours 2020-03-20 20:52:32 +01:00
timokoesters
44ec09a8e7 Go to idle state when picking items up 2020-03-20 20:23:04 +01:00
timokoesters
df858cb370 Remove all warnings 2020-03-20 15:45:36 +01:00
timokoesters
c630df7f9a Ranged weapons now give xp on kill and also make enemies angry 2020-03-20 14:26:18 +01:00
Pfauenauge90
6836a043af Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat 2020-03-20 13:02:35 +01:00
Pfauenauge90
4f1104a417 new loading screen bg 2020-03-20 13:01:31 +01:00
Songtronix
b940cde501 change(panic): mention the game version in panic 2020-03-20 09:47:00 +01:00
jshipsey
50e96efe6b hammer go smash 2020-03-20 02:38:53 -04:00
jshipsey
93bea033d9 axe, hammer proper wields 2020-03-20 01:27:54 -04:00
Pfauenauge90
6094e4b017 added chest drops 2020-03-20 01:11:02 +01:00
Adam Whitehurst
0b7a572178 update triple_strike 2020-03-19 15:40:03 -07:00
Pfauenauge90
3145b26cd6 item images 2020-03-19 22:36:40 +01:00
timokoesters
1e1ce2adbf Fix weapon not updating after swapping to a weapon of the same type 2020-03-19 20:57:36 +01:00
timokoesters
26674390ab Hide player body after death 2020-03-19 20:36:19 +01:00
Pfauenauge90
44d3f4c4ac fix 2020-03-19 20:01:31 +01:00
Pfauenauge90
3c0e070ed0 stack numbers 2020-03-19 19:33:59 +01:00
Pfauenauge90
e16bb66fb3 fix 2020-03-19 18:19:05 +01:00
Pfauenauge90
466b80e8a8 added const tweaker 2020-03-19 18:11:45 +01:00
timokoesters
6c129c9b8d Fix amounts out of range 2020-03-19 16:51:50 +01:00
Pfauenauge90
0bb0d5e7a6 Update bag.rs 2020-03-19 16:43:11 +01:00
Pfauenauge90
041277917b Update bag.rs 2020-03-19 15:49:32 +01:00
timokoesters
449ae22730 Add inventory stacking 2020-03-19 14:32:17 +01:00
timokoesters
87c276b292 Add hard coded loot 2020-03-18 20:37:42 +01:00
Pfauenauge90
1cb2022d35 UI visuals 2020-03-18 19:51:48 +01:00
Pfauenauge90
43bae55961 coin/currency visuals 2020-03-18 12:05:36 +01:00
Pfauenauge90
70511e0f4e background images 2020-03-18 01:43:55 +01:00
Pfauenauge90
04c8ed9a3c armour slot bgs 2020-03-17 19:48:15 +01:00
Pfauenauge90
d752501db1 Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat 2020-03-17 19:04:11 +01:00
Pfauenauge90
c9d09b8cdd more slots 2020-03-17 19:04:06 +01:00
timokoesters
4741e41230 Add support for different models per weapon type 2020-03-17 18:28:07 +01:00
Pfauenauge90
431974cf8e test armor slot 2020-03-17 17:02:50 +01:00
timokoesters
d6929ae0ea Select newly created character automatically 2020-03-17 16:22:34 +01:00
timokoesters
08b44db1fc Stop first person bounce in air 2020-03-17 16:08:53 +01:00
Pfauenauge90
b9f6dfac77 fixes 2020-03-17 16:07:20 +01:00
Pfauenauge90
40910b28e4 unclothed parts 2020-03-17 15:39:29 +01:00
Pfauenauge90
7ded921ecc more UI visuals 2020-03-16 22:58:19 +01:00
timokoesters
b040e18246 Fix body parts not changing 2020-03-16 22:06:23 +01:00
Pfauenauge90
11e4289f28 small fixes 2020-03-16 20:50:01 +01:00
Pfauenauge90
2e41b59282 removed character window and questlog 2020-03-16 19:56:15 +01:00
Pfauenauge90
b9f61d4e7a UI colourable in the code, stats window 2020-03-16 18:55:43 +01:00
Pfauenauge90
ab8b83f8d6 more bag parts 2020-03-16 18:55:31 +01:00
timokoesters
d5db1f6ca0 Add dash ability to sword M2 2020-03-16 16:34:53 +01:00
timokoesters
81591fcaf7 Make npcs attack again 2020-03-16 14:27:52 +01:00
timokoesters
1279f70184 Add shield item 2020-03-16 13:40:14 +01:00
timokoesters
4195273cf9 Adjust first person camera and underwater wield orientation 2020-03-16 13:19:51 +01:00
timokoesters
87acc01d48 Readd ranged and debug boost. Add bouncing while running in first person 2020-03-16 12:32:57 +01:00
Pfauenauge90
db6099a62f reenabled inventory slots 2020-03-15 19:48:02 +01:00
timokoesters
1f78344d6f Move equipment from loadout into body 2020-03-15 19:44:47 +01:00
Pfauenauge90
817cd24d54 minimap scale 2020-03-15 16:53:28 +01:00
Pfauenauge90
492db3ac5f minimap position 2020-03-15 16:53:28 +01:00
Pfauenauge90
7b77064539 mmap visuals 2020-03-15 16:52:38 +01:00
Pfauenauge90
caf4159463 UI changes 2020-03-15 16:50:37 +01:00
Joshua Barretto
e20feeeb0c Added armour items and equipping of armour 2020-03-15 16:42:09 +01:00
Pfauenauge90
1b170f70c3 Even less blending. 2020-03-15 15:53:51 +01:00
Pfauenauge90
0e7f3a6b00 Update vol.rs 2020-03-15 15:53:51 +01:00
timokoesters
aa963b7686 Merge remote-tracking branch 'origin/master' into clientstates 2020-03-15 15:27:06 +01:00
timokoesters
598a4c6cbb Add loadout struct for info on weapon configurations 2020-03-14 22:33:20 +01:00
AdamWhitehurst
6fc94c22ba Update timed combo, add CharacerBehavior trait 2020-03-14 12:50:07 -06:00
timokoesters
fe19698d52 Make abilities depend on weapon 2020-03-14 16:40:29 +01:00
Shane Handley
4e5d200b70 Fix: Make the dropped item collection range match the world item range limit. 2020-03-12 11:54:23 +09:00
Shane Handley
434dd96cd6 Check for the mousedown state before trying to collect an item via secondary mouse click. 2020-03-11 15:39:46 +09:00
Acrimon
406767ae31 Merge branch 'capucho/voxygen-logout-timeout' into 'master' 
FIX #513 logout timeout

See merge request veloren/veloren!837
 2020-03-10 22:12:29 +00:00
Mckol
c3f1afdf2b Merge branch 'controller' into 'master' 
Controller support

Closes #20

See merge request veloren/veloren!750
 2020-03-10 21:00:13 +00:00
Mckol
8838682f0b Added Controller support 2020-03-10 21:00:13 +00:00
S Handley
b2312a0487 Check that a targeted collectible is within a certain pickup range of the character before highlighting it 2020-03-10 20:50:04 +00:00
Capucho
16e4214a52 Switch states instead of popping 2020-03-10 20:34:50 +00:00
Capucho
9d805a745e Proper fix to the logout timeout problem using Disconnect ACK 2020-03-10 20:34:50 +00:00
Capucho
d8ba63ffdc Janky fix of the logout timeout problem 2020-03-10 20:34:50 +00:00
Imbris
8d7c454029 Hide password text 2020-03-08 23:00:34 +01:00
Imbris
0022f8464d Update auth 2020-03-08 22:59:22 +01:00
Songtronix
d2e12fd166 feat(auth): localisation of authentication errors 2020-03-08 22:58:43 +01:00
Imbris
a04c1b1d1d Add uid to Player component 
fix: world examples
 2020-03-08 22:58:38 +01:00
Acrimon
d4225cfb45 Auth error help message. 
main menu message about auth
 2020-03-08 22:57:09 +01:00
Imbris
6cc07270ac improve(login): more precise error handling during login 2020-03-08 22:56:59 +01:00
Songtronix
ac5ff453cc improve(voxygen): error handling while connecting 2020-03-08 22:54:49 +01:00
Acrimon
7db0ff0b8c Update chat-cli to work properly. 
Update reqwest to 0.10.0
 2020-03-08 22:54:15 +01:00
Imbris
8ef1251dc2 Add warning prompt for untrusted auth servers, move some auth code into 2020-03-08 22:51:37 +01:00
Acrimon
584dcddba9 Updated to latest and greatest auth version. 2020-03-08 22:46:40 +01:00
Songtronix
50b845d1c3 :/ and reactivated the password field 2020-03-08 22:34:06 +01:00
jshipsey
bce9d4c24f animation corrections 2020-03-08 17:02:25 -04:00
Snow
72b2334434 more eagle adjustements 2020-03-08 15:07:47 +00:00
Adam Whitehurst
49c7143144 Clean up warnings 2020-03-07 13:03:10 -08:00
Adam Whitehurst
54a7112ad9 resolve conflicts merging master -> clientstates 2020-03-07 12:49:48 -08:00
Adam Whitehurst
096d3b691e Merge master 2020-03-07 12:49:15 -08:00
jshipsey
d4332c3138 eagle adjustments 2020-03-07 13:26:46 -05:00
Adam Whitehurst
b1d1299fe6 Clean up character states 2020-03-07 10:15:02 -08:00
Imbris
ed5afaec8a Fix tests 2020-03-05 23:12:51 -05:00
Imbris
4a0c474be1 Remove Client dependency from Scene types and audio managers, add an 
example for using voxygen as a library to renderer images of characters
 2020-03-05 23:12:51 -05:00
Acrimon
511bbd3899 Merge branch 'capucho/screenshots-logs-directory' into 'master' 
Save screenshots and logs in a fixed directory

Closes #484

See merge request veloren/veloren!835
 2020-03-05 19:26:07 +00:00
S Handley
ea53dea8a7 Fixes https://gitlab.com/veloren/veloren/issues/484 partially by saving logs to a fixed place (defined in the settings file) 2020-03-05 19:26:07 +00:00
Capucho
a3479f6a49 Fixed the bugs in the settings tab and the character button in the escape menu and unpause when there is more than 1 player 2020-03-05 18:55:14 +00:00
Capucho
6f6b8986b6 Removed logging, added the changes to the changelog and fixed the logout button 2020-03-05 18:55:14 +00:00
Capucho
f13314e3da Fixed the erroneous load on pause 2020-03-05 18:38:39 +00:00
Capucho
af21d19ff3 Moved paused from GlobalState to SinglePlayer to prevent errors and unpauses now works using the resume button 2020-03-05 18:38:39 +00:00