Commit Graph

138 Commits

Author SHA1 Message Date
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
9f1c70792f Move to using only global_state for settings menu
Former-commit-id: bb86c851f51c02af1a25d57f2be95d1947b330ad
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
Imbris
888bd65036 Add volume adjustment, lower default volume
Former-commit-id: 1b581ef16ceb4a7a26772352d24df9c84d846c88
2019-05-19 15:31:32 -04: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
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
fc4103561e CharWindow
Former-commit-id: 1fe067505229dc78dee4a0175fcbdbb2040599bd
2019-05-11 21:36:27 -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
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
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
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
5c63f398ba replace typing field with function and cleanup
Former-commit-id: eed8063a12ac475927e9d0eabc0aafc0598ce9ef
2019-05-07 01:27:24 -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
b7b3c5f3cd positioning
Former-commit-id: d599e046d1944a41eef5423cf3bb0f17f42a246a
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
Pfauenauge90
6cbd045231 positioning
Former-commit-id: 90b626c2900e6bf4924dc290764c2860a5bade98
2019-05-07 01:22:47 -04:00
timokoesters
819e0a200f Separate bag + buttons into own file
Former-commit-id: 08e3b640adb85266ce7a739008fa26e1caee0ebf
2019-05-07 01:15:49 -04:00
timokoesters
abd960aa48 Move skillbar into own file
Former-commit-id: efab633e9b5c1ffc5071a556203490780615cde6
2019-05-07 01:13:26 -04:00
timokoesters
08aa8875fd Separate settings and small windows and convert chat
Former-commit-id: 847b0b8cf64b9d2de10b241d37bb7e21c126d314
2019-05-07 01:12:56 -04:00
timokoesters
f695973bb2 Make fonts work, Remove style
Former-commit-id: 53d158aff30d8c53b86deb62f7079ba06b5119ce
2019-05-07 01:08:27 -04:00