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
8,313 Commits 151 Branches 18 Tags 2.1 GiB
6d3dcc3835
Commit Graph

8313 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Avi Weinstock
6d3dcc3835 Address MR 2301 review comments. 
- Replace tabs with spaces in map-related i18n.
- Use `retain` in `remove_unloaded_chunks`.
 2021-06-02 00:39:58 -04:00
Avi Weinstock
e509a4207b Make the minimap UI not exposed via checkbox yet (still configurable via settings.ron). 2021-06-02 00:39:58 -04:00
Avi Weinstock
9d60a7f533 Make the chunks above dungeons/caves default to black when the ceiling is below them. 2021-06-02 00:39:58 -04:00
Avi Weinstock
523bf2be58 Fix memory leak in KeyedJobs threadpool helper. 2021-06-02 00:39:58 -04:00
Avi Weinstock
7115b1c899 Performance and aesthetic improvements to the voxel minimap. 
Performance:
- don't do anything when it's inactive
- only process chunks within minimap-VD
- remove chunks outside of VD
- higher thread pool fraction specified

Aesthetics:
- different water color
- wood and leaves no longer count as ceilings
 2021-06-02 00:39:58 -04:00
Avi Weinstock
cbe7521259 Add toggle for minimap, fix scaling formula, reduce minimap VD for better performance, and add changelog entry. 2021-06-02 00:39:04 -04:00
Avi Weinstock
1214715c21 Use a threadpool to speed up minimap chunk rendering. Also fix ceiling height calculations and color water blue. 2021-06-02 00:39:04 -04:00
Avi Weinstock
59e93d23c1 Improve ceiling detection for the voxel minimap. 2021-06-02 00:39:04 -04:00
Avi Weinstock
d878a2050a Composite the layers on chunk load, and try to add an overhead mode. 2021-06-02 00:39:04 -04:00
Avi Weinstock
6df2e96d25 Improve the efficiency of the voxel minimap by only updating it when crossing a chunk boundary or changing z-level. Allows making the 9 chunks nearest to the player fancier by compositing multiple z levels. 2021-06-02 00:39:04 -04:00
Avi Weinstock
937815d8c3 Make all the offsets for voxel minimap work properly for arbitrary sizes, and fix the memory leak. 2021-06-02 00:39:04 -04:00
Avi Weinstock
7980230b7f Add a minimap overlay based on voxel data. 2021-06-02 00:39:04 -04:00
Imbris
8cd4a39bf9 Merge branch 'imbris/fix-bench' into 'master' 
Fix benchmarks by removing the rest of the incremental folder

See merge request veloren/veloren!2364
 2021-06-02 03:33:27 +00:00
Imbris
a8ced7b959 Fix benchmarks by removing the rest of the incremental folder 2021-06-01 17:32:31 -04:00
Imbris
d256dae29e Merge branch 'imbris/fix-pages' into 'master' 
Fix pages by specifying a docker image

See merge request veloren/veloren!2363
 2021-06-01 21:07:57 +00:00
Imbris
e3523d418c Merge branch 'imbris/macos-ci' into 'master' 
Use native macos runner for builds

See merge request veloren/veloren!2362
 2021-06-01 20:34:07 +00:00
Imbris
659541d463 Fix pages by specifying a docker image 2021-06-01 16:26:41 -04:00
Imbris
351327c3d0 Use native macos runner for builds 2021-06-01 16:08:47 -04:00
Imbris
2c279c02d1 Merge branch 'imbris/update-toolchain' into 'master' 
Update toolchain

See merge request veloren/veloren!2322
 2021-06-01 18:49:30 +00:00
Imbris
32ab0860ca delete all incremental things for clippy CI 2021-06-01 14:15:01 -04:00
Imbris
1a092be2a1 Re-disable incremental for veloren-network-protocol, switch back to 
`veloren-docker` tagged runners
 2021-06-01 13:35:03 -04:00
Imbris
3a1a65b134 Remove stabilized or_patterns feature 2021-06-01 13:19:20 -04:00
Imbris
1db0e2a15c Use new multi image cache scheme in the CI and consolidate runner tag specification so that it is easier to modify 2021-06-01 13:19:12 -04:00
Imbris
23eca4c3f6 Re-disable incremental just for common-systems, small fix in plugin 
crate, more new clippy fixes
 2021-05-31 20:44:57 -04:00
Imbris
48ebb10d50 Update toolchain 2021-05-31 20:44:57 -04:00
Samuel Keiffer
9637d874ab Merge branch 'adam/frozen-debuff' into 'master' 
Frozen Debuff

See merge request veloren/veloren!2357
 2021-05-30 22:39:11 +00:00
Adam Whitehurst
77cb2ae783 fix: commas 2021-05-30 14:47:42 -07:00
Samuel Keiffer
58dcec79b5 Merge branch 'ygor/fix-glider-stuck-inside-wall' into 'master' 
Reset on_ceiling when not on ceiling

See merge request veloren/veloren!2247
 2021-05-30 21:09:31 +00:00
Adam Whitehurst
daa18dd92a fix: remove limit 2021-05-30 13:42:47 -07:00
Adam Whitehurst
2e74348813 refactor: variable names 2021-05-30 13:40:25 -07:00
Adam Whitehurst
9e7937d98f refactor: BuffKind::Frozen comment 2021-05-30 13:39:18 -07:00
Adam Whitehurst
98fdf5c3e1 fix: more succinct checked_tick_attack 2021-05-30 13:36:18 -07:00
Adam Whitehurst
6dc1c05089 fix: better scaling 2021-05-30 13:06:01 -07:00
Adam Whitehurst
66cf4ab74c fix: name 2021-05-30 12:56:26 -07:00
Ygor Souza
d890a58b93 Reset on_ceiling state 
Previously, the on_ceiling state would remain true for the entire
lifetime of the entity after it touched the ceiling once.
 2021-05-30 21:49:11 +02:00
Adam Whitehurst
6b1351bdc3 feat: impl attack speed modifier 2021-05-30 12:39:30 -07:00
Adam Whitehurst
0b92cc5732 feat: tick_attack utils 2021-05-30 12:39:00 -07:00
Adam Whitehurst
eea7eead2e wip: impl Stats::attack_speed_modifier 2021-05-30 09:40:11 -07:00
Marcel
a8fb168315 Merge branch 'aweinstock/terrain-entity-physics-20210528' into 'master' 
Fixed entities with voxel colliders being off by one physics tick for collision.

See merge request veloren/veloren!2355
 2021-05-30 16:25:44 +00:00
Adam Whitehurst
e06bd0eaa3 feat: BuffKind::Frozen 2021-05-30 08:51:47 -07:00
Adam Whitehurst
9eefa89f90 feat: add frozen debuff icon, en strings 2021-05-30 08:49:32 -07:00
Avi Weinstock
d38db15411 Fixed entities with voxel colliders being off by one physics tick for collision. 2021-05-28 20:25:57 -04:00
Marcel
f8b642ce86 Merge branch 'aweinstock/economy-20210528' into 'master' 
Fix economy data not properly being used to price trades, resulting in default...

See merge request veloren/veloren!2353
 2021-05-28 22:05:24 +00:00
Avi Weinstock
5380fc4eac Clear the economy database when creating it. 2021-05-28 16:14:31 -04:00
Avi Weinstock
3684cf0454 Fix economy data not properly being used to price trades, resulting in default prices being applied at most towns. 
Also add an exporter from econsim results to sqlite to aid in debugging the economy (which revealed this bug).
 2021-05-28 15:09:29 -04:00
Marcel
2771c29d54 Merge branch 'sam/torvus-fix' into 'master' 
Fixed torvus

See merge request veloren/veloren!2351
 2021-05-28 12:01:45 +00:00
Sam
9db8406e4c Fixed torvus 2021-05-27 19:56:16 -05:00
Samuel Keiffer
a0fc75ad18 Merge branch 'sam/small-fixes' into 'master' 
Fixed bow AI and inactive weapon exp gain

See merge request veloren/veloren!2349
 2021-05-28 00:45:45 +00:00
Sam
01f82314dc Fixed a few oddities with the AI 2021-05-26 21:34:21 -05:00
Sam
b826d5cb2b Fixed exp splitting in inactive equip slots. 2021-05-26 21:13:16 -05:00