Commit Graph

477 Commits

Author SHA1 Message Date
Joshua Barretto
4f2b27c338 fmt
Former-commit-id: 2d9b4f53438a3849381d8723d0ab48b4015cd35c
2019-05-24 13:43:03 +01:00
Imbris
265e8f243c small fixes
Former-commit-id: 0ac2c4e058340d99709843b52fed4a06498ab500
2019-05-24 02:32:39 -04:00
Imbris
dd607ba9a4 add key to toggle ingame ui elements
Former-commit-id: e57fc5410a93f6e467db4bb198d7510351fb2db6
2019-05-24 02:31:05 -04:00
Imbris
1d5bf26491 Round resolution scaling to powers of 2
Former-commit-id: c4ae59271076e1402eb1012257b6e40f082faf06
2019-05-24 02:31:04 -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
Joshua Barretto
8c4c14f749 Fixed UI shader
Former-commit-id: 12851d800a5435d25573e1deadb10b8103d40ac7
2019-05-24 02:31:02 -04:00
Imbris
7fd3854093 ingame_ui
Former-commit-id: 5e836043d58f9217d711462d9f700e3eb096a076
2019-05-24 02:31:01 -04:00
Monty Marz
cc9b028bf1 Disclaimer
Former-commit-id: dd115bb1971f066b19c3424c0a1352eb37dcb159
2019-05-23 22:45:48 +00:00
sxv20_
3e49c37a08 fix crash on view distance change related to borrows
Former-commit-id: 0cfa022e0078b077f3bd128fc6f51d03898722ef
2019-05-23 10:30:46 +01: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
Joshua Barretto
3963d4a3ef fmt
Former-commit-id: b76defa253e555cd381ab6ccf66c8e7f3e816433
2019-05-22 19:49:06 +01:00
Joshua Barretto
1684013138 Improved GPU memory usage by ~5x by compressing vertex data
Former-commit-id: b657ae88e44c6ecbede8073ffe17991ba3a99886
2019-05-22 19:32:33 +01:00
Louis Pearson
e78ae4fefc Remove hacks, clean up crufty code
Former-commit-id: 7c10103235e8d9e2967baa1f8e33d68995bdf4d5
2019-05-22 05:29:38 -06:00
Louis Pearson
affa5c081e Temporarily remove Ruination
Former-commit-id: a63df9eaf187f7786b9a2a0e50194c3a7866edbe
2019-05-22 03:00:16 -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
f52954971d Save view distance, volume, and audio device to settings when changed
Former-commit-id: ac7db47520c6524b3f2d7a788907daabb73ad237
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
0437f88601 Prevent audio crashes by blocking jack by default
Former-commit-id: 61243a38667f64d1c8f106b1191ae876fc652c63
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
8dc35b8609 Add audio to settings
Former-commit-id: 6e18b95bb3460a3b6d971b89c767045dcdbe7344
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
Louis Pearson
7cfd3ad1cd Add field_grazing.ogg
Former-commit-id: 36a5bf4a9af2d89e9acd8dd7404c0b4eb1836f5b
2019-05-21 16:44:51 -06:00
Joshua Barretto
fc25dc8c7f fmt
Former-commit-id: 1f7bec8da117091b3f2e8f58ce45b9caf1b6c89d
2019-05-21 23:31:38 +01:00
Joshua Barretto
a696847f67 Fixed singleplayer failure caused by worldgen
Former-commit-id: a2fdb56682922694b32e4d25890afa7a90c5b923
2019-05-21 23:31:17 +01:00
Joshua Barretto
dcd2b4392d Added rocks, improved hills
Former-commit-id: c8f3d8fb550186bd87d0de953098971050fd1e03
2019-05-21 22:51:41 +01:00
Joshua Barretto
feece604be Restarted worldgen
Former-commit-id: e1526ec5f865904f11ab6a1507ecdc1a52acb28d
2019-05-21 22:51:41 +01:00
Pfauenauge90
c13206d82d Basic worldgen
Former-commit-id: 3ca0afa95dd1d868a84a41129e889a203e8a7cd9
2019-05-21 22:51:41 +01:00
Joshua Barretto
5b2da36fd0 Added mega worldgen
Former-commit-id: f7c88a1d387c282b78ab834dd63e64432b371552
2019-05-21 22:51:41 +01:00
Louis Pearson
7dc087fe93 Create config dir if needed
Former-commit-id: 280e49f428207d5dc9a88607252df4b9f155d018
2019-05-20 15:32:16 -06:00
Louis Pearson
8de6d5ad3d Stop saving singleplayer settings to network settings
Former-commit-id: 06d43eda771e03b6b30d4bdc8ab01d2b3cd6efc2
2019-05-20 15:05:09 -06:00
Imbris
39caf7e51b Don't allow negative volumes
Former-commit-id: 35a52235fa4194d40ffc0d8d3243d0653dcca0a5
2019-05-19 17:50:20 -04: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
4f970b63ef fix screen shot flipping
Former-commit-id: 47ed01cd5f91445d1367121d939c01876008f643
2019-05-18 19:09:23 -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
b0f26633d3 Remove lewton, fix filename issue
Former-commit-id: 067f3bfe8ea4f20741107689bf55b01d7580b983
2019-05-18 14:26:16 -06:00