Imbris
a3cf60c56e
Link player stats, remove self name tag
...
Former-commit-id: bb20c8f1515859ae7720484faa4b718253e0ccb7
2019-05-24 02:31:03 -04:00
Imbris
ff03c12eee
Add healthbars, rebase fixes, warning fixes
...
Former-commit-id: e293133eb18452a53446d2d765ecbe00e50720ba
2019-05-24 02:31:03 -04:00
Imbris
1d9c35b91d
Add ability to position tuples of widgets ingame
...
Former-commit-id: e2958a37e7062132d6a7b6d5ad61bd4002768532
2019-05-24 02:31:02 -04:00
Imbris
32a4697d29
Make name labels work
...
Former-commit-id: 633905535d2842b320d347e368a28ac967a8469a
2019-05-24 02:31:02 -04:00
Joshua Barretto
ad23ec1c5d
Fixed UI shader
...
Former-commit-id: 12851d800a5435d25573e1deadb10b8103d40ac7
2019-05-24 02:31:02 -04:00
Imbris
43a73e5257
ingame_ui
...
Former-commit-id: 5e836043d58f9217d711462d9f700e3eb096a076
2019-05-24 02:31:01 -04:00
Joshua Barretto
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
Monty Marz
b5c5c4a1de
Disclaimer
...
Former-commit-id: dd115bb1971f066b19c3424c0a1352eb37dcb159
2019-05-23 22:45:48 +00:00
Joshua Barretto
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
sxv20_
e1ea42a284
fix crash on view distance change related to borrows
...
Former-commit-id: 0cfa022e0078b077f3bd128fc6f51d03898722ef
2019-05-23 10:30:46 +01:00
sxv20_
8f19c55d2e
move debug info DebugInfo struct
...
Former-commit-id: 88bded303575ad742416d0299dc19d70dcc81c31
2019-05-23 10:30:00 +01:00
Joshua Barretto
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
Algorhythm
934d94058f
Add ping indicator to debug HUD
...
Former-commit-id: 7bd4a30e9b2dc97134e91f71c08cbb05ca109db5
2019-05-23 08:18:25 +00:00
Joshua Barretto
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
Joshua Barretto
7a5c096ede
fmt
...
Former-commit-id: b76defa253e555cd381ab6ccf66c8e7f3e816433
2019-05-22 19:49:06 +01:00
Joshua Barretto
8f91e4e857
Improved GPU memory usage by ~5x by compressing vertex data
...
Former-commit-id: b657ae88e44c6ecbede8073ffe17991ba3a99886
2019-05-22 19:32:33 +01:00
Joshua Barretto
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
Louis Pearson
1d6b3472e1
Remove hacks, clean up crufty code
...
Former-commit-id: 7c10103235e8d9e2967baa1f8e33d68995bdf4d5
2019-05-22 05:29:38 -06:00
Louis Pearson
6e11ee8d15
Temporarily remove Ruination
...
Former-commit-id: a63df9eaf187f7786b9a2a0e50194c3a7866edbe
2019-05-22 03:00:16 -06:00
Louis Pearson
c5f18c55ac
Prevent framerate drop when accessing settings menu
...
Former-commit-id: f51d1b700cd328b8156c7df97d6524277cc0718b
2019-05-21 16:44:51 -06:00
Louis Pearson
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
Louis Pearson
362938a244
Move to using only global_state for settings menu
...
Former-commit-id: bb86c851f51c02af1a25d57f2be95d1947b330ad
2019-05-21 16:44:51 -06:00
Louis Pearson
81fef4828c
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
7537a0eab0
Allow user to change audio device in the settings menu
...
Former-commit-id: 645b91182509da70075bb57f8ea6f9cd638c0d8e
2019-05-21 16:44:51 -06:00
Louis Pearson
5805b6346c
Prevent audio crashes by blocking jack by default
...
Former-commit-id: 61243a38667f64d1c8f106b1191ae876fc652c63
2019-05-21 16:44:51 -06:00
Louis Pearson
8aada06bd5
Continue implementing audio device selection
...
Former-commit-id: 6b92cbdb2e93653f43c0ed4d04e1b8fc35cfe8cf
2019-05-21 16:44:51 -06:00
Louis Pearson
e372749131
Add audio to settings
...
Former-commit-id: 6e18b95bb3460a3b6d971b89c767045dcdbe7344
2019-05-21 16:44:51 -06:00
Louis Pearson
3012529dc9
Add baby steps for audio device choice support
...
Former-commit-id: 8c1d623b2a28997e7705ba2775b382b38e9a34ed
2019-05-21 16:44:51 -06:00
Louis Pearson
cd82f4adae
Add field_grazing.ogg
...
Former-commit-id: 36a5bf4a9af2d89e9acd8dd7404c0b4eb1836f5b
2019-05-21 16:44:51 -06:00
Joshua Barretto
557deb36e5
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
91ce041c91
fmt
...
Former-commit-id: 1f7bec8da117091b3f2e8f58ce45b9caf1b6c89d
2019-05-21 23:31:38 +01:00
Joshua Barretto
78f9d00604
Fixed singleplayer failure caused by worldgen
...
Former-commit-id: a2fdb56682922694b32e4d25890afa7a90c5b923
2019-05-21 23:31:17 +01:00
Joshua Barretto
d93743c1a6
Added spawn point
...
Former-commit-id: 04ea38df61d3610d679368166de220243ef1bfba
2019-05-21 23:04:39 +01:00
Joshua Barretto
cdfa5848d1
Added water, beaches, craggs
...
Former-commit-id: 0213bbac23cf01df31896461d0cdda3b0ee708dc
2019-05-21 22:51:41 +01:00
Joshua Barretto
2a56e7a83d
Added rocks, improved hills
...
Former-commit-id: c8f3d8fb550186bd87d0de953098971050fd1e03
2019-05-21 22:51:41 +01:00
Joshua Barretto
54ecb0054a
Restarted worldgen
...
Former-commit-id: e1526ec5f865904f11ab6a1507ecdc1a52acb28d
2019-05-21 22:51:41 +01:00
Joshua Barretto
343e22e5df
Added rivers, improved mountains
...
Former-commit-id: c1b76c54d2aa8f0616c26b0724fe34c0d80ac4fd
2019-05-21 22:51:41 +01:00
Joshua Barretto
58952ae9eb
Added basic mountain/valley worldgen
...
Former-commit-id: 5a45f18fcdf523841ee8433ba2ff0b8765eadf3a
2019-05-21 22:51:41 +01:00
Joshua Barretto
db7b3c1192
Made the edges of the world be empty
...
Former-commit-id: 51a3315a3b00d28c87c6364d83e32d180f4f8e18
2019-05-21 22:51:41 +01:00
Joshua Barretto
12ef159ea1
Fixed semicolon typo
...
Former-commit-id: 30dbac1bccde7a5c8ebce015e04df66e9d64f1b1
2019-05-21 22:51:41 +01:00
Pfauenauge90
220aa12318
Basic worldgen
...
Former-commit-id: 3ca0afa95dd1d868a84a41129e889a203e8a7cd9
2019-05-21 22:51:41 +01:00
Joshua Barretto
7a2461b5a8
Added worldsim API, ticking
...
Former-commit-id: 50a63e44557c634f2b39ef7a580cdbeec5ed0d70
2019-05-21 22:51:41 +01:00
Joshua Barretto
5cadcac30a
Less noisy worldgen
...
Former-commit-id: f1df6cc5b170db4949e88f11d26b9867056caacd
2019-05-21 22:51:41 +01:00
Joshua Barretto
12788fb338
Attempted fix of deltatime bug
...
Former-commit-id: d287bbf541dd318a7034f1e3ad4d9a167ac3c344
2019-05-21 22:51:41 +01:00
Joshua Barretto
cdb57e3831
Added mega worldgen
...
Former-commit-id: f7c88a1d387c282b78ab834dd63e64432b371552
2019-05-21 22:51:41 +01:00
Imbris
beb5953e08
Merge branch 'create-config-dir' into 'master'
...
Create config dir if needed
Closes #93
See merge request veloren/veloren!158
Former-commit-id: 2b3ee7d9523148e5946276e801d6b5f96d01c232
2019-05-21 05:06:15 +00:00
Louis Pearson
aead0501c1
Create config dir if needed
...
Former-commit-id: 280e49f428207d5dc9a88607252df4b9f155d018
2019-05-20 15:32:16 -06:00
Marcel
5e8a589e4e
Merge branch 'remove-net-settings-singleplayer' into 'master'
...
Stop saving singleplayer settings to network settings
See merge request veloren/veloren!157
Former-commit-id: 77ee0dad47bd0af10497d3db0d5a196e51d6211d
2019-05-20 21:16:05 +00:00
Louis Pearson
f2da543ab9
Stop saving singleplayer settings to network settings
...
Former-commit-id: 06d43eda771e03b6b30d4bdc8ab01d2b3cd6efc2
2019-05-20 15:05:09 -06:00
Joshua Barretto
00f242d6d8
Merge branch 'audio-volume-slider' into 'master'
...
Audio volume slider
See merge request veloren/veloren!154
Former-commit-id: e65ea111e788f5b4896ec6c256a702073020d1ab
2019-05-19 21:55:17 +00:00
