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,924 Commits 151 Branches 18 Tags
Commit Graph

2924 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Monty Marz
6a70ceec19 Merge branch 'pfau/adjust-healthbars' into 'master' 
Fix: Healthbars size

See merge request veloren/veloren!757
 2020-01-26 01:19:36 +00:00
Monty Marz
7c7c1c32b7 Fix: Healthbars size 2020-01-26 01:19:36 +00:00
Joshua Yanovski
4b22184b0d Merge branch 'slipped/npc-configs' into 'master' 
new mobs

See merge request veloren/veloren!703
 2020-01-26 00:22:49 +00:00
Justin Shipsey
36bd9596d7 new mobs 
alligators
 2020-01-26 00:22:48 +00:00
Monty Marz
1f3301fa2d Merge branch 'pfau/sprites-hairstyles-ui' into 'master' 
35 new ground sprites, UI fixes

See merge request veloren/veloren!755
 2020-01-25 11:14:02 +00:00
Monty Marz
0475c35937 35 new ground sprites, UI fixes 2020-01-25 11:14:02 +00:00
Monty Marz
39399bc975 Merge branch 'pfau/fix-panic-logout-without-char-data' into 'master' 
Fix: Player can't push the "Enter World" button anymore without having a character.

See merge request veloren/veloren!752
 2020-01-25 10:36:32 +00:00
Monty Marz
34ded68d93 Fix: Player can't push the "Enter World" button anymore without having a character. 2020-01-25 10:36:30 +00:00
Imbris
5703c32ea2 Merge branch 'imbris/pixel-art' into 'master' 
Make scaling ui elements more pixel art friendly

See merge request veloren/veloren!702
 2020-01-25 05:09:38 +00:00
Imbris
710780ca8d Merge branch 'imbris/nametags' into 'master' 
Make nametages etc fixed size and only display within limited range

See merge request veloren/veloren!754
 2020-01-25 04:17:56 +00:00
Imbris
79cb94e6e0 Enable pixel art resizing for voxel based ui elements 2020-01-24 23:14:59 -05:00
Imbris
b0e4c7b385 Adds fullscreen and window size settings and coverage based pixel art 
scaling
 2020-01-24 23:14:59 -05:00
Imbris
0342f2f43c Make nametages etc fixed size and only display within limited range 2020-01-24 22:09:45 -05:00
Acrimon
f50cfee5ba Merge branch 'acrimon/do-credit' into 'master' 
Added sponsorship section to readme.

See merge request veloren/veloren!751
 2020-01-25 01:15:17 +00:00
Acrimon
a220aed985
Added sponsorship section to readme. 2020-01-25 01:46:06 +01:00
Monty Marz
c45c7d4713 Merge branch 'hotfix' into 'master' 
Fixes number spam in console

See merge request veloren/veloren!748
 2020-01-24 15:42:36 +00:00
Pfauenauge90
b262bf3b07 fixed numbers spam 2020-01-24 16:10:38 +01:00
Imbris
9cbe2137f6 Merge branch 'imbris/vg3d-fix' into 'master' 
Fix overflow in VolGrid3d

See merge request veloren/veloren!747
 2020-01-24 06:27:26 +00:00
Imbris
38f854c6bb fix: overflow in VolGrid3d 2020-01-24 00:11:22 -05:00
Joshua Yanovski
323bc7b715 Merge branch 'ffp/world-colors' into 'master' 
Ffp/world colors

See merge request veloren/veloren!740
 2020-01-24 03:17:44 +00:00
Joshua Yanovski
2301c94d2b Addressing MR comments. 2020-01-24 03:45:29 +01:00
Joshua Yanovski
26dccdb544 Fix asset caching issue in CI. 2020-01-23 18:18:54 +01:00
Joshua Yanovski
fe580c9223 Resolving spurious Cargo.lock differences. 2020-01-23 18:18:46 +01:00
Joshua Yanovski
8e3fcee157 Updating CHANGELOG. 2020-01-23 18:18:44 +01:00
Joshua Yanovski
4a6a41e31d Erosion cleanup, part 3. 
Covers world/src/sim/erosion.rs.
 2020-01-23 18:18:18 +01:00
Joshua Yanovski
7391e8ae79 Make changing Alt/Compute to f32 work again. 2020-01-23 18:18:18 +01:00
Joshua Yanovski
3a868b9c92 Erosion cleanup, part 2. 
Covers all remaining files touched by MR except
world/src/sim/erosion.rs.
 2020-01-23 18:18:17 +01:00
Joshua Yanovski
0b7f428310 Erosion cleanup, part 1. 
Covers all files touched by MR that are not in world/src/sim.
 2020-01-23 18:18:17 +01:00
Joshua Yanovski
78c411d944 Fixing Cargo.lock after rebase. 2020-01-23 18:18:17 +01:00
Joshua Yanovski
88566f22f2 Minor fix to map generation. 
Also fixes some typos and makes formatting easier for changes needed to
produce large maps.
 2020-01-23 18:18:17 +01:00
Joshua Yanovski
78093a6479 Screenshots with F4 in the map, that will have the full resolution of 
the displayed map (hopefully).
 2020-01-23 18:18:16 +01:00
Joshua Yanovski
3c26342dba Fix warnings in examples and benchmarks. 2020-01-23 18:18:16 +01:00
Joshua Yanovski
3ba86c7b12 Fix all warnings. 2020-01-23 18:18:16 +01:00
Joshua Yanovski
d81218a114 Fixes to enable loading (relatively) large maps. 
With these changes, we can successfully open, map, and play maps thare
are 16x the size of a standard (1024 x 1024 chunk) map, 4x larger in
each direction.
 2020-01-23 18:18:16 +01:00
Joshua Yanovski
81306ad31f Add a default world map. 
Also adds map versioning, proper scaling, and updates sediment
rendering.  It also tones down warp.
 2020-01-23 18:18:15 +01:00
Joshua Yanovski
f527206e9d Updating Cargo.lock. 2020-01-23 18:18:14 +01:00
Joshua Yanovski
6a33254518 Changes to worldgen, adding more sedmient etc. 2020-01-23 18:18:14 +01:00
Joshua Yanovski
d79b0202e8 Send client 3D rendered map. 
Also shares configurable rendering between map generator and server.
 2020-01-23 18:18:14 +01:00
Joshua Yanovski
4b78597fb4 Code restructuring for performance. 
Turned a lot of for loops into for_each loops, which should be easier
for LLVM to optimize currently.  Also updated almost all the non-erosion
stuff in WorldGen to run in parallel (and take advantage of the cache,
in the case of TownGen), and hopefully improved performance somewhat for
chunk generation as well.
 2020-01-23 18:18:14 +01:00
Joshua Yanovski
c9857869c7 Revert to master for main background. 2020-01-23 18:18:13 +01:00
Joshua Yanovski
cc14c9166f Re-fix map orientation. 2020-01-23 18:18:13 +01:00
Joshua Yanovski
3c9e2a7f4e Updating Cargo.lock for sanity. 2020-01-23 18:18:13 +01:00
Joshua Yanovski
11ee4389dc Weight flux twice as much as beforein humidity calculation. 2020-01-23 18:18:13 +01:00
Joshua Yanovski
1ea8c1360b Adding many new types of geomorphic laws: 
- soil production (currently disabled).
- debris flow erosion (combined with regular stream power law).
- flow computation using multiple receivers.
- filling strategy during drainage network calculations.

Also tweaks a variety of other aspects of erosion.
 2020-01-23 18:18:12 +01:00
Joshua Yanovski
4f863470e1 Cargo fmt most things (except erosion.rs). 2020-01-23 18:18:12 +01:00
Joshua Yanovski
982b538a37 Gentler warp, especially for high chunk size. 2020-01-23 18:18:12 +01:00
Joshua Yanovski
0e88be716d Fix overflow issue with basement. 2020-01-23 18:18:12 +01:00
Joshua Yanovski
b5b017b4c6 Fix colors on map being transferred to client. 2020-01-23 18:18:11 +01:00
Joshua Yanovski
558a80f099 Fixes for nonstandard chunk and map sizes. 
Also fixes a longstanding map rendering issue.
 2020-01-23 18:18:11 +01:00
Joshua Yanovski
b988b27d31 Implement sending world map across the network. 2020-01-23 18:18:11 +01:00