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
6,089 Commits 151 Branches 18 Tags 2.1 GiB
f8c8e342e6
Commit Graph

753 Commits

Author SHA1 Message Date
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
Imbris
9d6bf66a32 Add options to turn off the clouds and to render ugly water 2020-01-19 14:05:31 -05:00
Monty Marz
a4274ef8aa Charge Icon and flashing skillbar 2020-01-17 22:00:00 +00:00
Adam Whitehurst
5959d2a5c7 Fix SFX and Assets 2020-01-16 05:28:45 -08:00
Adam Whitehurst
d82e93b39f Merge master and build 2020-01-16 05:27:30 -08:00
Gilbert Röhrbein
28060e7b6e fixing #405 - Energy as its own component 2020-01-12 22:25:04 +01:00
Monty Marz
f6dfb74b3e fix 
slightly lower trigger velocity

slighty more transp map image
 2020-01-12 19:01:02 +00:00
Pfauenauge90
e0fc3ce425 fixed number shadow for "0" damage appearing on level up 2020-01-11 21:31:57 +01:00
Songtronix
70eb2eed33 remove: discord rich presence 2020-01-10 17:01:50 +01:00
Monty Marz
851d7858e6 Scrolling Combat Text (SCT) 2020-01-10 00:33:38 +00:00
Yusuf Bera Ertan
4a0a2d5229 Cargo fmt 2020-01-08 20:09:54 +03:00
Yusuf Bera Ertan
71db9d6350 Replace radio list with drop down selector for AA mode setting 2020-01-07 20:37:55 +03:00
Adam Whitehurst
8648641362 Grooming 2020-01-07 07:49:08 -08:00
Yusuf Bera Ertan
e32153e980 Improve frustum culling by using AABBs, add related debug information 2020-01-07 18:44:33 +03:00
AdamWhitehurst
ba7ca785f6 Successful build 2019-12-30 05:56:42 -08:00
Monty Marz
8aff5faa83 assets update 
acacia trees
updated help.png
bigger map zone name
npc levels from 0-10
boss levels from 20-50
 2019-12-30 12:16:35 +00:00
Imbris
ec3e075020 fix(player list): Show players not in range on the player list 
fix(overflow): Stops including block updates that fail (since chunks
don't exist on the client) in `TerrainUpdates` (which would trigger
meshing of those nonexistent chunks). Furthermore, removes
remeshing of chunks with block updates if those chunks don't have all their
neighbours (since those wouldn't be meshed in the first place).
 2019-12-29 20:51:05 -05:00
Imbris
d341073a44 Upgrade to specs 0.15.1 2019-12-20 22:48:14 -05:00
Imbris
e49cafafbf Actually send deletion messages 2019-12-20 22:48:14 -05:00
Treeco
d88376f365 Added mouse inversion setting 2019-12-06 23:00:02 +00:00
Treeco
7c17c45f47 made first person camera follow race heights, minor zoom chances 2019-12-01 19:05:28 +00:00
Monty Marz
d0b7891a34 Set overflow checks to 'false' for release builds in order to bandaid fix recent master error 2019-11-28 13:32:38 +00:00
Monty Marz
040e1a7535 Fix map being inverted and indicator positioning 2019-11-26 22:39:07 +00:00
Monty Marz
b3eb0b270f Region name display fix 2019-11-24 16:45:13 +00:00
Monty Marz
a0a8011d7e Updated: Help Window, Map, Item Descriptions 2019-10-27 22:22:40 +00:00
timokoesters
0a1e12c9ad
improvement: make debug items of type ItemKind::Tool 
This way all items that can be held in a hand are tools
 2019-10-24 23:55:24 +02:00
timokoesters
20248a4818
feat: store items as RON files 
When a new item is created, a ron file will be used as a template
 2019-10-24 23:47:26 +02:00
Monty Marz
f4ba68c60d .floating(true) for help window background to make it layer above every recent and future widget 2019-10-24 18:21:17 +00:00
soruh
f186aac2ea fix the welcome window not being closeable 
due to the chat being in front of it,
by giving the welcome window a depth of -1.0.
The value of -1.0 is very arbitrary, but has some effect on
further development*, so there should be consideration concerning it.

* if something is supposed to be over/under the welcome window and
over/under something else with a different depth at the same time,
the resulting depth could become really ugly.
Of course it's always possible to change depths afterwards, but this often
breaks things, so the general scope of depths should
imo be considered, before this becomes a problem.
 2019-10-24 00:46:40 +02:00
Monty Marz
3e0ac48bd8 Multiple Assets and UI fixes and additions 2019-10-23 19:40:45 +00:00
Isaac Freund
355c7666b9 Allow dropping items 
Items can now be dropped by clicking to select the item then clicking
outside of the bag.
 2019-10-22 01:40:58 +02:00
Songtronix
fffffff536 fix(crash): overflowing the stack 2019-10-18 14:19:02 +02:00
Monty Marz
fdfab6a807 refactor: create_projectile doesn't take a light 
It returns a builder so the caller can just do it
 2019-10-17 20:59:36 +00:00
Joshua Yanovski
8ae2692b6e Allow canceling chunk generation. 
Currently we only do this when no players are in range of the chunk.  We
also send the first client who posted the chunk a message indicating
that it's canceled, the hope being that this will be a performance win
in single player mode since you don't have to wait three seconds to
realize that the server won't generate the chunk for you.

We now check an atomic flag for every column sample in a chunk.  We
could probably do this less frequently, but since it's a relaxed load it
has essentially no performance impact on Intel architectures.
 2019-10-16 11:39:41 +00:00
Forest Anderson
e7b97e0c66 md5sum assets 2019-10-09 22:42:39 +00:00
Monty Marz
d82ec6715a Item icons, chests and more 2019-10-09 19:28:05 +00:00
Monty Marz
b3862278af Help window, UI fixes, asset fixes 2019-10-06 19:19:08 +00:00
Timo Koesters
f3787879d3 fix(bow): adds bow icon art 2019-10-05 21:51:08 +00:00
timokoesters
4a99e5bc1e refactor: joined on &stats twice 2019-10-05 17:37:10 +02:00
Piotr Korgól
152efaee3b Make nametags display levels 2019-10-05 17:37:09 +02:00
Monty Marz
4c1eba1f3e Assets update, aesthetics, minor fixes 2019-10-04 18:27:12 +00:00
Nicolas
6e4d556073 Add max chat message length 
Fixes #115
Credit to @scorpion9979 for the previous implementation (https://gitlab.com/veloren/veloren/merge_requests/215)
 2019-10-04 16:14:54 +02:00
stevedagiraffe
f1b78d21c8 Formatted with fmt 2019-10-03 09:16:46 +10:00
stevedagiraffe
8680e92548 Added ability to toggle zoom inversion in settings 
Displayed as checkbox under the Gameplay tab.
 2019-10-02 23:09:05 +10:00
Justin Shipsey
27f3bebe40 Char overhaul and asset update 2019-10-02 10:05:17 +00:00
Imbris
5ca65a6894 UI tweaks 2019-09-27 00:23:42 -04:00
Imbris
799e962663 AA mode UI improvements 2019-09-26 23:46:49 -04:00
Imbris
a3daa6065a Add aa modes, with ui interface to switch 2019-09-26 23:14:27 -04:00
Joshua Barretto
ccc10a0447 Resolved warnings 2019-09-26 16:07:09 +01:00
Pfauenauge90
1a2b32b44b fixed merging issue, tooltip descriptions colour 2019-09-26 16:00:24 +02:00
Joshua Barretto
3a8b146687 Added item descriptions to tooltip 2019-09-26 14:41:04 +01:00
Pfauenauge90
de4af54928 test tooltips 2019-09-26 15:16:58 +02:00
Pfauenauge90
b62ae6f4a7 fix 2019-09-26 15:16:57 +02:00
timokoesters
1fc7c9b67b Fix rot_imgs and tooltip manager 2019-09-26 15:16:57 +02:00
Pfauenauge90
931e53ebbe added item tooltips 2019-09-26 15:16:57 +02:00
Shane Handley
ef3ad3519b Update previous references to 'volume' to prevent ambiguity. Update label for audio device selection in settings dialog. I don't think it is displayed, but maybe useful for documentation. 2019-09-25 01:25:24 +09:00
Shane Handley
8cf6546dec Add an additional SFX Volume control to the in-game settings dialog and supporting events. 2019-09-25 01:18:09 +09:00
Monty Marz
3a0131306f Character assets Part 1 2019-09-18 16:46:12 +00:00
Joshua Barretto
3f2e22f039 Exponential interpolation for linear damping 
With an additional approximation to allow for the same size jumps given different framerates.
 2019-09-09 19:11:40 +00:00
haslersn
1796c09ca1 common: Rework volume API 
See the doc comments in `common/src/vol.rs` for more information on
the API itself.

The changes include:

* Consistent `Err`/`Error` naming.
  * Types are named `...Error`.
  * `enum` variants are named `...Err`.
* Rename `VolMap{2d, 3d}` -> `VolGrid{2d, 3d}`. This is in preparation
  to an upcoming change where a “map” in the game related sense will
  be added.
* Add volume iterators. There are two types of them:
  * _Position_ iterators obtained from the trait `IntoPosIterator`
    using the method
    `fn pos_iter(self, lower_bound: Vec3<i32>, upper_bound: Vec3<i32>) -> ...`
    which returns an iterator over `Vec3<i32>`.
  * _Volume_ iterators obtained from the trait `IntoVolIterator`
    using the method
    `fn vol_iter(self, lower_bound: Vec3<i32>, upper_bound: Vec3<i32>) -> ...`
    which returns an iterator over `(Vec3<i32>, &Self::Vox)`.
  Those traits will usually be implemented by references to volume
  types (i.e. `impl IntoVolIterator<'a> for &'a T` where `T` is some
  type which usually implements several volume traits, such as `Chunk`).
  * _Position_ iterators iterate over the positions valid for that
    volume.
  * _Volume_ iterators do the same but return not only the position
    but also the voxel at that position, in each iteration.
* Introduce trait `RectSizedVol` for the use case which we have with
  `Chonk`: A `Chonk` is sized only in x and y direction.
* Introduce traits `RasterableVol`, `RectRasterableVol`
  * `RasterableVol` represents a volume that is compile-time sized and has
    its lower bound at `(0, 0, 0)`. The name `RasterableVol` was chosen
    because such a volume can be used with `VolGrid3d`.
  * `RectRasterableVol` represents a volume that is compile-time sized at
    least in x and y direction and has its lower bound at `(0, 0, z)`.
    There's no requirement on he lower bound or size in z direction.
    The name `RectRasterableVol` was chosen because such a volume can be
    used with `VolGrid2d`.
 2019-09-06 15:43:31 +02:00
Joshua Barretto
f574b1748a Merge branch 'desttinghim/sound-effects' into 'master' 
Sound Effects

Closes #163 and #97

See merge request veloren/veloren!473
 2019-09-06 11:19:32 +00:00
Monty Marz
943495c0c5 Pixel art for axe and flying rod, shadow for zone names and death message 2019-09-05 17:28:33 +00:00
Louis Pearson
9dc1f8f549 Revamp AudioFrontend 
audio::base had a lot of unnescessary abstractions and constructs.
The current code simplifies the API in a way that makes sense and
that will allow sound effects and fading to be added in an incremental
way.
 2019-09-05 03:08:09 -06:00
Imbris
625f83e535 Don't add adjacent duplicates to the history 2019-09-02 01:07:16 -04:00
Imbris
47d0904588 Directly adjust chat input when traversing history 2019-09-02 00:54:44 -04:00
tommy
12029d7e7f Added SetText event, rewritten based on comments 2019-09-01 23:43:06 -04:00
tommy
a63e67b8d9 Basic chat window history functionality 2019-09-01 23:43:04 -04:00
Monty Marz
f53904b534 More sprites, ui fixes, lianas 2019-09-01 19:04:03 +00:00
timokoesters
bd8e71c5aa
Rename activate_inventory_slot to use_inventory_slot 2019-08-30 22:46:45 +02:00
timokoesters
b063694d05
Implement icons based on weapon 2019-08-29 21:48:05 +02:00
Pfauenauge90
9a391332a6
fmt 2019-08-29 19:44:29 +02:00
Pfauenauge90
50c4764588
changed debug wand visuals, added icons for 2h sword main and alt attack 2019-08-29 19:44:29 +02:00
timokoesters
6e1c78e5d5
Add debug mode item giving speed boost in look_dir on click 2019-08-29 19:44:28 +02:00
yashaslokesh
be71aea20b Changed exp type from f64 to u32 and altered exp calculations and function signatures to adhere to the new types 
Signed-off-by: Yashas Lokesh <yashas.lokesh@gmail.com>
 2019-08-27 22:33:14 +00:00
timokoesters
cd061aba85
Make respawn hint text base on key bindings 2019-08-27 14:42:53 +02:00
Vechro
0f0a28d87a Small changes to velocity 2019-08-22 22:26:35 +03:00
Vechro
2077548d5c Simplify debug info 2019-08-22 21:53:46 +03:00
Monty Marz
29f6186139 hotbar changes 
completely switched to. vox files

easier to see design

gradient and numbers on the health/mana bar
 2019-08-18 18:07:21 +00:00
telastrus
09b15e5278 velocity fix 2019-08-08 10:42:23 -04:00
Monty Marz
aac53f9311 Part 1 of implementing the social window 2019-08-07 13:14:26 +00:00
telastrus
e4f2c73b85 undo unnecessary pub mod 
fixed comments

fixed other comment
 2019-08-06 22:46:25 -04:00
telastrus
0eafd42c0f fall damage + velocity debug 2019-08-06 17:51:13 -04:00
Marcel
86be3fccfc Merge branch 'timo-cleanup' into 'master' 
Implement specifier syntax and cleanup

See merge request veloren/veloren!413
 2019-08-06 06:52:24 +00:00
timokoesters
1227596406 Implement specifier syntax and cleanup 2019-08-06 08:31:48 +02:00
telastrus
4dcb53bdb8 reverted some unnecessary changes 
corrected typo

ran cargo fmt
 2019-08-05 19:41:31 -04:00
telastrus
c098a5efd7 Added adjustable FOV slider 2019-08-05 12:37:52 -04:00
Joshua Barretto
c9f1a793db Merge branch 'timo-kill-xp' into 'master' 
Give xp depending on max hp and lvl of entity killed

See merge request veloren/veloren!400
 2019-08-03 20:57:06 +00:00
timokoesters
7365dbe9e6 Give xp depending on max hp and lvl of entity killed 2019-08-03 21:30:01 +02:00
Joshua Barretto
fe0097c085 Made nametag position change with scale 2019-08-03 19:40:20 +01:00
Dominik Broński
f644b6ab89 Revert "Merge branch 'imbris/upgrade_specs' into 'master'" 
This reverts merge request !375
 2019-08-01 23:32:33 +00:00
Imbris
5f56657f6c Upgrade specs to 0.15 2019-08-01 18:09:13 -04:00
Piotr Korgól
ec550620ad Add a health bonus for level ups, fix pets 2019-08-01 18:56:08 +02:00
Joshua Barretto
b3cae2f3dd Added better item manipulation 2019-08-01 09:09:26 +01:00
Joshua Barretto
fc49293874 Clickthrough on items 2019-08-01 09:09:26 +01:00
Pfauenauge90
37ee5b2802 fixed UI layering leading to unresponsive slots 2019-08-01 09:09:26 +01:00
Joshua Barretto
31f8794c39 Started work on inventory manipulation 2019-08-01 09:09:26 +01:00
Joshua Barretto
123a78552a Fixed block-hopping on edges, added correct inventory slots 2019-08-01 09:09:26 +01:00
Monty Marz
5cfc60da50 Small chat fixes 2019-07-29 14:40:46 +00:00
Monty Marz
96b677a2b0 Tooltips 2019-07-29 14:06:13 +00:00
Imbris
ff518a4a23 Ui scaling interface tweaks 2019-07-28 16:54:32 -04:00
Pfauenauge90
8e15117be7 set min and max values 2019-07-28 16:54:32 -04:00
Pfauenauge90
d33bbf26ad aligned value position to crosshair transp. value 2019-07-28 16:54:32 -04:00
Pfauenauge90
e15c4eb40b changed displayed value for scale 2019-07-28 16:54:31 -04:00
Pfauenauge90
1567c63421 checkboxes functionality 2019-07-28 16:54:31 -04:00
Pfauenauge90
7ce71dda02 visuals change 2019-07-28 16:54:31 -04:00
Imbris
4ad42c57e4 Add ui scale setting and slider 2019-07-28 16:54:30 -04:00
Piotr Korgól
198d532e38 Show level and xp on character menu 2019-07-27 15:04:34 +02:00
Piotr Korgól
5c84508015 Get EXP for killing NPCs and Players, properly show EXP bar 2019-07-26 20:51:40 +02:00
Piotr Korgól
b1aace0110 Add Level and Exp component 2019-07-26 16:44:59 +02:00
tommy
95b5f4acfb Added private, broadcast, and game_state messages 2019-07-26 07:29:37 -04:00
tommy
cc6aa6f33d Adds colour to tells in chat box #194 2019-07-26 07:29:37 -04:00
Sheldon Knuth
c2fa8bd615 [FIX] Callback hell of AudioDevice construction while opening audio settings window. 2019-07-23 09:54:41 +00:00
Monty Marz
7a4ad099ff Crosshair variations 2019-07-23 01:02:57 +00:00
Songtronix
de2dbcef45 add global git hash constant 2019-07-21 17:45:31 +00:00
Forest Anderson
d45acdc645 Merge branch 'inventory-items' into 'master' 
crosshair changes (WIP!), inventory visuals, camera changes, savannah trees

See merge request veloren/veloren!317
 2019-07-07 15:42:50 +00:00
Pfauenauge90
0cc3c76542 fmt 2019-07-07 17:31:34 +02:00
Pfauenauge90
7f45d274a8 clean up 2019-07-07 16:19:20 +02:00
Pfauenauge90
f3bda57e67 fmt 2019-07-07 16:19:20 +02:00
Pfauenauge90
70f8fe9002 ui scaling relative to window size 2019-07-07 16:19:20 +02:00
Pfauenauge90
c27d55db6c less numbers for the indicator text 2019-07-07 16:19:20 +02:00
Pfauenauge90
ff6d7206a3 fix 2019-07-07 16:19:19 +02:00
Pfauenauge90
94acd0f437 Crosshair transp slider 2019-07-07 16:19:19 +02:00
Pfauenauge90
3be2951029 crosshair correction 2019-07-07 16:19:19 +02:00
Pfauenauge90
de1cf1371c colour and camera corrections 2019-07-07 16:19:19 +02:00
Pfauenauge90
d4a6f0c202 camera changes and nametag colour 2019-07-07 16:19:18 +02:00
Pfauenauge
bd94baa125 Added crosshair TODO 2019-07-07 16:19:18 +02:00
Pfauenauge
d186c4031e Sharp crosshair (no multisampling) 2019-07-07 16:19:18 +02:00
Pfauenauge90
7455155198 more test items 2019-07-07 16:19:18 +02:00
Pfauenauge90
89cadf27be fix fonts 2019-07-07 16:19:18 +02:00
Pfauenauge90
50e15333cd set the inventory space test button to false by default and increased the starting inventory size to 10 2019-07-07 16:19:17 +02:00
Pfauenauge90
b99bd4a20a Bag window expands with available space 2019-07-07 16:19:17 +02:00
Pfauenauge90
381b9cabd1 fmt 2019-07-07 16:19:17 +02:00
Pfauenauge
e66419b396 smaller border for available slots, item image size changed 2019-07-07 16:19:17 +02:00
Pfauenauge
991e4b15e5 fmt 2019-07-07 16:19:16 +02:00
Pfauenauge
03894cb2ab Comments on example item, removed printing of available inventory space No. 2019-07-07 16:19:16 +02:00
Pfauenauge90
3ab01bd86b added visual test item 2019-07-07 16:19:16 +02:00
Pfauenauge90
ff7fb032a4 fixed scaling of the slots 2019-07-07 16:19:16 +02:00
Pfauenauge90
be64662b14 added active inventory slots 2019-07-07 16:19:16 +02:00
Pfauenauge90
f4499e26af added visual test item 2019-07-07 16:19:15 +02:00
Pfauenauge90
626978213f fixed scaling of the slots 2019-07-07 16:19:15 +02:00
Pfauenauge90
12e7d749ec added active inventory slots 2019-07-07 16:19:15 +02:00
Songtronix
6fa086b964 remove expects, warnings, code duplication 2019-07-07 16:16:06 +02:00
Songtronix
2338084af0 Add Linux support 2019-07-07 16:16:06 +02:00
Songtronix
1be8f5e422 Update status according the play state 2019-07-07 16:16:05 +02:00
timokoesters
215693137b
Implement chat command key 2019-07-05 18:21:11 +02:00
Piotr Korgól
e212d4d6f9 Fix comment 2019-07-03 21:28:07 +02:00
Piotr Korgól
7cf299503d Add crosshair 2019-07-03 21:28:07 +02:00
Songtronix
0c3d693561 clean warnings from voxygen/hud 2019-07-02 21:25:07 +00:00
Sheldon Knuth
c3671590e9 Loading no-audio mode from the game start without rodio crate initialisation completely 2019-07-02 18:35:40 +00:00
Sheldon Knuth
c699801d78 Revamping the audio system for Voxygen from #163 2019-07-02 04:10:55 +00:00
timokoesters
14400f6380
Remove Actor and use Body instead 2019-06-30 18:57:24 +02:00
Joshua Barretto
dd82fc24a8 Prevented UI resets when toggling HUD 2019-06-29 16:48:43 +01:00
timokoesters
af52cfea6a
Show cursor when unfocussing the window 2019-06-29 03:43:35 +02:00
Songtronix
eb28ba94f6 add git commit hash to debug window 2019-06-28 12:08:12 +00:00
Pfauenauge90
b5d529f824 changes restore 2019-06-26 19:14:12 +01:00
Piotr Korgól
4644199f1b Make minimap title show location names 2019-06-26 19:14:12 +01:00
Pfauenauge90
ab2c0ad085 mid name parts 2019-06-26 19:14:12 +01:00
Imbris
16e5b6bafd circular view distance 2019-06-23 15:49:15 -04:00
timokoesters
7deb3da1af
Add pub use phys:: and remove most pub mods 2019-06-16 19:59:12 +02:00
Cody
026ac32972
Amends the suggested 1 FPS option to 15 to prevent accidental session crashes. 2019-06-08 12:23:58 -04:00
Cody
e18947eed1
Changes the fallback slider value to a safe one. 2019-06-08 12:23:58 -04:00
Cody
24f7323d04
Allows selection of an unstable 1 FPS option. 2019-06-08 12:23:58 -04:00
Cody
527f33a778
Adds an FPS setting and slider. 2019-06-08 12:23:58 -04:00
Monty Marz
8a19a6f2a3
Configurable max fps 2019-06-08 12:23:57 -04:00
Cody
41f3cd5803
Changes setting type to u32, enforces live in-game updates to setting. 2019-06-08 12:23:57 -04:00
Cody
a90d073c22
Adds mouse sensitivity sliders that update settings file. 2019-06-08 12:23:45 -04:00
timokoesters
037fcfe5da
Ungrab mouse when closing settings with X 2019-06-07 22:23:06 +02:00
Cody
14ac5babd4 Removes most unused imports; changes some unused variables to underscores or provides a leading underscore; removes some unnecessary variables and mutable declarations; and performs other miscellaneous warning fixes. 2019-06-06 14:48:41 +00:00
Monty Marz
112f0515bd Button added 
Former-commit-id: d8e88da53c3f8daa3216a7d0657f0934ec1a051f
 2019-06-02 02:17:36 +00:00
Cody
609742f8fa
Makes some quick in-game menu fixes. 2019-05-31 16:36:25 -04:00
Imbris
e3e8afd99b Stop drawing entities outside the vd 
Former-commit-id: 34878fb66ec22ac77a7400724b80ad7f8321f4cf
 2019-05-28 20:47:01 -04:00
Joshua Barretto
5b5cd7d341 Merge branch 'healthbar-rendering-when-less-than-full' into 'master' 
Only render other player's healthbars when less than 100% full

Closes #123

See merge request veloren/veloren!195

Former-commit-id: 70607acd77d14b911574d328332f341e5f395b24
 2019-05-28 20:37:37 +00:00
JMS
e3902ea134 Fix debug coordinates window crashing when player has no Pos component yet 
Closes #136


Former-commit-id: eb7b2a4c525a4b2771a9ca168e566b24bd23c7b8
 2019-05-28 15:40:50 -04:00
JMS
b5976b567e Only render other player's healthbars when less than 100% full 
Implements part of #123


Former-commit-id: d927d153a39b016d029587351eeb5fa87ccb5197
 2019-05-28 15:26:11 -04:00
JMS
4fcb6cd025 Add player coordinates to debug window 
Former-commit-id: 00285712652ed97c7f18a5f4834f1eaef269afc7
 2019-05-28 14:23:24 -04:00
timokoesters
2008400169 Implement killer name in chat 
Former-commit-id: 5aa87529179a684d5675c33e4001806aa2040802
 2019-05-27 21:47:19 +02:00
timokoesters
a6439984be Add connect, disconnect and kill messages 
Former-commit-id: c25f6fb0b594e5d61a965447359536ca17173aa7
 2019-05-27 19:45:43 +02:00
Monty Marz
8a3b308224 Wolf model assets update 
Former-commit-id: 3bf065f97bd000ef3f140e3c776a34057217cdfd
 2019-05-26 19:12:32 +00:00
Imbris
ec4bf7279a Add check for typing 
Former-commit-id: 582d0b5894f44f8491b671823b09f064d139df02
 2019-05-26 12:23:24 -04:00
Imbris
8754ea1661 Fix hud handle_event() match arm order 
Former-commit-id: 484b74fc9d82a18b5ac4d7da2dedcd426d100041
 2019-05-26 12:12:10 -04:00
Imbris
4a8e85ef64 restore lost changes 
Former-commit-id: a94c52677287131e02c88748694dfbcaf90b531a
 2019-05-26 11:24:25 -04:00
timokoesters
64b00f41f4 Fix invisible chars 
Former-commit-id: cbb93e0511100b9b66f9ea22451c99a69b50b19c
 2019-05-26 16:04:44 +02:00
timokoesters
a18a8e0d15 Fix nametags showing on dead players (maybe) 
Former-commit-id: 94548e131ee7c94fc5546fa7410fc9694d1db68e
 2019-05-26 00:34:24 +02:00
timokoesters
746e286b5b Fixes 
Former-commit-id: 0bbbcf187248dd192e7e9a226bcf5b496437d578
 2019-05-26 00:00:38 +02:00
timokoesters
3c0121538b Make key binds work with mouse events 
Former-commit-id: 77421b44e92d7c60c39ebcb3f94a406ef7f027ff
 2019-05-25 23:46:52 +02:00
Joshua Barretto
242a23658c Switched to pop_front 
Former-commit-id: 2653d3bb0fc5e9dd9c50eeb7b012d3cd4e94b439
 2019-05-25 21:03:56 +01:00
Joshua Barretto
3534804697 Limited total messages 
Former-commit-id: 7c8e4a3f9e1d36731579300f7662a324566de6fb
 2019-05-25 20:16:38 +01:00
Imbris
9edcabc679 Fix difficult grabbing after closing via button 
Former-commit-id: 2649d9e210d375f19d2970f15614be23d5173c67
 2019-05-25 08:59:58 -04:00
Imbris
25dbc54961 set player alias as nametag if default char name 
Former-commit-id: 0c6053842028b2b2743746267bb65a34a6581d71
 2019-05-25 08:59:57 -04:00
Joshua Barretto
4f2b27c338 fmt 
Former-commit-id: 2d9b4f53438a3849381d8723d0ab48b4015cd35c
 2019-05-24 13:43:03 +01:00
Imbris
dd607ba9a4 add key to toggle ingame ui elements 
Former-commit-id: e57fc5410a93f6e467db4bb198d7510351fb2db6
 2019-05-24 02:31:05 -04:00
Imbris
24a14b083f Scaling of ingame text rasterization to match final size 
Former-commit-id: 9f9e900afef2400af35d579e66ba95097e169b87
 2019-05-24 02:31:04 -04:00
Imbris
a128abc925 Simplify ingame.rs, fix adding new entities 
Former-commit-id: b5fbf1a0155e8cb2cb7837004b3c0e43ca2ae92e
 2019-05-24 02:31:04 -04:00
Imbris
db910855df Simplify ingame.rs, fix adding new entities 
Former-commit-id: 3e92c4c8c1c580e2b2d95eecd213ac42cf0dd0bc
 2019-05-24 02:31:03 -04:00
Imbris
e9683ba639 Link player stats, remove self name tag 
Former-commit-id: bb20c8f1515859ae7720484faa4b718253e0ccb7
 2019-05-24 02:31:03 -04:00
Imbris
45bea22727 Add healthbars, rebase fixes, warning fixes 
Former-commit-id: e293133eb18452a53446d2d765ecbe00e50720ba
 2019-05-24 02:31:03 -04:00
Imbris
93ec66a8b1 Add ability to position tuples of widgets ingame 
Former-commit-id: e2958a37e7062132d6a7b6d5ad61bd4002768532
 2019-05-24 02:31:02 -04:00
Imbris
b828bffba9 Make name labels work 
Former-commit-id: 633905535d2842b320d347e368a28ac967a8469a
 2019-05-24 02:31:02 -04:00
Imbris
7fd3854093 ingame_ui 
Former-commit-id: 5e836043d58f9217d711462d9f700e3eb096a076
 2019-05-24 02:31:01 -04:00
sxv20_
894b4339ca move debug info DebugInfo struct 
Former-commit-id: 88bded303575ad742416d0299dc19d70dcc81c31
 2019-05-23 10:30:00 +01:00
Algorhythm
6456198b38 Add ping indicator to debug HUD 
Former-commit-id: 7bd4a30e9b2dc97134e91f71c08cbb05ca109db5
 2019-05-23 08:18:25 +00:00
Louis Pearson
e78ae4fefc Remove hacks, clean up crufty code 
Former-commit-id: 7c10103235e8d9e2967baa1f8e33d68995bdf4d5
 2019-05-22 05:29:38 -06:00
Louis Pearson
eeceef12ef Prevent framerate drop when accessing settings menu 
Former-commit-id: f51d1b700cd328b8156c7df97d6524277cc0718b
 2019-05-21 16:44:51 -06:00
Louis Pearson
4dfebb779e Use global_state for accessing settings in hud 
This has led to a performance regression. For some reason when the menu opens
FPS drops to about 20.


Former-commit-id: 84cdbec5ef40cf6189e544eba6b87981bb9514fe
 2019-05-21 16:44:51 -06:00
Louis Pearson
9f1c70792f Move to using only global_state for settings menu 
Former-commit-id: bb86c851f51c02af1a25d57f2be95d1947b330ad
 2019-05-21 16:44:51 -06:00
Louis Pearson
c8928587dd Allow user to change audio device in the settings menu 
Former-commit-id: 645b91182509da70075bb57f8ea6f9cd638c0d8e
 2019-05-21 16:44:51 -06:00
Louis Pearson
ee6ec2d299 Continue implementing audio device selection 
Former-commit-id: 6b92cbdb2e93653f43c0ed4d04e1b8fc35cfe8cf
 2019-05-21 16:44:51 -06:00
Louis Pearson
50fc7549b9 Add baby steps for audio device choice support 
Former-commit-id: 8c1d623b2a28997e7705ba2775b382b38e9a34ed
 2019-05-21 16:44:51 -06:00
Pfauenauge90
c13206d82d Basic worldgen 
Former-commit-id: 3ca0afa95dd1d868a84a41129e889a203e8a7cd9
 2019-05-21 22:51:41 +01:00
Imbris
888bd65036 Add volume adjustment, lower default volume 
Former-commit-id: 1b581ef16ceb4a7a26772352d24df9c84d846c88
 2019-05-19 15:31:32 -04:00
Pfauenauge
13e916d485 visuals in settings - audio 
Former-commit-id: 51bfcdcbed1d8254c966e7a92a472b585ff61c01
 2019-05-19 19:35:40 +02:00
Joshua Barretto
0a9d7d68d5 Merge branch 'VD-Slider' into 'master' 
View distance slider

See merge request veloren/veloren!152

Former-commit-id: c285b72576f47e1e13ee5959669f51c8aa652ea0
 2019-05-19 01:10:42 +00:00
Joshua Barretto
3508e4afcb Added view distance configuration 
Former-commit-id: b3c7a21631ce0c6b058f25aede0e3e2895a16f81
 2019-05-19 01:45:02 +01:00
Imbris
0349461533 Pass up Vd slider changes to session.rs & fmt 
Former-commit-id: 187a3d286e288d2159fcde292f78e2bc08ec796b
 2019-05-18 19:55:06 -04:00
Pfauenauge
78173b4bce added slider 
Former-commit-id: c01a2601365c9d4d4b03e58ca33d91469cfbba0f
 2019-05-19 01:22:30 +02:00
Imbris
7855dfe52f Add screenshot, fullscreen, & debug keys 
Former-commit-id: 9358575794b71535905c5133eb6764284c35fb34
 2019-05-18 17:16:35 -04:00
Imbris
9e9e8be196 Tweak settings change event handling in hud 
Former-commit-id: 7b9a3163f2e85d202ef295cf6bd63de3ce753640
 2019-05-18 17:09:03 -04:00
Louis Pearson
5a04e98725 Change asset paths to be relative 
Former-commit-id: 6c5f18484fe1b7cbf417d45c38af5ffaa8d48ac6
 2019-05-18 13:37:44 -06:00
Forest Anderson
2e7984ebc3 Char selection 
Former-commit-id: 8da211b00dcd9a550a8f46e79164ece8f5c193e5
 2019-05-18 19:03:13 +00:00
Cody
6b09fd7c53 Pedantic comment and language fixes. 
Former-commit-id: eb49765c911aaa97a9c8ed351216a7a6f8411213
 2019-05-17 18:32:07 -04:00
Pfauenauge90
66eceb3ca7 Added Grid to main and offhand 
Former-commit-id: 6395ba9142d6da3e14c7363e0f38f4fc61de6b79
 2019-05-12 14:52:43 +02:00
Imbris
cec01c0d69 rustfmt 
Former-commit-id: 227b7f5a55546c678617d157b739e61f15c4aa4b
 2019-05-12 00:17:10 -04:00
Pfauenauge90
e7ab006db7 transparency 
Former-commit-id: 5a0c0f7267347c3758a266ff49670b55c6e6cc0c
 2019-05-11 22:35:19 -04:00
Imbris
52cf7c6f94 rebase fix, re-arrange hud img_ids 
Former-commit-id: a5cb82f74afca531995fceea3ddf7ff53616dd1b
 2019-05-11 22:35:15 -04:00
Pfauenauge90
fc4103561e CharWindow 
Former-commit-id: 1fe067505229dc78dee4a0175fcbdbb2040599bd
 2019-05-11 21:36:27 -04:00
Pfauenauge
a59f0e57aa char window 
Former-commit-id: 2624ddd883c0ff555fc86efce767fda602de52eb
 2019-05-11 21:36:27 -04:00
Pfauenauge
a6b792f930 Char Window 
Former-commit-id: 0109555602ba39950f304bd0adc80df6175c3728
 2019-05-11 21:36:27 -04:00
Pfauenauge
789e448aa3 positioning 
Former-commit-id: 7583dfac4be650ecabaf49608712c8d3cb952bf5
 2019-05-11 21:36:26 -04:00
Pfauenauge
3f57ab4f2a positioning 
Former-commit-id: 510fcaea11f0e9293e73ba98fb9ad79b5dbbadb5
 2019-05-11 21:34:50 -04:00
Pfauenauge90
657bba06e9 asset update and import 
Former-commit-id: 43f616f166c3df87a19f0eca80a65f7a3c0e374c
 2019-05-11 21:33:48 -04:00
Pfauenauge
bd23732c74 char window 
Former-commit-id: 0c15336583eeaf32f0d86ef10b16c47f46d4db7f
 2019-05-11 21:32:38 -04:00
Pfauenauge
5731484940 Char Window 
Former-commit-id: c44ca056fe76b00e803d96825da69385cfecad39
 2019-05-11 21:32:36 -04:00
Pfauenauge
5aa5e84a46 positioning 
Former-commit-id: 4524965ee5fa82fc35c965061079d7b52919a74a
 2019-05-11 21:32:34 -04:00
Pfauenauge90
757fbdd653 Asset Update 
Former-commit-id: 2f3e58679059c3c97cec9312c6fa436d5510b901
 2019-05-11 21:32:30 -04:00
Pfauenauge
15816bdf6d positioning 
Former-commit-id: 44e8406af9c2b6db60f78f7ff161b7c700f024fd
 2019-05-11 21:31:17 -04:00
Pfauenauge90
0f6ec8dce3 asset update and import 
Former-commit-id: 455500aac3d82e2920bc02c6846ceb815122bb7d
 2019-05-11 21:31:15 -04:00
Imbris
1948bc6392 fix & remove some unused uses, cursor toggle tweak 
Former-commit-id: b398b11606d983b7f80364a5689804e3491c218f
 2019-05-11 10:59:48 -04:00
Imbris
aed6750885 add multisampling option to voxel graphics 
Former-commit-id: d5ca47cd029226d1268c6d860516bfea6f9c5cf6
 2019-05-11 10:25:15 -04:00
Imbris
3faf4855cc Merge branch 'cursorgrab' into 'master' 
Improve cursor grab

Closes #55

See merge request veloren/veloren!113

Former-commit-id: 56ade58e0a2f55f657f8b714a2216023659b161f
 2019-05-09 17:02:24 +00:00
timokoesters
a58b5ceb3a Fix bug when pressing ToggleMouse twice while grabbed 
Former-commit-id: 9e01b71577fd3dbe570b7aca1e041c32e9a01c66
 2019-05-09 18:55:13 +02:00
timokoesters
e8cf815143 Force ungrab on Key::ToggleCursor 
Former-commit-id: 222f5693363662d25cb065fdc104cd079e2c395d
 2019-05-09 10:55:32 +02:00
timokoesters
2309ce599c Move font_ids! into mod.rs 
Former-commit-id: 602ea44814a25c068e5c022cedc780e3ddc020ae
 2019-05-08 22:25:15 +02:00
timokoesters
0e46b00a0c Minor fixes 
Former-commit-id: 9c5e90e2bad24e9b5c443bfb1509b18877adf2d6
 2019-05-08 22:15:58 +02:00
timokoesters
f6b27db6dd Improve formatting 
Former-commit-id: b2167cd982c37b3716fa74d3e75d27e5cf3c65ce
 2019-05-08 20:19:38 +02:00
Imbris
470e63a691 Remove or uncomment commented code 
Former-commit-id: 32ac76b649012a0a2756f796b26d48318faad11c
 2019-05-07 21:59:35 -04:00
timokoesters
a15532f81a Improve cursor grab 
Former-commit-id: c1a8b5383bf7682245e2294e5b1d62dae0beb329
 2019-05-07 22:00:03 +02:00
timokoesters
b3ffc61119 Don't let widgets have mutable access to show 
Former-commit-id: 4c525c60d25bcc6551ddeabd325992fcd513619d
 2019-05-07 19:50:53 +02:00
timokoesters
54cc96f0d1 Move minimap into own file 
Former-commit-id: 7c4a9b0930c899fc8e5089920c3ee5c717561a1a
 2019-05-07 19:34:30 +02:00
Imbris
d13430d51e revert chat clicking change (broke scrolling) 
Former-commit-id: f43f3fd97c01dc304f29fcc852ab9909e6d00620
 2019-05-07 01:50:47 -04:00
Imbris
eb3d8310f8 rustfmt 
Former-commit-id: 7e2cdb284c670b5991c69b6aab042194c806171f
 2019-05-07 01:40:03 -04:00
Imbris
99d6c92c8d rebase 
Former-commit-id: d73c1bcd433fea599fb4d342918117b23324c8d2
 2019-05-07 01:39:32 -04:00
Imbris
0fc6dd317f open input box by clicking anywhere on chat 
Former-commit-id: f379c52d034b16c5390375899e551b01515cd11e
 2019-05-07 01:27:24 -04:00
Imbris
5c63f398ba replace typing field with function and cleanup 
Former-commit-id: eed8063a12ac475927e9d0eabc0aafc0598ce9ef
 2019-05-07 01:27:24 -04:00
Pfauenauge
009ca0a130 small windows "relative" to opened char window 
Former-commit-id: 13d07e3bfce60cd17eaf7447a442c47353d9517e
 2019-05-07 01:25:33 -04:00
timokoesters
7f709bba0c Prepare relative small windows 
Former-commit-id: 6f1046518b49b302d69d51e0596514bf9ded7952
 2019-05-07 01:25:32 -04:00
timokoesters
a36fcb4243 Fix settings to use Show 
Former-commit-id: 99c31d8c9914f4b9e6fbcc2b1f72a97a260a725b
 2019-05-07 01:25:32 -04:00
Pfauenauge
6894e55a24 Bag Position 
Former-commit-id: af8435d0c078ea1caa388ff0926ef6dae22ab70b
 2019-05-07 01:25:31 -04:00
Pfauenauge
b7b3c5f3cd positioning 
Former-commit-id: d599e046d1944a41eef5423cf3bb0f17f42a246a
 2019-05-07 01:25:31 -04:00
timokoesters
87e75644ec Fix fonts 
Former-commit-id: c7929a0b540099ac67b93563d97be4b8c6639190
 2019-05-07 01:25:31 -04:00
Imbris
efa2afc5c8 re-enable chat focusing 
Former-commit-id: 8cbcbba82bcb85fec11638085cff26049838fe6d
 2019-05-07 01:25:30 -04:00
Imbris
7bade0360e Move Hud's show fields to their own struct 
Former-commit-id: 8f546b2c2f40fb74e4daecc982256b441fcdd7fb
 2019-05-07 01:24:12 -04:00
timokoesters
1c79d06985 Fix settings 
Former-commit-id: 694387dc670ac2c39d3fbc8915d4819b638fe431
 2019-05-07 01:22:48 -04:00