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
Joshua Barretto
f839b623f4
Merge branch 'failed-164' into 'master'
...
Disclaimer
See merge request veloren/veloren!169
Former-commit-id: 9d6ded433e519f0950df861c96c5e936ae66908c
2019-05-23 22:45:48 +00:00
Monty Marz
cc9b028bf1
Disclaimer
...
Former-commit-id: dd115bb1971f066b19c3424c0a1352eb37dcb159
2019-05-23 22:45:48 +00:00
Joshua Barretto
d67efe56eb
Merge branch 'view_dist_crash_fix' into 'master'
...
View dist crash fix
See merge request veloren/veloren!167
Former-commit-id: 3e697387bbbe781e28edcdb2d6ef2057d276fc24
2019-05-23 09:55:06 +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
Joshua Barretto
0fcec2b476
Merge branch 'ping_indicator' into 'master'
...
Add ping indicator to debug HUD
See merge request veloren/veloren!166
Former-commit-id: ea9c854941094440cf6946549df9e3908e3788bf
2019-05-23 08:18:25 +00:00
Algorhythm
6456198b38
Add ping indicator to debug HUD
...
Former-commit-id: 7bd4a30e9b2dc97134e91f71c08cbb05ca109db5
2019-05-23 08:18:25 +00:00
jshipsey
21b938e21d
fixed typo
...
Former-commit-id: 9a102af47e8210b5ec19d92999304f9b6b31b9dd
2019-05-23 00:11:07 -04:00
jshipsey
cace9c6a8f
cleaning up inconsistencies in animation code
...
Former-commit-id: 31c8ae92c3ebf9bed01aba29f9a030de334df153
2019-05-22 23:36:43 -04:00
jshipsey
a0c713ff23
merging to branch
...
Former-commit-id: 991d4f298866f4b222090f9b62a3ba5adce38f0a
2019-05-22 22:43:49 -04:00
jshipsey
358dda5e44
tweaks to run, sword position
...
Former-commit-id: 05d91424eaec9c44d960efbee57574653e6b22da
2019-05-22 22:20:57 -04:00
jshipsey
d8cc5bbcf0
restored previous animations with new bone setup
...
Former-commit-id: b6bb91e1b8a940caff11f7a78f613806695ce911
2019-05-22 22:20:57 -04:00
jshipsey
ceb207a1bf
laying groundwork for combat anims, untangling skeleton
...
Former-commit-id: 440ea04df1c5a38d02b90131be6cf120edaa207b
2019-05-22 22:20:57 -04:00
jshipsey
25f05b0add
rotation simplification
...
Former-commit-id: a948b8a62f42ff5f516721396c1e066fdd379794
2019-05-22 22:20:57 -04:00
jshipsey
921019cf68
attack state
...
Former-commit-id: a97fc3466bb92a12ea59376f058864846ef125f3
2019-05-22 22:20:57 -04:00
Joshua Barretto
54c78479c3
Merge branch 'vertex-compression' into 'master'
...
Improved GPU memory usage by ~5x by compressing vertex data
Closes #106
See merge request veloren/veloren!163
Former-commit-id: 4468e2bc4d9bd819f8a31994acc4cdcdd1317876
2019-05-22 18:54:01 +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
Joshua Barretto
5636a5ac73
Merge branch 'audio-devices' into 'master'
...
Audio device selection
Closes #105 , #95 , and #100
See merge request veloren/veloren!156
Former-commit-id: 59c6cb0bc5eab295985853a3945874d96db9e894
2019-05-22 11:39:14 +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
affa5c081e
Temporarily remove Ruination
...
Former-commit-id: a63df9eaf187f7786b9a2a0e50194c3a7866edbe
2019-05-22 03:00:16 -06:00
jshipsey
e4e045bda6
laying groundwork for combat anims, untangling skeleton
...
Former-commit-id: a17189557788b09f91b720ff695767c9229fc726
2019-05-22 01:11:31 -04: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
ff5d7c7d65
Merge branch 'mega-worldgen' into 'master'
...
Proper worldgen
See merge request veloren/veloren!146
Former-commit-id: c823999ad7605f5d06907af4f1382acffcd99fa5
2019-05-21 22:42:56 +00: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
0c78264ebc
Added spawn point
...
Former-commit-id: 04ea38df61d3610d679368166de220243ef1bfba
2019-05-21 23:04:39 +01:00
Joshua Barretto
8909a4220f
Added water, beaches, craggs
...
Former-commit-id: 0213bbac23cf01df31896461d0cdda3b0ee708dc
2019-05-21 22:51:41 +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
Joshua Barretto
5118da0e0e
Added rivers, improved mountains
...
Former-commit-id: c1b76c54d2aa8f0616c26b0724fe34c0d80ac4fd
2019-05-21 22:51:41 +01:00
