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

3455 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Shipsey
64690279af new mobs 
alligators
 2020-01-26 00:22:48 +00:00
Friz64
d75dbc01fc Update README.md 2020-01-25 22:33:22 +01:00
Monty Marz
e716ca2623 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
b583f60326 35 new ground sprites, UI fixes 2020-01-25 11:14:02 +00:00
Monty Marz
1835927946 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
4287c76e95 Fix: Player can't push the "Enter World" button anymore without having a character. 2020-01-25 10:36:30 +00:00
Imbris
659710e2b8 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
ecf36cb778 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
460f5e6f26 Enable pixel art resizing for voxel based ui elements 2020-01-24 23:14:59 -05:00
Imbris
e5d841e62f Adds fullscreen and window size settings and coverage based pixel art 
scaling
 2020-01-24 23:14:59 -05:00
Imbris
166aba61f0 Make nametages etc fixed size and only display within limited range 2020-01-24 22:09:45 -05:00
Acrimon
029f16a916 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
5596e144d7
Added sponsorship section to readme. 2020-01-25 01:46:06 +01:00
timokoesters
6515daddce fixes 2020-01-24 16:57:24 +01:00
Monty Marz
f175947a91 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
c08c545474 fixed numbers spam 2020-01-24 16:10:38 +01:00
Imbris
605eb7c6ec 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
b6235d51cf fix: overflow in VolGrid3d 2020-01-24 00:11:22 -05:00
Joshua Yanovski
d496080d84 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
02f9c9490b Addressing MR comments. 2020-01-24 03:45:29 +01:00
Joshua Yanovski
3a0483e8ee Fix asset caching issue in CI. 2020-01-23 18:18:54 +01:00
Joshua Yanovski
53474a215a Resolving spurious Cargo.lock differences. 2020-01-23 18:18:46 +01:00
Joshua Yanovski
f39cc0b8bb Updating CHANGELOG. 2020-01-23 18:18:44 +01:00
Joshua Yanovski
2908843448 Erosion cleanup, part 3. 
Covers world/src/sim/erosion.rs.
 2020-01-23 18:18:18 +01:00
Joshua Yanovski
64d19a80e3 Make changing Alt/Compute to f32 work again. 2020-01-23 18:18:18 +01:00
Joshua Yanovski
756cc0aab4 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
3383e991e7 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
133ba29293 Fixing Cargo.lock after rebase. 2020-01-23 18:18:17 +01:00
Joshua Yanovski
55a96bce09 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
ba043b91a2 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
49e7e55cd6 Fix warnings in examples and benchmarks. 2020-01-23 18:18:16 +01:00
Joshua Yanovski
1d6d0ea03d Fix all warnings. 2020-01-23 18:18:16 +01:00
Joshua Yanovski
ccd85e8907 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
d54f22c9fa 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
7f2573c561 Updating Cargo.lock. 2020-01-23 18:18:14 +01:00
Joshua Yanovski
1358f1dffa Changes to worldgen, adding more sedmient etc. 2020-01-23 18:18:14 +01:00
Joshua Yanovski
ebe0d14eab Send client 3D rendered map. 
Also shares configurable rendering between map generator and server.
 2020-01-23 18:18:14 +01:00
Joshua Yanovski
9ee0cd82d0 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
2a6ed4351d Revert to master for main background. 2020-01-23 18:18:13 +01:00
Joshua Yanovski
14e4dfb53f Re-fix map orientation. 2020-01-23 18:18:13 +01:00
Joshua Yanovski
16c24e86b3 Updating Cargo.lock for sanity. 2020-01-23 18:18:13 +01:00
Joshua Yanovski
53ac7c0eb1 Weight flux twice as much as beforein humidity calculation. 2020-01-23 18:18:13 +01:00
Joshua Yanovski
597bb3c526 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
e91578ffdb Cargo fmt most things (except erosion.rs). 2020-01-23 18:18:12 +01:00
Joshua Yanovski
5fd8b009a6 Gentler warp, especially for high chunk size. 2020-01-23 18:18:12 +01:00
Joshua Yanovski
8d5a5af2cb Fix overflow issue with basement. 2020-01-23 18:18:12 +01:00
Joshua Yanovski
d0cfdb34aa Fix colors on map being transferred to client. 2020-01-23 18:18:11 +01:00
Joshua Yanovski
2b38927345 Fixes for nonstandard chunk and map sizes. 
Also fixes a longstanding map rendering issue.
 2020-01-23 18:18:11 +01:00
Joshua Yanovski
9520ef4f6d Implement sending world map across the network. 2020-01-23 18:18:11 +01:00
Joshua Yanovski
bacc5271d4 Soil production should use ground, not basement, slope. 2020-01-23 18:18:11 +01:00