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,517 Commits 151 Branches 18 Tags 2.1 GiB
3ceb3a9d6d
Commit Graph

1140 Commits

Author SHA1 Message Date
timokoesters
f1b728b89b
improvement: load_cloned returns a result 2019-10-24 23:55:24 +02:00
timokoesters
0a1e12c9ad
improvement: make debug items of type ItemKind::Tool 
This way all items that can be held in a hand are tools
 2019-10-24 23:55:24 +02:00
timokoesters
20248a4818
feat: store items as RON files 
When a new item is created, a ron file will be used as a template
 2019-10-24 23:47:26 +02: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
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
2703c8afe1 Move serverside client to a component and communications into server ecs systems 2019-10-23 23:50:06 -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
3e0ac48bd8 Multiple Assets and UI fixes and additions 2019-10-23 19:40:45 +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
8bb54976eb Rework GraphicCache to use multiple texture atlases and put large images in their own textures. 2019-10-19 21:28:30 -04: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
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
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
04c64dc122 Better (and faster) water shaders 2019-10-17 17:11:55 +01: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
Joshua Barretto
c01e19fc05 Don't render water that isn't there, improved chunk render order 2019-10-16 12:40:18 +01:00
Joshua Yanovski
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
Adam Fogle
3a4c307d38 Code cleanup, formatting changes, and fixed the cloth belt's offset. 2019-10-16 00:42:57 -04:00
Joshua Barretto
707b79f2c8 Smoother movement, Space for climbing 2019-10-14 11:22:48 +01:00
Joshua Barretto
4bbc340f52 Faster meshing, better dusk 2019-10-14 10:48:40 +01:00
jshipsey
deadd665c8 tweaks animations to better align with true positions 2019-10-12 14:19:55 -04:00
Adam Fogle
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
Adam Fogle
a5db28113f Redid the mainfest files to remove race/gender. 
Now based on armor slot enum.
Added color to the manifest files.
Manifest files aren't yet being used, but will load.
 2019-10-12 08:31:42 -04:00
Adam Fogle
a2b2d0d493 Created Spec structs for each armor type. 
Moved mesh creating code for each armor type
into matching struct.
Each Spec struct now loads the matching manifest file.
Manifest file is NOT used yet.
Warning thrown due to adding new parameter to the mesh function
for use reading the manifest file.
 2019-10-12 08:31:42 -04:00
Adam Fogle
da54cf76bc Armor names now end with left/right. 
Armor names no longer include their armor part.
This should be inferred from their folder.
 2019-10-12 08:31:42 -04:00
Marcel Märtens
30c9fcc911 Fix bug that metrics took a random port always introduced in !584 
also removed the duplicate port from the server creation process, using the server settings struct now
 2019-10-11 14:19:55 +02:00
Acrimon
a70f3cfd68 Merge branch 'overclockx64/near-plane-increase' into 'master' 
Increased near plane value, fixing character flickering on macOS

See merge request veloren/veloren!575
 2019-10-10 22:45:06 +00:00
Imbris
2651cb9179 Adjust far plane and bring near plane back in a bit 2019-10-10 22:24:24 +00:00
Marcel Märtens
20c520a044 Change the version number to 0.4 2019-10-10 15:48:01 +02:00
Luc Fauvel
b3697e1ea7 Increased near plane value 2019-10-09 22:23:09 -04:00
Forest Anderson
e7b97e0c66 md5sum assets 2019-10-09 22:42:39 +00:00
Monty Marz
d82ec6715a Item icons, chests and more 2019-10-09 19:28:05 +00:00
Joshua Barretto
889fd678c6 More opaque water surface 2019-10-08 12:21:05 +01:00
Wu Yu Wei
75df4600bd Switch portpicker dependemcy to git 
A pull request to fix has been created on original repository. But
since 0.4 is coming out pretty soon, let's swithc to this fork
temporary.
 2019-10-07 15:35:20 +00:00
Joshua Barretto
1a9408c397 Merge branch 'timo-arrowheight' into 'master' 
timo arrow spawn height

See merge request veloren/veloren!558
 2019-10-06 20:19:01 +00:00
timokoesters
25cc1f0103
fix: orientation now supports z rotation 2019-10-06 22:03:29 +02:00
Monty Marz
b3862278af Help window, UI fixes, asset fixes 2019-10-06 19:19:08 +00:00
Brian Lewis
86619d4192 Fix crashing due to error in Alsa. 
This uses a more recent version of cpal (a dependency of rodio hence the
rodio change) which seems to have fixed a crash due to
'device not available: "Invalid argument"' coming from Alsa.

The change in cpal also made some functions now return `Result` instead
of a bare type which I dealt with by using `expect` to minimize how far
these changes fan out into the code but maybe this isn't ideal.

Fixing https://gitlab.com/veloren/veloren/issues/280 - Crash with ALSA
 2019-10-06 11:24:42 +02:00
Forest Anderson
b13f9f37f7 Revert "Merge branch 'angelonfira/change-memory-allocator-to-jemalloc' into 'master'" 
This reverts merge request !547
 2019-10-06 01:31:47 +00:00
Forest Anderson
0304b51159 Chanced to ignore msvc instead of windows 
Change server to ignore msvc
 2019-10-05 17:57:29 -04:00
Forest Anderson
e1bab6afe0 Added jemalloc for Linux systems 2019-10-05 17:57:29 -04:00
Forest Anderson
9ef98ce1a5 Remove heaptrack 2019-10-05 17:57:29 -04:00
Timo Koesters
f3787879d3 fix(bow): adds bow icon art 2019-10-05 21:51:08 +00:00
timokoesters
4a99e5bc1e refactor: joined on &stats twice 2019-10-05 17:37:10 +02:00