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,746 Commits 151 Branches 18 Tags 2.1 GiB
5929cfa5c7
Commit Graph

2026 Commits

Author SHA1 Message Date
CapsizeGlimmer
73a29b339c Added chat bubbles. Refactored bubble+name+hp+energy into new overhead widget 2020-05-27 13:49:13 +02:00
Justin Shipsey
ea07d744a7 orientation animation 2020-05-27 06:41:55 +00:00
Treeco
ec2ed4da2c Change a bunch of settings defaults, fix sprite looting key 2020-05-25 15:44:27 +01:00
Joshua Yanovski
f8376fd5dc Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes 2020-05-21 17:53:57 +02:00
Monty Marz
9d7e0aad12 Aeronic/forest tune 2020-05-21 04:09:59 +00:00
Joshua Yanovski
654f7e0492 Correct backface culling. 2020-05-20 21:22:30 +02:00
Joshua Yanovski
560501df05 Greedy messhing for shadows. 2020-05-19 17:22:06 +02:00
Joshua Barretto
f09af7980f Fixed aiming for non-humanoids 2020-05-19 14:47:51 +01:00
Joshua Barretto
5c3a08e450 Updated changelog and fmt 2020-05-19 14:41:08 +01:00
Joshua Barretto
05e6df1b65 Added overhead aiming camera 2020-05-19 14:26:53 +01:00
Joshua Barretto
2f47d09af4 Comment fixes and fmt 2020-05-19 00:35:58 +01:00
Joshua Barretto
f1b166d15d Innumerable camera improvements 2020-05-18 23:40:28 +01:00
Joshua Yanovski
a4d87e1875 Shadow maps work for lantern. 2020-05-17 05:59:00 +02:00
Justin Shipsey
bb85dab281 Merge branch 'treeco/build-mode-fixes' into 'master' 
Swapped block placement and destruction buttons

See merge request veloren/veloren!995
 2020-05-16 23:48:25 +00:00
Monty Marz
ecb7963730 Pfau/0.6 bg 2020-05-16 12:48:29 +00:00
Marcel Märtens
ec03c4518a Change the version number to 0.6 2020-05-16 00:50:40 +02:00
Treeco
a338ed3f24 Swapped block placement and destruction buttons 
Also capped placement range to match destruction range
 2020-05-15 17:39:44 +01:00
Joshua Yanovski
243d0837b8 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes 2020-05-15 14:53:13 +02:00
Joshua Yanovski
04382dc286 WIP: better graphics config, better LOD, shadow maps. 2020-05-15 14:22:17 +02:00
Mckol
cbfe3d52fc Merge branch 'Mckol/552-fix-persistence-crash' into 'master' 
Fix #552

Closes #552

See merge request veloren/veloren!984
 2020-05-15 00:45:41 +00:00
Mckol
48c5d37a5d Make singleplayer use voxygen's config path for persistence path. 2020-05-15 01:54:13 +02:00
Imbris
649075c89a Merge branch 'imbris/small-fix' into 'master' 
Show main menu even if there are no stats

See merge request veloren/veloren!990
 2020-05-14 23:47:34 +00:00
Imbris
eac11ecfe8 Show main menu even if there are no stats 2020-05-14 19:10:27 -04:00
CapsizeGlimmer
0a723614f9 Popup message when setting waypoint 2020-05-14 16:56:10 +00:00
Shane Handley
e852e0cfab - Update the stats of characters individually, reverting the change with 
big combined updates.
- Add a timer to the stats persistence system and change the frequency
that it runs to 10s
- Seperate the loading of character data for the character list during
selection, and the full data we will grab during state creation. Ideally
additional persisted bits can get returned at the same point and added
to the ecs within the same block.
 2020-05-13 09:14:09 +10:00
Shane Handley
7c6c9f4302 Stats persistence 
- Update client code to use persisted stats
- Add a system for stats persistence
- Add a basic scheduler to control duration between execution of
persistence systems
 2020-05-13 09:14:08 +10:00
Shane Handley
e5853dbdd4 Initial models, migration and client code for stats persistence. 2020-05-13 09:14:08 +10:00
jshipsey
ceb771bb2c keep mobs from exploding whenever they're hit 2020-05-11 21:44:21 -04:00
jshipsey
ef70949d5d cyclops 2020-05-11 21:44:21 -04:00
jshipsey
137c700b80 fix swim bug 2020-05-11 21:44:21 -04:00
Forest Anderson
28402e2bc1 Merge branch 'CapsizeGlimmer/tab_completion' into 'master' 
Capsize glimmer/tab completion

See merge request veloren/veloren!972
 2020-05-11 17:49:26 +00:00
Imbris
3450bfabfd Add orientation to debug text 2020-05-11 00:10:03 -04:00
Imbris
8aa88b22a5 Fix panic with dragging into the same loadout slot 2020-05-11 00:08:43 -04:00
CapsizeGlimmer
9d118b55a0 Fixed player list tab completion 2020-05-10 19:17:17 -04:00
CapsizeGlimmer
b486de28ac Implement tab completion of enums (/object /time /spawn) and numbers 2020-05-10 19:16:34 -04:00
CapsizeGlimmer
28e94afd3f Finish tab completion implementation 2020-05-10 19:16:15 -04:00
CapsizeGlimmer
24fa23fef4 Initial client implementation of tab completion 2020-05-10 19:16:01 -04:00
CapsizeGlimmer
58b0e9ef75 Move cursor to end when moving through chat history 2020-05-09 21:51:02 -04:00
jshipsey
5b48fe5661 delete unused jump file 2020-05-09 19:59:34 -04:00
Snowram
4ba222abcd Fix dragon jaw Z fighting 2020-05-10 01:40:53 +02:00
jshipsey
41ff0bde69 rebase 2020-05-09 18:56:08 -04:00
jshipsey
cf392b5a66 fmt 2020-05-09 18:11:25 -04:00
jshipsey
62bd79dba7 dragon and general animation cleanup 2020-05-09 18:10:24 -04:00
Snowram
5b77c74497 Add cockatrice 2020-05-09 18:09:27 -04:00
Snowram
0248c6a44e Cleanup 2020-05-09 18:09:27 -04:00
jshipsey
a6de8159f6 dragon adjustments. tweaks to humanoid run, fix for first person glide and other small fixes 2020-05-09 18:09:06 -04:00
Snowram
9d2277ecd4 Better animations 2020-05-09 18:09:06 -04:00
jshipsey
5b518b137c skeletal tweaks 2020-05-09 18:09:06 -04:00
Snowram
cd452cc715 New dragon model, added jaw, splitted head into upper/lower 2020-05-09 18:09:05 -04:00
Snowram
875838ecdf Initial fly animation work 2020-05-09 18:08:35 -04:00
Snowram
9027967fb7 Initial run animation work 2020-05-09 18:08:35 -04:00
Snowram
7f0d1e9543 Initial idle animation work 2020-05-09 18:08:35 -04:00
Snowram
33f8a47cfa Symmetry of dragon skeleton 2020-05-09 18:08:35 -04:00
Robin Gilh
edcde84505 Dragon work 2 2020-05-09 18:07:31 -04:00
Robin Gilh
40360ff149 Dragon work 2020-05-09 18:07:31 -04:00
S Handley
5a13b54cbf - Load characters after login. 
- Make the character screen load with an empty character list from the server, send event to the server for character creation with data, but not yet saving them to the DB.
- Working but messy character saving to DB
- Add the character_data to the client, rather than keep it in the GLobalState.
 2020-05-09 15:41:25 +00:00
CapsizeGlimmer
28c454f9ca Fix infinitys and NaNs in lights 2020-05-04 17:17:54 -04:00
CapsizeGlimmer
701f38ab69 Enter the world by pressing "enter" at character selection 2020-05-04 19:08:51 +02:00
CapsizeGlimmer
4e7f8c686a Equipped lanterns now provide an illumination effect. 2020-05-04 15:15:31 +00:00
Joshua Yanovski
746a10e8d0 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes 2020-05-02 04:02:09 +02:00
Monty Marz
f5c2341167 Shoulder offsets, meta.ron versioning 2020-05-01 21:27:12 +00:00
Monty Marz
c792cc05a9 Villagers and Cultists 2020-04-30 20:43:24 +00:00
Joshua Barretto
1e91f7a0ab Added 1 extra bit per figure vertex position component, resolved char screen bug 2020-04-29 15:22:08 +01:00
Marcel Märtens
83af40a460 Allow for 0.5 offsets in figures 2020-04-29 14:10:46 +02:00
Joshua Yanovski
ef67bd58ba Experimental underwater lighting. 2020-04-28 20:49:03 +02:00
Justin Shipsey
171e865f57 new animals 2020-04-28 03:13:23 +00:00
Joshua Yanovski
2c5ad9d076 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes 2020-04-27 22:35:24 +02:00
Joshua Yanovski
e0452e895c More proper HDR. 2020-04-27 13:13:23 +02:00
Justin Shipsey
b4af588a00 skel attribute transfer 2020-04-27 05:11:34 +00:00
Joshua Yanovski
cc39e5734e More LOD fixes. 2020-04-26 21:01:23 +02:00
Joshua Barretto
390e46b752 Fixed unit tests 2020-04-26 18:50:21 +01:00
Monty Marz
6d7cb8654d Merge branch 'pfau/ui-fixes' into 'master' 
UI Fixes

See merge request veloren/veloren!946
 2020-04-26 01:44:56 +00:00
Monty Marz
4521791591 UI Fixes 2020-04-26 01:44:56 +00:00
Justin Shipsey
6fa13bcb7e body/anim tweaks 2020-04-26 01:09:03 +00:00
Joshua Yanovski
bc2560ea90 Merge remote-tracking branch 'origin/master' into sharp/small-fixes 2020-04-25 23:48:33 +02:00
Joshua Barretto
90de779559 Better LoD variable names 2020-04-25 21:44:23 +01:00
Joshua Barretto
93105105e0 Added extra LoD level to terrain sprites 2020-04-25 21:44:23 +01:00
Joshua Barretto
8e95444d85 Made GPU bone updates more conservative for moar fps 2020-04-25 21:44:23 +01:00
Joshua Barretto
7208b37dc5 Squashed figure vertices for better performance 2020-04-25 21:44:23 +01:00
Joshua Barretto
37301706d4 Reduced size of terrain sprite vertices 2020-04-25 21:44:23 +01:00
Joshua Barretto
c05f4fe009 Added configurable sprite view distance, minor bug fixes 2020-04-25 21:44:23 +01:00
Joshua Barretto
8bf5709ddf Implemented Treeco's z-only LoD suggestion 2020-04-25 21:44:23 +01:00
Joshua Barretto
1feae79243 Added reseeding for sites 2020-04-25 21:44:23 +01:00
Pfauenauge90
3421b3d8da sprites VD slider visuals 2020-04-25 21:44:23 +01:00
Joshua Barretto
ebd1537769 Fixed figure update rate at a distance 2020-04-25 21:44:23 +01:00
Joshua Barretto
39b88dbcb1 Added LoD for figures and reduced update rates for far figures 2020-04-25 21:44:23 +01:00
Joshua Barretto
3e62f7edc3 Better LoD distance scaling 2020-04-25 21:44:23 +01:00
Joshua Barretto
e498d78b6c Fixed boundary meshing issue for scaled terrain sprites 2020-04-25 21:44:23 +01:00
Joshua Barretto
b2c8dc0806 Added terrain sprite LoD 2020-04-25 21:44:23 +01:00
Joshua Yanovski
f7b497a0c2 Render figures again. 2020-04-25 03:22:49 +02:00
Joshua Yanovski
44e4aad48d Merge remote-tracking branch 'origin/master' into sharp/small-fixes 2020-04-25 02:01:04 +02:00
Treeco
dd08def18f Add camera smoothing setting 2020-04-23 22:59:34 +00:00
Joshua Barretto
0a892e488a Updated examples 2020-04-23 18:20:34 +01:00
Joshua Barretto
1a4c7f46f4 Fixed second render chunk counting issue 2020-04-23 18:19:42 +01:00
Joshua Barretto
2a6a19f7ef fmt 2020-04-23 18:19:42 +01:00
Joshua Barretto
0c491bb558 Fixed incorrect chunk render counter 2020-04-23 18:19:42 +01:00
Joshua Barretto
01e2cd2b88 Warning cleanup 2020-04-23 18:19:42 +01:00
Joshua Barretto
444f2ecb45 Made /waypoint admin-only, MR cleanup 2020-04-23 18:19:41 +01:00
Joshua Barretto
1983fd8ec1 Cleanup, fixed clouds, removed 45-degree terrain sprites 2020-04-23 18:19:41 +01:00
Joshua Barretto
60bf396e4f Added doors to houses 2020-04-23 18:19:41 +01:00
Monty Marz
44c5002db3 Pfau/crops 2020-04-23 18:19:41 +01:00
Joshua Barretto
431e199731 Added correctly generating world paths, sub-voxel shader noise 2020-04-23 18:19:41 +01:00
Joshua Barretto
431b2ae07b Fixed window mask layering, fmt 2020-04-23 18:19:41 +01:00
Joshua Barretto
58874803a3 Disabled chunk mesh sorting for now 2020-04-23 18:19:41 +01:00
Joshua Barretto
77d0292e91 Added windows to buildings and scarecrows 2020-04-23 18:19:41 +01:00
Joshua Barretto
a9adebcab3 Improved rendering performance with smarter meshing order 2020-04-23 18:19:41 +01:00
Pfauenauge90
db5311189d scarecrow 2020-04-23 18:19:41 +01:00
jshipsey
729912d33b corrected villager empty weapon issue 2020-04-23 18:19:41 +01:00
jshipsey
a89b28e117 adjusted run animation to allow villager walking 2020-04-23 18:19:41 +01:00
Pfauenauge90
98704a4753 turnip and window blocks 2020-04-23 18:19:41 +01:00
Joshua Barretto
6448c17110 Fixed sprite AO, overhauled entity spawning, better enemy spawning in dungeons, made agents more skilled at combat 2020-04-23 18:19:41 +01:00
Monty Marz
0fb3a115da Add more crops 2020-04-23 18:19:41 +01:00
Joshua Barretto
e3ebdc56b3 Fixed figure AO (still need to do sprite AO), added more control over NPC spawning, loot in dungeons 2020-04-23 18:19:41 +01:00
Joshua Barretto
866fd1992e Fixed bad AO quad flipping in dark places, bosses spawning in dungeon walls, large creatues being uncompromisingly pedantic when trying to path towards targets 2020-04-23 18:19:41 +01:00
Joshua Barretto
fd14223c33 Basic boss spawning in dungeons, better AO 2020-04-23 18:19:41 +01:00
Joshua Barretto
c4879e991d Enabled AO in darkness, better light attenuation 2020-04-23 18:19:41 +01:00
Joshua Barretto
568a8ab87c Increased block rendering altitude range 2020-04-23 18:19:41 +01:00
Joshua Barretto
48e67ba9c0 Fixed terrain sprite AO 2020-04-23 18:19:41 +01:00
Joshua Barretto
f999edffaa Fixed crop crash issues 2020-04-23 18:19:41 +01:00
Pfauenauge90
d57ca371e2 fix panic 2020-04-23 18:19:41 +01:00
Pfauenauge90
4b72a07e22 sprites 2020-04-23 18:19:41 +01:00
Pfauenauge90
fd3ffdf28b pizza sprite 2020-04-23 18:19:40 +01:00
Pfauenauge
67f27ef970 ember sprite 2020-04-23 18:19:40 +01:00
Joshua Barretto
8c73ec982c Resolved rebase problems 2020-04-23 18:19:40 +01:00
Joshua Barretto
b3c9122395 Overhauled domestic economy simulation, better debug information 2020-04-23 18:19:40 +01:00
Joshua Barretto
a0dae82a2b Added correctly allocated labours, fishing 2020-04-23 18:19:40 +01:00
Joshua Barretto
df5aa93fd7 Better AO, fixed cloud pixelation 2020-04-23 18:19:40 +01:00
Joshua Barretto
3d4a294b83 Smoothed camera motion, gentler orientation lerping 2020-04-23 18:19:40 +01:00
Joshua Barretto
5f2d0021a3 Reversed water draw order 2020-04-23 18:19:40 +01:00
Joshua Barretto
0021bd6452 Added new settlement generation to world, basic rendering 2020-04-23 18:19:40 +01:00
Joshua Barretto
944a37b848 Initial settlement generation work 2020-04-23 18:19:40 +01:00
Songtronix
26e27f4198 fix toolchain 2020-04-21 20:04:55 +00:00
Joshua Yanovski
1015e60dee More lighting changes. 2020-04-21 18:25:19 +02:00
Imbris
b3c54a9bbb Merge branch 'olexorus/fix_serverlist_panic' into 'master' 
Fix panic if default server index is out of bounds

See merge request veloren/veloren!909
 2020-04-14 17:06:51 +00:00
Olexorus
027d0f11da Fix panic if default server index is out of bounds 2020-04-14 18:32:01 +02:00
Joshua Yanovski
80c264abd1 Lighting experiments. 2020-04-13 00:29:59 +02:00
Pfauenauge
25a9d5bf2f resolved comments 2020-04-12 21:45:19 +02:00
Imbris
b98680b9cb fix example 2020-04-12 13:42:09 -04:00
Pfauenauge90
cee1c2f85b cleanup, slot background, scaling 2020-04-12 18:41:10 +02:00
Imbris
b9a66a93b7 Add backgound to hotbar slots 2020-04-12 18:41:09 +02:00
Imbris
c6b5570637 Move item amount text to bottom right 2020-04-12 18:41:09 +02:00
Imbris
cae5313127 tooltips for the skillbar 2020-04-12 18:41:08 +02:00
jshipsey
d7e605e658 lantern visuals, random cape flutter 2020-04-12 18:41:08 +02:00
Imbris
2c4c006396 Lantern tweaks, remove unused bones 2020-04-12 18:41:07 +02:00
Imbris
f81f91162d Basic hotbar functionality 2020-04-12 18:41:07 +02:00
Imbris
77d13376d3 Add right click to use, latern is not armor tweaks 2020-04-12 18:41:07 +02:00
Imbris
f52d66d721 Fix selecting and remove amount text when dragging 2020-04-12 18:41:06 +02:00
Imbris
c1c09dce1b Enable unequipping as well as equipping to specific slots 2020-04-12 18:41:06 +02:00
Imbris
66b4c0d529 rework slot trait 2020-04-12 18:41:05 +02:00
jshipsey
e2d60b858e cape work 2020-04-12 18:41:05 +02:00
Pfauenauge90
88a938653b translation fix 2020-04-12 18:41:04 +02:00
Pfauenauge90
0a52dc61d6 hotbar text shadows 2020-04-12 18:41:04 +02:00
Pfauenauge90
f24ba71d94 hotbar keybindings 2020-04-12 18:41:03 +02:00
Pfauenauge90
a29f199e80 fmt 2020-04-12 18:41:02 +02:00
Pfauenauge90
2263b9be95 starter chest, removed unused key commands 2020-04-12 18:41:02 +02:00
Pfauenauge90
d62dfffd69 starter armor in char creation 2020-04-12 18:41:01 +02:00
Pfauenauge90
0fb5b73606 fix 2020-04-12 18:41:00 +02:00
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
Joshua Yanovski
8414987e58 WIP -- lighting changes and soft shadows. 2020-04-09 02:38:40 +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
Joshua Yanovski
4764415312 Merge branch 'sharp/map-colors' into sharp/small-fixes 2020-04-03 04:54:48 +02: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
Joshua Yanovski
ed2d0111d9 Combining colors and LOD. 2020-04-02 06:49:27 +02: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
Joshua Yanovski
33140a2951 Merge remote-tracking branch 'origin/master' into zesterer/lod 2020-04-02 04:36:21 +02: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
7b6c6111f0 Merge branch 'capucho/password_cursor_fix' into 'master' 
Fix the cursor lagging behind on the password field

See merge request veloren/veloren!859
 2020-03-31 16:39:56 +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
Capucho
7851a407b1 Fix the cursor lagging behind on password field 2020-03-24 21:41:59 +00: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
Acrimon
bc39b78173 Rebased. 2020-03-08 23:02:15 +01: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