Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,511 Commits 151 Branches 18 Tags 2.1 GiB
edd56e2fc0
Commit Graph

2511 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Monty Marz
edd56e2fc0 Merge branch 'pfau/fix-help-window' into 'master' 
.floating(true) for help window background to make it layer above every recent and future widget

See merge request veloren/veloren!627
 2019-10-24 18:21:17 +00:00
Monty Marz
f4ba68c60d .floating(true) for help window background to make it layer above every recent and future widget 2019-10-24 18:21:17 +00:00
Joshua Barretto
7d86a360d6 Merge branch 'soruh/fix-welcome-window-depth' into 'master' 
fix the welcome window not being closeable, due to it being obscured by the chat

See merge request veloren/veloren!623
 2019-10-24 12:49:20 +00:00
Imbris
2fad65c749 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
Imbris
4b1fb112de 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
Imbris
a200dafd45 Fix possess bug, remove commented code, drain controller events 2019-10-24 00:00:00 -04:00
Imbris
966b2bfbff Integrate new systems with metrics 2019-10-23 23:50:06 -04:00
Imbris
8f81b69a25 Move terrain management and syncing into server side ecs systems 2019-10-23 23:50:06 -04:00
Imbris
2703c8afe1 Move serverside client to a component and communications into server ecs systems 2019-10-23 23:50:06 -04:00
Imbris
c02cd0a730 Cleanup unused code 2019-10-23 22:43:02 -04:00
Imbris
53ddbec527 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
Imbris
ab7740f378 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
Imbris
10f9f10cb3 Fix some panics when removing regions 2019-10-23 22:43:02 -04:00
Imbris
b09bddda79 Make clients subscribed to nearby regions and only send physics updates from those regions. 2019-10-23 22:43:02 -04:00
Imbris
24d1f6d970 Add initial region system implementation 2019-10-23 22:39:42 -04:00
soruh
f186aac2ea 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
Monty Marz
0f55533430 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
Monty Marz
3e0ac48bd8 Multiple Assets and UI fixes and additions 2019-10-23 19:40:45 +00:00
Acrimon
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
Acrimon
57bfb302dd Formatted code. 2019-10-23 20:23:31 +02:00
Acrimon
2215f9abd7 code-style: iter instead of into_iter. 2019-10-23 16:45:47 +02:00
Acrimon
6f532a7a37 Drastically improved error messages in client and server. 2019-10-23 18:38:09 +02:00
Justin Shipsey
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
Imbris
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
Isaac Freund
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
Imbris
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
Vechro
c9787846d5 Fix MSAA x16 2019-10-21 21:55:49 +03:00
soruh
db69bf23b8 Don't display commands that the player cannot use. 2019-10-21 18:36:35 +02:00
Imbris
8bb54976eb Rework GraphicCache to use multiple texture atlases and put large images in their own textures. 2019-10-19 21:28:30 -04:00
Imbris
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
Shane Handley
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
Songtronix
ab8c4a45b5 Merge branch 'songtronix/hotfix' into 'master' 
Fix singleplayer

See merge request veloren/veloren!605
 2019-10-18 16:21:28 +00:00
Songtronix
3e1bf295b5 fix(crash): singleplayer 2019-10-18 17:39:57 +02:00
Songtronix
72e18d0edd Merge branch 'songtronix/QoL' into 'master' 
Quality of Life

See merge request veloren/veloren!604
 2019-10-18 15:06:21 +00:00
Songtronix
fffffff536 fix(crash): overflowing the stack 2019-10-18 14:19:02 +02:00
Songtronix
fe4a61354a change(menu): display version with hash and date 2019-10-18 15:51:07 +02:00
Songtronix
5b716515bb change(githash): provide date and hash 2019-10-18 15:32:55 +02:00
Imbris
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
Adam Fogle
c41627d75f Removed the recolor property from the armor ron files. 2019-10-17 19:45:29 -04:00
Joshua Barretto
687473c5e6 Merge branch 'pfau/assets' into 'master' 
Initial staff implementation

See merge request veloren/veloren!602
 2019-10-17 20:59:37 +00:00
Monty Marz
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
Joshua Barretto
1f39659a54 Merge branch 'zesterer/small-fixes' into 'master' 
Performance Improvements

See merge request veloren/veloren!597
 2019-10-17 20:56:37 +00:00
Joshua Barretto
dcf8655202 Fixed srgb normal bug 2019-10-17 17:35:17 +01:00
Joshua Barretto
04c64dc122 Better (and faster) water shaders 2019-10-17 17:11:55 +01:00
Joshua Barretto
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
Songtronix
1a47cadc24 fix(CI): remove unneeded copy 2019-10-17 15:35:14 +02:00
Songtronix
cde310fa5a change(CI): include LICENSE in artifacts 2019-10-17 15:06:20 +02:00
Joshua Barretto
013afafba8 Made rolling less violent when changing directions 2019-10-17 12:21:22 +01:00
Joshua Barretto
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
Shane Handley
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