3902b8e364
Merge branch 'xacrimon/error-handling' into 'master'
...
Drastically improved error messages in client and server.
See merge request veloren/veloren!621
2019-10-23 17:50:18 +00:00
57bfb302dd
Formatted code.
2019-10-23 20:23:31 +02:00
4c23bb4dfc
Formatting fix
2019-10-23 13:30:03 -04:00
3080b4366b
Added loc into readme
2019-10-23 13:27:04 -04:00
2215f9abd7
code-style: iter instead of into_iter.
2019-10-23 16:45:47 +02:00
6f532a7a37
Drastically improved error messages in client and server.
2019-10-23 18:38:09 +02:00
e8a077a5d6
feat(env): customizable config file location
2019-10-22 17:15:10 +02:00
4815a096fd
Merge branch 'ifreund-drop-items' into 'master'
...
Allow dropping items
See merge request veloren/veloren!615
2019-10-22 01:22:50 +00:00
9e7fa0ed4f
Merge branch 'vechro/aa-fix' into 'master'
...
Fix MSAA x16
See merge request veloren/veloren!613
2019-10-22 00:58:43 +00:00
355c7666b9
Allow dropping items
...
Items can now be dropped by clicking to select the item then clicking
outside of the bag.
2019-10-22 01:40:58 +02:00
d35ca01b1e
Merge branch 'soruh/veloren-help-only-show-allowed-main-repo' into 'master'
...
Don't display commands that the player cannot use.
Closes #351
See merge request veloren/veloren!612
2019-10-21 19:22:23 +00:00
c9787846d5
Fix MSAA x16
2019-10-21 21:55:49 +03:00
db69bf23b8
Don't display commands that the player cannot use.
2019-10-21 18:36:35 +02:00
8bb54976eb
Rework GraphicCache to use multiple texture atlases and put large images in their own textures.
2019-10-19 21:28:30 -04:00
baf04e75d9
Merge branch 'shandley/cargo-update-conrod' into 'master'
...
Update conrod_core
Closes #171
See merge request veloren/veloren!608
2019-10-19 23:09:46 +00:00
eb65e4411f
WIP (testing) Update conrod_core
...
This is a `cargo update -p conrod_core` to bring in updates to
`veloren/conrod/conrod_core` to add support for copy and paste.
Ref: veloren/conrod!2
Fixes #171
2019-10-19 15:12:37 +09:00
ab8c4a45b5
Merge branch 'songtronix/hotfix' into 'master'
...
Fix singleplayer
See merge request veloren/veloren!605
2019-10-18 16:21:28 +00:00
3e1bf295b5
fix(crash): singleplayer
2019-10-18 17:39:57 +02:00
72e18d0edd
Merge branch 'songtronix/QoL' into 'master'
...
Quality of Life
See merge request veloren/veloren!604
2019-10-18 15:06:21 +00:00
fffffff536
fix(crash): overflowing the stack
2019-10-18 14:19:02 +02:00
fe4a61354a
change(menu): display version with hash and date
2019-10-18 15:51:07 +02:00
5b716515bb
change(githash): provide date and hash
2019-10-18 15:32:55 +02:00
39656e92be
Merge branch '276-hotloading-armor' into 'master'
...
Resolve "Enable hotloading of different offsets for armors/weapons"
Closes #276
See merge request veloren/veloren!545
2019-10-18 00:29:09 +00:00
c41627d75f
Removed the recolor property from the armor ron files.
2019-10-17 19:45:29 -04:00
687473c5e6
Merge branch 'pfau/assets' into 'master'
...
Initial staff implementation
See merge request veloren/veloren!602
2019-10-17 20:59:37 +00:00
fdfab6a807
refactor: create_projectile doesn't take a light
...
It returns a builder so the caller can just do it
2019-10-17 20:59:36 +00:00
1f39659a54
Merge branch 'zesterer/small-fixes' into 'master'
...
Performance Improvements
See merge request veloren/veloren!597
2019-10-17 20:56:37 +00:00
dcf8655202
Fixed srgb normal bug
2019-10-17 17:35:17 +01:00
04c64dc122
Better (and faster) water shaders
2019-10-17 17:11:55 +01:00
57e7925418
Merge branch 'songtronix/include-license' into 'master'
...
Include LICENSE file in artifacts
Closes #343
See merge request veloren/veloren!601
2019-10-17 14:22:41 +00:00
1a47cadc24
fix(CI): remove unneeded copy
2019-10-17 15:35:14 +02:00
cde310fa5a
change(CI): include LICENSE in artifacts
2019-10-17 15:06:20 +02:00
013afafba8
Made rolling less violent when changing directions
2019-10-17 12:21:22 +01:00
b090a1b5cd
Merge branch 'shandley/title-music-single-play' into 'master'
...
Title music fix
Closes #342
See merge request veloren/veloren!600
2019-10-17 07:58:58 +00:00
ab59d1f262
Title music fix ( fixes #342 )
...
Fix issue with title music restarting and playing in multiple channels
when the player chooses a play state but then returns to the main menu.
2019-10-17 16:14:16 +09:00
3279a278b7
Move computations to terrain fragment shaders
2019-10-16 15:05:45 +01:00
c01e19fc05
Don't render water that isn't there, improved chunk render order
2019-10-16 12:40:18 +01:00
cc6ad7d6e2
Merge branch 'sharp/erosion' into 'master'
...
Add erosion, rivers, and lakes.
See merge request veloren/veloren!593
2019-10-16 11:39:41 +00:00
8ae2692b6e
Allow canceling chunk generation.
...
Currently we only do this when no players are in range of the chunk. We
also send the first client who posted the chunk a message indicating
that it's canceled, the hope being that this will be a performance win
in single player mode since you don't have to wait three seconds to
realize that the server won't generate the chunk for you.
We now check an atomic flag for every column sample in a chunk. We
could probably do this less frequently, but since it's a relaxed load it
has essentially no performance impact on Intel architectures.
2019-10-16 11:39:41 +00:00
3a4c307d38
Code cleanup, formatting changes, and fixed the cloth belt's offset.
2019-10-16 00:42:57 -04:00
6cd78dcb4c
Merge branch 'zesterer/small-fixes' into 'master'
...
Small fixes: Faster meshing, smoother movement, better interpolation, and a return to space for climbing
See merge request veloren/veloren!596
2019-10-14 12:32:42 +00:00
707b79f2c8
Smoother movement, Space for climbing
2019-10-14 11:22:48 +01:00
4bbc340f52
Faster meshing, better dusk
2019-10-14 10:48:40 +01:00
d719c69fca
Merge branch 'heydabop/bug/324-modulo-panic' into 'master'
...
fixes #324 - changes possible modulo range from 0-29 to 1-29 to prevent mod by 0
Closes #324
See merge request veloren/veloren!595
2019-10-14 03:14:29 +00:00
522ab2cd98
fixes #324 - changes possible modulo range from 0-29 to 1-29 to prevent mod by 0
2019-10-13 21:39:37 -05:00
8d272c8234
Merge branch 'kyozm/proper-lack-of-permission-messages' into 'master'
...
proper message on permission check failure for commands
Closes #303
See merge request veloren/veloren!592
2019-10-13 08:39:30 +00:00
5be28178bd
proper message on permission check failure for commands
2019-10-12 18:24:44 -03:00
36265e5710
Merge branch 'slipped/shadowfix' into 'master'
...
shadow bug fix
See merge request veloren/veloren!591
2019-10-12 18:51:43 +00:00
deadd665c8
tweaks animations to better align with true positions
2019-10-12 14:19:55 -04:00
8f7b4afafd
Manifest file is now used to load armor.
...
Redid how pants renders so they can use underlying skin model/coloring,
same as chest armor.
Redid how belts render so they can use the underly skin color,
same as shoulder or foot.
Converted a manifest variable name to snake case.
2019-10-12 08:31:42 -04:00
