dce4f0c43f
attack state
...
Former-commit-id: 316d1dbb607688d88c067adc6498497aa67cb017
2019-05-24 18:33:55 -04:00
66e7c44727
Merge branch 'msgbox_update' into 'master'
...
Msgbox update
See merge request veloren/veloren!170
Former-commit-id: 7af35336762375d9b6d1c1ef3f4608d90f54d247
2019-05-24 21:26:25 +00:00
4b791a9d72
Remove msgbox dependency
...
The messagebox denedency was causing conflicts when trying to build on
my workstation. Removing this dependency resolved the problem
immediately. Will work to replace this functionality before sending
upstream.
Former-commit-id: aeb4255e9c046c5c721316ec408497a7eeca0a5a
2019-05-24 21:26:25 +00:00
9dce54250d
Merge branch 'link-fixes' into 'master'
...
Book link fix.
Closes #98
See merge request veloren/veloren!173
Former-commit-id: b412b5b8b143e04b7462a0af361c001d4f21b9ea
2019-05-24 21:18:06 +00:00
6000522274
Fixes broken book link.
...
Former-commit-id: f5636533167c22fef504026acdfad8e35e7b2694
2019-05-24 17:06:55 -04:00
a9c1294073
Merge branch 'login-screen' into 'master'
...
New Background image (.png)
See merge request veloren/veloren!172
Former-commit-id: 8f392b67e77716848f4748396571aad3414c62dd
2019-05-24 19:41:18 +00:00
6c61487807
New Background image (.png)
...
Former-commit-id: 35912f0ecb432f54a74daa076ff2b192aa100778
2019-05-24 19:41:18 +00:00
0660d9fb81
Merge branch 'ingame_ui_attempt' into 'master'
...
Add Health Bars and Name Tags
See merge request veloren/veloren!155
Former-commit-id: 8ebb8dd060cc66349829b9e4b335b1f42ae949e5
2019-05-24 12:53:42 +00:00
aaa26e78e4
fmt
...
Former-commit-id: 2d9b4f53438a3849381d8723d0ab48b4015cd35c
2019-05-24 13:43:03 +01:00
26d79da760
small fixes
...
Former-commit-id: 0ac2c4e058340d99709843b52fed4a06498ab500
2019-05-24 02:32:39 -04:00
670980d44c
add key to toggle ingame ui elements
...
Former-commit-id: e57fc5410a93f6e467db4bb198d7510351fb2db6
2019-05-24 02:31:05 -04:00
046adc2812
Round resolution scaling to powers of 2
...
Former-commit-id: c4ae59271076e1402eb1012257b6e40f082faf06
2019-05-24 02:31:04 -04:00
c42748e477
Scaling of ingame text rasterization to match final size
...
Former-commit-id: 9f9e900afef2400af35d579e66ba95097e169b87
2019-05-24 02:31:04 -04:00
5abf94dfbf
Simplify ingame.rs, fix adding new entities
...
Former-commit-id: b5fbf1a0155e8cb2cb7837004b3c0e43ca2ae92e
2019-05-24 02:31:04 -04:00
3be6ea40b9
Simplify ingame.rs, fix adding new entities
...
Former-commit-id: 3e92c4c8c1c580e2b2d95eecd213ac42cf0dd0bc
2019-05-24 02:31:03 -04:00
a3cf60c56e
Link player stats, remove self name tag
...
Former-commit-id: bb20c8f1515859ae7720484faa4b718253e0ccb7
2019-05-24 02:31:03 -04:00
ff03c12eee
Add healthbars, rebase fixes, warning fixes
...
Former-commit-id: e293133eb18452a53446d2d765ecbe00e50720ba
2019-05-24 02:31:03 -04:00
1d9c35b91d
Add ability to position tuples of widgets ingame
...
Former-commit-id: e2958a37e7062132d6a7b6d5ad61bd4002768532
2019-05-24 02:31:02 -04:00
32a4697d29
Make name labels work
...
Former-commit-id: 633905535d2842b320d347e368a28ac967a8469a
2019-05-24 02:31:02 -04:00
ad23ec1c5d
Fixed UI shader
...
Former-commit-id: 12851d800a5435d25573e1deadb10b8103d40ac7
2019-05-24 02:31:02 -04:00
43a73e5257
ingame_ui
...
Former-commit-id: 5e836043d58f9217d711462d9f700e3eb096a076
2019-05-24 02:31:01 -04:00
5bfdd99b28
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
b5c5c4a1de
Disclaimer
...
Former-commit-id: dd115bb1971f066b19c3424c0a1352eb37dcb159
2019-05-23 22:45:48 +00:00
e0da6d669b
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
e1ea42a284
fix crash on view distance change related to borrows
...
Former-commit-id: 0cfa022e0078b077f3bd128fc6f51d03898722ef
2019-05-23 10:30:46 +01:00
8f19c55d2e
move debug info DebugInfo struct
...
Former-commit-id: 88bded303575ad742416d0299dc19d70dcc81c31
2019-05-23 10:30:00 +01:00
dbba209b1c
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
934d94058f
Add ping indicator to debug HUD
...
Former-commit-id: 7bd4a30e9b2dc97134e91f71c08cbb05ca109db5
2019-05-23 08:18:25 +00:00
2e21198624
fixed typo
...
Former-commit-id: 9a102af47e8210b5ec19d92999304f9b6b31b9dd
2019-05-23 00:11:07 -04:00
40936e88a8
cleaning up inconsistencies in animation code
...
Former-commit-id: 31c8ae92c3ebf9bed01aba29f9a030de334df153
2019-05-22 23:36:43 -04:00
7048f77c67
merging to branch
...
Former-commit-id: 991d4f298866f4b222090f9b62a3ba5adce38f0a
2019-05-22 22:43:49 -04:00
12c2c0aab4
tweaks to run, sword position
...
Former-commit-id: 05d91424eaec9c44d960efbee57574653e6b22da
2019-05-22 22:20:57 -04:00
35b42fe361
restored previous animations with new bone setup
...
Former-commit-id: b6bb91e1b8a940caff11f7a78f613806695ce911
2019-05-22 22:20:57 -04:00
b1b69b1443
laying groundwork for combat anims, untangling skeleton
...
Former-commit-id: 440ea04df1c5a38d02b90131be6cf120edaa207b
2019-05-22 22:20:57 -04:00
a86b5e43bd
rotation simplification
...
Former-commit-id: a948b8a62f42ff5f516721396c1e066fdd379794
2019-05-22 22:20:57 -04:00
1929863053
attack state
...
Former-commit-id: a97fc3466bb92a12ea59376f058864846ef125f3
2019-05-22 22:20:57 -04:00
357d16a15e
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
7a5c096ede
fmt
...
Former-commit-id: b76defa253e555cd381ab6ccf66c8e7f3e816433
2019-05-22 19:49:06 +01:00
8f91e4e857
Improved GPU memory usage by ~5x by compressing vertex data
...
Former-commit-id: b657ae88e44c6ecbede8073ffe17991ba3a99886
2019-05-22 19:32:33 +01:00
615b3d79dd
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
1d6b3472e1
Remove hacks, clean up crufty code
...
Former-commit-id: 7c10103235e8d9e2967baa1f8e33d68995bdf4d5
2019-05-22 05:29:38 -06:00
6e11ee8d15
Temporarily remove Ruination
...
Former-commit-id: a63df9eaf187f7786b9a2a0e50194c3a7866edbe
2019-05-22 03:00:16 -06:00
ae92e775e9
laying groundwork for combat anims, untangling skeleton
...
Former-commit-id: a17189557788b09f91b720ff695767c9229fc726
2019-05-22 01:11:31 -04:00
c5f18c55ac
Prevent framerate drop when accessing settings menu
...
Former-commit-id: f51d1b700cd328b8156c7df97d6524277cc0718b
2019-05-21 16:44:51 -06:00
efdf18ebec
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
362938a244
Move to using only global_state for settings menu
...
Former-commit-id: bb86c851f51c02af1a25d57f2be95d1947b330ad
2019-05-21 16:44:51 -06:00
81fef4828c
Save view distance, volume, and audio device to settings when changed
...
Former-commit-id: ac7db47520c6524b3f2d7a788907daabb73ad237
2019-05-21 16:44:51 -06:00
7537a0eab0
Allow user to change audio device in the settings menu
...
Former-commit-id: 645b91182509da70075bb57f8ea6f9cd638c0d8e
2019-05-21 16:44:51 -06:00
5805b6346c
Prevent audio crashes by blocking jack by default
...
Former-commit-id: 61243a38667f64d1c8f106b1191ae876fc652c63
2019-05-21 16:44:51 -06:00
8aada06bd5
Continue implementing audio device selection
...
Former-commit-id: 6b92cbdb2e93653f43c0ed4d04e1b8fc35cfe8cf
2019-05-21 16:44:51 -06:00
