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,305 Commits 151 Branches 18 Tags 2.1 GiB
00714db492
Commit Graph

8305 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
juliancoffee
00714db492 Implement Choice of Choice in loadout files 2021-06-02 18:35:22 +03:00
juliancoffee
674a7f41bd Using clippy::pedantic and improve asset tests 
- Turned clippy::pedantic on for loadout_builder.rs and applied some
proposition
- Check for invalid weights in loadout files
 2021-06-02 17:54:14 +03:00
juliancoffee
952156ad99 Add ability to override weapon in loadout assets 2021-06-02 17:17:19 +03:00
juliancoffee
3c66e62fe0 Decompose LoadoutBuilder::from_asset_expect 
- Introduce apply_asset_expect() to mutate passed builder and complete it
from asset
- Remove runtime panic from choosing item
- Rewrite defaults() to load from asset
 2021-06-02 17:17:19 +03:00
Dr. Dystopia
641ccd5282 Replace object initialization with read from file 2021-06-02 17:17:19 +03:00
Dr. Dystopia
35d5e3379e Create 'default.ron' file 2021-06-02 17:17:19 +03: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
Sam
42c8c08145 Fixed bow AI 2021-05-26 20:53:29 -05:00
Monty Marz
99cf533a8a Merge branch 'aweinstock/bow-zoom-charge-master' into 'master' 
Make the camera zoom as the bow (or any ChargedRanged attack) is charging.

See merge request veloren/veloren!2339
 2021-05-26 17:34:47 +00:00
Avi Weinstock
d6442dbd3b Change the ChargedRanged zoom distance from 0.0 to 2.0, and add a delay after the mouse click before the zoom starts (i.e. hold to zoom, spam click will not zoom). 2021-05-26 11:51:29 -04:00
Avi Weinstock
7a97fbb5cf Add zoom scaling as well as FOV scaling to ChargedRanged, and restore the old zoom afterwards. 2021-05-26 09:34:08 -04:00
Avi Weinstock
4d7828ec94 Make the camera zoom as the bow (or any ChargedRanged attack) is charging. 2021-05-26 09:34:07 -04:00
Justin Shipsey
d7c7f6bf5d Merge branch 'sam/rework-bow' into 'master' 
Bow Rework

See merge request veloren/veloren!2310
 2021-05-26 04:44:09 +00:00
jshipsey
ae43102a5b anim 2021-05-26 00:04:15 -04:00
Samuel Keiffer
827c6c874d Merge branch 'juliancoffee/dungeon_refactoring' into 'master' 
Refactor enemy creation in dungeons

See merge request veloren/veloren!2344
 2021-05-25 23:22:26 +00:00