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,846 Commits 151 Branches 18 Tags 2.1 GiB
86b4dd6ba3
Commit Graph

614 Commits

Author SHA1 Message Date
Monty Marz
b34da9b07b More item drops 2020-06-03 17:59:09 +00:00
scott-c
136bf271b8 Fix social list having incorrect player count 2020-06-01 22:04:44 +08:00
scott-c
c23183b1ca Add character name and level to social window 2020-06-01 22:04:44 +08:00
scott-c
66f6368e83 Handle out of bounds panic 2020-06-01 21:56:46 +08:00
scott-c
288c7cdbfa fix #562 Confusing chat alias 2020-06-01 21:36:39 +08:00
Monty Marz
f7d6f76a04 Added 36 Swords 
I added 36 sword models to the code.
 2020-05-29 18:23:00 +00:00
CapsizeGlimmer
d5216cc8f3 Redraw dark mode bubbles. Add padding to light mode bubbles. 2020-05-27 13:49:19 +02:00
CapsizeGlimmer
3cea76b82f NPCs now call for help when you hit them. Redraw speech bubble dark mode. 2020-05-27 13:49:18 +02:00
CapsizeGlimmer
3c07d02218 Add a dark mode to speech bubbles; consistantly use 'speech bubble' instead of 'chat bubble' 2020-05-27 13:49:17 +02:00
CapsizeGlimmer
c65967ccdb Chatting now creates speech bubbles 2020-05-27 13:49:14 +02:00
CapsizeGlimmer
73a29b339c Added chat bubbles. Refactored bubble+name+hp+energy into new overhead widget 2020-05-27 13:49:13 +02:00
Treeco
ec2ed4da2c Change a bunch of settings defaults, fix sprite looting key 2020-05-25 15:44:27 +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
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
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
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
CapsizeGlimmer
4e7f8c686a Equipped lanterns now provide an illumination effect. 2020-05-04 15:15:31 +00:00
Monty Marz
4521791591 UI Fixes 2020-04-26 01:44:56 +00:00
Joshua Barretto
c05f4fe009 Added configurable sprite view distance, minor bug fixes 2020-04-25 21:44:23 +01:00
Pfauenauge90
3421b3d8da sprites VD slider visuals 2020-04-25 21:44:23 +01:00
Treeco
dd08def18f Add camera smoothing setting 2020-04-23 22:59:34 +00:00
Pfauenauge
25a9d5bf2f resolved comments 2020-04-12 21:45:19 +02: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
Imbris
f81f91162d Basic hotbar functionality 2020-04-12 18:41:07 +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
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
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
Pfauenauge90
fa03f9ddb9 slot kinds 2020-04-12 18:40:56 +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
Carbonhell
198c875559 Carbonhell/keybindings 2020-04-08 17:36:37 +00:00
Monty Marz
07242644ca Small UI fixes 2020-04-04 21:51:06 +00: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
Capucho
3f1f9b9ab0 Make so that the resume button doesn't eject the mouse 2020-03-30 22:00:46 +01:00
Pfauenauge90
e3a5051b52 small fix 2020-03-28 18:06:00 +01: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
Capucho
15ecdfb9b4 Added an option for hold and added everything to the settings 2020-03-27 18:35:52 +00:00
Pfauenauge90
11be9c10b2 remapped default look key, removed unused keys 2020-03-27 16:09:51 +01:00
Pfauenauge90
50b7206577 asset cleanup, map visuals 2020-03-27 04:06:27 +01:00
timokoesters
fe2aa7da7b Merge remote-tracking branch 'origin/master' into combat 2020-03-26 23:43:33 +01:00
Capucho
03396eb77e Implement #505 2020-03-26 21:22:21 +00: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
Pfauenauge90
550dd144bc new icon art 2020-03-25 01:41:43 +01: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
Pfauenauge90
4153df66ea stat icons, frame colours 2020-03-20 20:52:32 +01:00
timokoesters
df858cb370 Remove all warnings 2020-03-20 15:45:36 +01:00
Pfauenauge90
6094e4b017 added chest drops 2020-03-20 01:11:02 +01:00
Pfauenauge90
3145b26cd6 item images 2020-03-19 22:36:40 +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
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
Pfauenauge90
7ded921ecc more UI visuals 2020-03-16 22:58:19 +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
81591fcaf7 Make npcs attack again 2020-03-16 14:27:52 +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
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
timokoesters
598a4c6cbb Add loadout struct for info on weapon configurations 2020-03-14 22:33:20 +01:00
timokoesters
fe19698d52 Make abilities depend on weapon 2020-03-14 16:40:29 +01:00
Adam Whitehurst
096d3b691e Merge master 2020-03-07 12:49:15 -08: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
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
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
Capucho
a97b694dfe Groundwork for fixing #36 and rewrite of client timeouts so that they don't use Instant and Duration 2020-03-05 18:38:39 +00:00
Shane Handley
9d8d61736b Deselect the inventory slot after dropping an item. 2020-03-05 16:11:45 +09:00
timokoesters
d0439fdd84 Merge remote-tracking branch 'origin/master' into clientstates 2020-02-24 21:34:17 +01:00
Monty Marz
2180040f70 Orc hairstyles, several tiny UI fixes, fixed beard warnings 2020-02-20 10:32:03 +00:00
Monty Marz
18f46a6f83 Fix Fonts 2020-02-17 16:22:49 +00:00
Treeco
abe47d8621 Gamma setting now works 2020-02-17 00:46:31 +00:00
Treeco
aaf1de9f9b Added gamma setting, not hooked up yet 2020-02-16 20:32:17 +00:00
Rémy PHELIPOT
98c37d0b28 [i18n] Configurable fonts 
- Add font configuration in internationalization files
- Scale font size using a configurable ratio
- Add a script to identify translation item statuses using Git metadata
- Execute the i18n script in a new gitlab-ci step (delayed)
- Clone haxrcorp_4089_cyrillic_altgr font (haxrcorp_4089_cyrillic_altgr_extended)
  to add some additional latin characters (mainly for French)
 2020-02-16 16:02:38 +01:00
Monty Marz
90680d5490 Fix healthbar background alignment 2020-02-16 10:58:44 +00:00
Imbris
fb7edd2404 Make nametag positioning slightly better 2020-02-06 17:10:52 -05:00
Monty Marz
93d7c67cdc Hack to allow minimap rotation. 
Currently it just always rotates towards the camera, but it wouldn't be
hard to create a config option that swaps out the rotation of the
indicator and the map.
 2020-02-06 17:34:32 +00:00
timokoesters
0bc07a0835 Merge remote-tracking branch 'origin/master' into clientstates 2020-02-03 22:02:32 +01:00
Marcel Märtens
dae31ae5b6 apply new rustfmt - touching alot of files 2020-02-01 21:39:39 +01:00
Marcel Märtens
dd21235ff8 Apply prefixes to veloren source, espacially comments, so that reformating wont make it unreadable, 
especially enumerations and other source code in errosions file
 2020-02-01 21:37:36 +01:00
Joshua Barretto
faa86226c7 Collars 2020-01-29 12:01:28 +00:00
Rémy PHELIPOT
ce54f27531 Add missing translations 2020-01-27 20:34:36 +01:00
Rémy PHELIPOT
8946ed8d82 Add missing translations in voxygen 
Fix #436
 2020-01-27 19:59:17 +01:00
Monty Marz
49071400d2 Fix: Healthbars size 2020-01-26 01:19:36 +00:00
Imbris
460f5e6f26 Enable pixel art resizing for voxel based ui elements 2020-01-24 23:14:59 -05:00
Imbris
e5d841e62f Adds fullscreen and window size settings and coverage based pixel art 
scaling
 2020-01-24 23:14:59 -05:00
Imbris
166aba61f0 Make nametages etc fixed size and only display within limited range 2020-01-24 22:09:45 -05:00
Pfauenauge90
c08c545474 fixed numbers spam 2020-01-24 16:10:38 +01:00
Joshua Yanovski
3383e991e7 Erosion cleanup, part 1. 
Covers all files touched by MR that are not in world/src/sim.
 2020-01-23 18:18:17 +01:00
Joshua Yanovski
14e4dfb53f Re-fix map orientation. 2020-01-23 18:18:13 +01:00
Joshua Yanovski
e91578ffdb Cargo fmt most things (except erosion.rs). 2020-01-23 18:18:12 +01:00
Joshua Yanovski
9520ef4f6d Implement sending world map across the network. 2020-01-23 18:18:11 +01:00
Monty Marz
bfee0a6f9e Character stats displayed in char window, pulsating active slot in inventory 2020-01-23 17:14:02 +00:00
Monty Marz
1365abae99 Clean up unused UI assets 2020-01-22 21:56:03 +00:00
Rémy PHELIPOT
a6f9f533a5 Localization system for Voxygen 
- Added a localization system in voxygen
- Support English and French languages
- Added a configuration option in the interface settings to change
  the language
 2020-01-20 21:07:25 +01:00
Joshua Yanovski
898b5c6593 Fix benchmarks and profile overrides. 
This was necessary because Cargo recently deprecated the "overrides"
keyword in favor of "package", and Criterion changed its interface.

This commit also now lists more configurable keys, so if they aren't set
to their defaults the user will be able to find them.  This includes the
roll key, which wasn't listed earlier and is different on Windows and
Mac.  It does *not* include the respawn key because that key is already
shown when you die.
 2020-01-20 14:16:28 +01:00
Joshua Yanovski
355a1b204a Fixes for OS X machines. 
Handles scroll wheel events in pixels (enabling the scroll wheel) and
sets rolling and wall leaping to use left shift by default on OS X
(instead of middle mouse click, which is absent by default on Apple
trackpads).  Also updates the controls UI to show the actual assigned
keys for those controls which are configurable.
 2020-01-20 05:12:41 +01:00
Pfauenauge90
8a0efd3654 added TODO for energy numbers 2020-01-19 22:39:20 +01:00
Pfauenauge90
885e698e5a charge icon update 2020-01-19 22:39:19 +01:00
Pfauenauge90
6a32845e58 various fixes 2020-01-19 22:39:19 +01:00
Pfauenauge90
480b920fa3 skillbar background fix 2020-01-19 22:39:18 +01:00
Pfauenauge90
863e4c4962 darkened button for unavailabe charge 2020-01-19 22:39:18 +01:00
Imbris
94210070f7 fmt fix 2020-01-19 16:03:27 -05:00
timokoesters
ae1fa5e4c4 improvement: fog doesn't go back and forth anymore 2020-01-19 16:03:27 -05:00