|
|
29803524fd
|
Made temperature biomes larger, added savannah ground
|
2019-07-08 00:50:36 +01:00 |
|
|
|
e1ede61c06
|
Merge branch 'slipped/substates' into 'master'
substates
See merge request veloren/veloren!319
|
2019-07-07 23:38:04 +00:00 |
|
|
|
529281e2c3
|
removed weapon_id attribs, replaced with matches
|
2019-07-07 19:24:20 -04:00 |
|
|
|
12667b9172
|
fmt
|
2019-07-07 18:06:29 -04:00 |
|
|
|
5cd1bfb3d2
|
adds support for animation substates, animates run/idle/jump for hammer
|
2019-07-07 18:04:27 -04:00 |
|
|
|
d45acdc645
|
Merge branch 'inventory-items' into 'master'
crosshair changes (WIP!), inventory visuals, camera changes, savannah trees
See merge request veloren/veloren!317
|
2019-07-07 15:42:50 +00:00 |
|
|
|
faa67e81a6
|
Merge branch 'songtronix/veloren-discord-rich-presence' into 'master'
Added discord presence
See merge request veloren/veloren!214
|
2019-07-07 15:38:54 +00:00 |
|
|
|
0cc3c76542
|
fmt
|
2019-07-07 17:31:34 +02:00 |
|
|
|
7f45d274a8
|
clean up
|
2019-07-07 16:19:20 +02:00 |
|
|
|
f3bda57e67
|
fmt
|
2019-07-07 16:19:20 +02:00 |
|
|
|
a56747b555
|
acacia trees
|
2019-07-07 16:19:20 +02:00 |
|
|
|
70f8fe9002
|
ui scaling relative to window size
|
2019-07-07 16:19:20 +02:00 |
|
|
|
c27d55db6c
|
less numbers for the indicator text
|
2019-07-07 16:19:20 +02:00 |
|
|
|
ff6d7206a3
|
fix
|
2019-07-07 16:19:19 +02:00 |
|
|
|
94acd0f437
|
Crosshair transp slider
|
2019-07-07 16:19:19 +02:00 |
|
|
|
3be2951029
|
crosshair correction
|
2019-07-07 16:19:19 +02:00 |
|
|
|
de1cf1371c
|
colour and camera corrections
|
2019-07-07 16:19:19 +02:00 |
|
|
|
d4a6f0c202
|
camera changes and nametag colour
|
2019-07-07 16:19:18 +02:00 |
|
|
|
bd94baa125
|
Added crosshair TODO
|
2019-07-07 16:19:18 +02:00 |
|
|
|
d186c4031e
|
Sharp crosshair (no multisampling)
|
2019-07-07 16:19:18 +02:00 |
|
|
|
7455155198
|
more test items
|
2019-07-07 16:19:18 +02:00 |
|
|
|
89cadf27be
|
fix fonts
|
2019-07-07 16:19:18 +02:00 |
|
|
|
50e15333cd
|
set the inventory space test button to false by default and increased the starting inventory size to 10
|
2019-07-07 16:19:17 +02:00 |
|
|
|
b99bd4a20a
|
Bag window expands with available space
|
2019-07-07 16:19:17 +02:00 |
|
|
|
381b9cabd1
|
fmt
|
2019-07-07 16:19:17 +02:00 |
|
|
|
e66419b396
|
smaller border for available slots, item image size changed
|
2019-07-07 16:19:17 +02:00 |
|
|
|
991e4b15e5
|
fmt
|
2019-07-07 16:19:16 +02:00 |
|
|
|
03894cb2ab
|
Comments on example item, removed printing of available inventory space No.
|
2019-07-07 16:19:16 +02:00 |
|
|
|
3ab01bd86b
|
added visual test item
|
2019-07-07 16:19:16 +02:00 |
|
|
|
ff7fb032a4
|
fixed scaling of the slots
|
2019-07-07 16:19:16 +02:00 |
|
|
|
be64662b14
|
added active inventory slots
|
2019-07-07 16:19:16 +02:00 |
|
|
|
f4499e26af
|
added visual test item
|
2019-07-07 16:19:15 +02:00 |
|
|
|
626978213f
|
fixed scaling of the slots
|
2019-07-07 16:19:15 +02:00 |
|
|
|
12e7d749ec
|
added active inventory slots
|
2019-07-07 16:19:15 +02:00 |
|
|
|
933063a8f4
|
Stopped server from building
|
2019-07-07 16:16:08 +02:00 |
|
|
|
8786b7b4b7
|
Tried added Discord feature right to final builds
|
2019-07-07 16:16:08 +02:00 |
|
|
|
377c80192f
|
Test add Discord feature to build
|
2019-07-07 16:16:07 +02:00 |
|
|
|
07754b0a79
|
fmt
|
2019-07-07 16:16:07 +02:00 |
|
|
|
b4fe69be22
|
Fix warnings
|
2019-07-07 16:16:07 +02:00 |
|
|
|
8220564fa6
|
Fix rebasing issues
|
2019-07-07 16:16:07 +02:00 |
|
|
|
6fa086b964
|
remove expects, warnings, code duplication
|
2019-07-07 16:16:06 +02:00 |
|
|
|
2338084af0
|
Add Linux support
|
2019-07-07 16:16:06 +02:00 |
|
|
|
5ea624674d
|
add comment and logging error
|
2019-07-07 16:16:06 +02:00 |
|
|
|
1be8f5e422
|
Update status according the play state
|
2019-07-07 16:16:05 +02:00 |
|
|
|
1e40bd09ba
|
working discord presence
|
2019-07-07 16:16:05 +02:00 |
|
|
|
60500d9235
|
add discord feature with dependencies
|
2019-07-07 16:16:05 +02:00 |
|
|
|
d9ab3ef76c
|
Merge branch 'songtronix/adjust-audio-on-startup' into 'master'
Adjust volume on startup
Closes #182
See merge request veloren/veloren!318
|
2019-07-07 14:12:28 +00:00 |
|
|
|
9007f4aa5a
|
Adjust volume on startup
|
2019-07-07 14:12:28 +00:00 |
|
|
|
6b7606bf98
|
Merge branch 'zesterer/worldgen' into 'master'
Fixed tree trimming
See merge request veloren/veloren!316
|
2019-07-07 10:43:10 +00:00 |
|
|
|
9b99666953
|
Merge branch 'fa/hotfix-ci-failure' into 'master'
Fix rustc warning
See merge request veloren/veloren!314
|
2019-07-07 04:37:22 +00:00 |
|
