e830077fb1
Merge branch 'imbris/graphic-cache' into 'master'
...
Rework GraphicCache to use multiple texture atlases if necessary and put large images in their own textures.
See merge request veloren/veloren!609
2019-10-24 05:27:09 +00:00
eb4f9f4b78
Merge branch 'imbris/regions' into 'master'
...
Fix ghost bug :) [Regional system for sending entity updates to clients]
See merge request veloren/veloren!555
2019-10-24 04:39:13 +00:00
8bda7b1633
Fix possess bug, remove commented code, drain controller events
2019-10-24 00:00:00 -04:00
22d29d1209
Integrate new systems with metrics
2019-10-23 23:50:06 -04:00
d83a082bb4
Move terrain management and syncing into server side ecs systems
2019-10-23 23:50:06 -04:00
9cd42d1056
Move serverside client to a component and communications into server ecs systems
2019-10-23 23:50:06 -04:00
7bfd964c5f
Cleanup unused code
2019-10-23 22:43:02 -04:00
4a8c87b4bf
Actually fix region removal panic, update fuzzy chunk location, sync entity removal when unloading chunks, region size constant tweak
2019-10-23 22:43:02 -04:00
4cfe95ef0f
Fix not not sending updates outside a certain range and not sending character state when it changes due to update throttling
2019-10-23 22:43:02 -04:00
242a2e0712
Fix some panics when removing regions
2019-10-23 22:43:02 -04:00
45ca8d3a23
Make clients subscribed to nearby regions and only send physics updates from those regions.
2019-10-23 22:43:02 -04:00
492af9171c
Add initial region system implementation
2019-10-23 22:39:42 -04:00
696da23f7f
fix the welcome window not being closeable
...
due to the chat being in front of it,
by giving the welcome window a depth of -1.0.
The value of -1.0 is very arbitrary, but has some effect on
further development*, so there should be consideration concerning it.
* if something is supposed to be over/under the welcome window and
over/under something else with a different depth at the same time,
the resulting depth could become really ugly.
Of course it's always possible to change depths afterwards, but this often
breaks things, so the general scope of depths should
imo be considered, before this becomes a problem.
2019-10-24 00:46:40 +02:00
e92752709d
Merge branch 'pfau/assets-2' into 'master'
...
Multiple Assets and UI fixes and additions
See merge request veloren/veloren!619
2019-10-23 19:40:45 +00:00
9282ca00b4
Multiple Assets and UI fixes and additions
2019-10-23 19:40:45 +00:00
238461af2f
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
d64ab139d1
Formatted code.
2019-10-23 20:23:31 +02:00
ffc6a83a7b
Formatting fix
2019-10-23 13:30:03 -04:00
adb95e61ea
Added loc into readme
2019-10-23 13:27:04 -04:00
478b98737f
code-style: iter instead of into_iter.
2019-10-23 16:45:47 +02:00
d0e0b6de53
Drastically improved error messages in client and server.
2019-10-23 18:38:09 +02:00
34a361bba8
feat(env): customizable config file location
2019-10-22 17:15:10 +02:00
a6e377552c
Merge branch 'ifreund-drop-items' into 'master'
...
Allow dropping items
See merge request veloren/veloren!615
2019-10-22 01:22:50 +00:00
244fe7fb60
Merge branch 'vechro/aa-fix' into 'master'
...
Fix MSAA x16
See merge request veloren/veloren!613
2019-10-22 00:58:43 +00:00
9712d6dcd7
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
3d7dddcf6f
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
2354d10cfa
Fix MSAA x16
2019-10-21 21:55:49 +03:00
258aa59f92
Don't display commands that the player cannot use.
2019-10-21 18:36:35 +02:00
7d08a9ea48
Rework GraphicCache to use multiple texture atlases and put large images in their own textures.
2019-10-19 21:28:30 -04:00
31a2dd8516
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
f8a6a997ad
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
4a27282832
Merge branch 'songtronix/hotfix' into 'master'
...
Fix singleplayer
See merge request veloren/veloren!605
2019-10-18 16:21:28 +00:00
c5a5f59fd7
fix(crash): singleplayer
2019-10-18 17:39:57 +02:00
00c89ab510
Merge branch 'songtronix/QoL' into 'master'
...
Quality of Life
See merge request veloren/veloren!604
2019-10-18 15:06:21 +00:00
eda188dc37
fix(crash): overflowing the stack
2019-10-18 14:19:02 +02:00
4191b1bf9c
change(menu): display version with hash and date
2019-10-18 15:51:07 +02:00
c9bf0ad875
change(githash): provide date and hash
2019-10-18 15:32:55 +02:00
c6f8125b6c
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
ab9c6dc5db
Removed the recolor property from the armor ron files.
2019-10-17 19:45:29 -04:00
332f1ab12b
Merge branch 'pfau/assets' into 'master'
...
Initial staff implementation
See merge request veloren/veloren!602
2019-10-17 20:59:37 +00:00
8990469581
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
d292d1900a
Merge branch 'zesterer/small-fixes' into 'master'
...
Performance Improvements
See merge request veloren/veloren!597
2019-10-17 20:56:37 +00:00
127d618fdd
Fixed srgb normal bug
2019-10-17 17:35:17 +01:00
501047496a
Better (and faster) water shaders
2019-10-17 17:11:55 +01:00
5a7b7ee15e
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
2bc9dd815a
fix(CI): remove unneeded copy
2019-10-17 15:35:14 +02:00
9dcb855937
change(CI): include LICENSE in artifacts
2019-10-17 15:06:20 +02:00
6b0c64f412
Made rolling less violent when changing directions
2019-10-17 12:21:22 +01:00
ccb99059dc
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
7a84e998ff
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
