9601 Commits

Author SHA1 Message Date
Monty Marz
856349ee45 Update spot.rs 2021-08-28 14:53:30 +01:00
Monty Marz
0594ffc4ae More spots 2021-08-28 14:53:30 +01:00
Joshua Barretto
3a7c3eabad Added random units for spots 2021-08-28 14:53:30 +01:00
Monty Marz
faba555abc more spawning rules
Update spot.rs
2021-08-28 14:53:30 +01:00
Joshua Barretto
7272b82085 Prevented spots spawning on sites 2021-08-28 14:53:30 +01:00
Joshua Barretto
ddb1104fe4 Added index customisation for world structure models 2021-08-28 14:53:30 +01:00
Gemu Peachems
1c1a59b9ad Gnarling Totem 2021-08-28 14:53:30 +01:00
Joshua Barretto
3aa9c5d82f No spots in sites 2021-08-28 14:53:30 +01:00
Monty Marz
4ed8f86afc dwarf grave 2021-08-28 14:53:30 +01:00
Joshua Barretto
c10665487b Added SpotConfig for easier spot creation 2021-08-28 14:53:30 +01:00
Joshua Barretto
7b5b2e632c sync 2021-08-28 14:53:30 +01:00
Joshua Barretto
d06b25e926 Better spot altitude 2021-08-28 14:53:30 +01:00
Joshua Barretto
a66f1922aa More block particles, changes ore vein colour 2021-08-28 14:53:30 +01:00
Joshua Barretto
0f1d42708c Test spot entity spawning 2021-08-28 14:53:30 +01:00
Joshua Barretto
a4592dd0d0 Initial spot implementation 2021-08-28 14:53:30 +01:00
Joshua Barretto
769f3653da Merge branch 'zesterer-master-patch-05234' into 'master'
Fix warning agents not switching aggro on attack

See merge request veloren/veloren!2784
2021-08-24 22:57:50 +00:00
Joshua Barretto
f3224876c4 Fix warning agents not switching aggro on attack 2021-08-24 23:17:52 +01:00
Marcel
f0403b0ef4 Merge branch 'ubruntu/rtsim-iter-partition' into 'master'
Split up iteration of rtsim entities each tick

See merge request veloren/veloren!2756
2021-08-23 21:49:33 +00:00
ubruntu
38db119176 Split up iteration of rtsim entities each tick 2021-08-23 21:49:32 +00:00
Samuel Keiffer
9d2b89e218 Merge branch 'sam/fix-summon-raycast' into 'master'
Fix mindflayer summoning minions inside pillars.

Closes #1238

See merge request veloren/veloren!2781
2021-08-23 12:58:12 +00:00
Marcel
e1dfda5b4f Merge branch 'flo666/make-block-and-slots-mappable-to-gamepad' into 'master'
Making Block and Slots1-9 available for gamepad mapping

See merge request veloren/veloren!2783
2021-08-23 10:38:35 +00:00
flo
a318461621 Making Block and Slots1-9 available for gamepad mapping 2021-08-23 10:38:35 +00:00
Marcel
f11ad3113e Merge branch 'ubruntu/npcs-ignore-when-busy' into 'master'
Prevent NPCs from being chat spammed

Closes #1301

See merge request veloren/veloren!2780
2021-08-23 07:48:34 +00:00
Sam
ae17cc5358 Fix mindflayer summoning minions inside pillars. 2021-08-22 12:21:24 -04:00
Bryant Deters
4f2c1cf58f Check for existing target before initiating interaction 2021-08-21 22:28:26 -05:00
Imbris
93d7fd697d Merge branch 'imbris/some-tweaks' into 'master'
Add comment on tuple bool field meaning in pathing

Closes #758

See merge request veloren/veloren!2778
2021-08-21 16:56:01 +00:00
Ben Wallis
b82341d8af Merge branch 'xvar/book-doc-gen' into 'master'
Added cargo cmd-doc-gen to auto-generate the table of commands in the book

See merge request veloren/veloren!2776
2021-08-21 16:14:42 +00:00
Ben Wallis
16b3aba412 Merge branch 'xvar/fix-add-admin-message' into 'master'
Fixed the message shown when adding an admin or moderator to show the correct role

See merge request veloren/veloren!2777
2021-08-21 15:40:27 +00:00
Imbris
02e5cb85b6 Add comment on tuple bool field meaning in pathing 2021-08-21 15:19:12 +00:00
Ben Wallis
c1ca525ab0 Fixed the message shown when adding an admin or moderator to show the correct role 2021-08-21 15:43:33 +01:00
Ben Wallis
3dd3e5d5ea Added cargo cmd-doc-gen to auto-generate the table of commands in the new players/commands.md page in the book 2021-08-21 13:36:55 +01:00
Samuel Keiffer
d924b48114 Merge branch 'ygor/combat-rating-all-stats' into 'master'
Use all armor stats to calculate combat rating

Closes #1285

See merge request veloren/veloren!2770
2021-08-20 21:16:05 +00:00
Marcel
46a16236e2 Merge branch 'xMAC94x/fix_tarpaulin' into 'master'
simd must be last till we have a propper vek crate update

See merge request veloren/veloren!2775
2021-08-20 11:18:00 +00:00
Marcel Märtens
de2ae0a184 simd must be last till we have a propper vek crate update 2021-08-20 12:44:46 +02:00
Ben Wallis
9775d76073 Merge branch 'xvar/no-more-brown-town' into 'master'
Explosions no longer change block colours within the radius of a safe zone

See merge request veloren/veloren!2774
2021-08-20 08:41:01 +00:00
Ben Wallis
526269f62f Explosions no longer change block colours within the radius of a safe zone. Doubled the radius of the safe zone in the /home town. 2021-08-20 09:00:55 +01:00
Marcel
da40cb0c6e Merge branch 'xvar/ci-runner-tags' into 'master'
Added veloren-publish tags and veloren-build tags to CI configuration

See merge request veloren/veloren!2537
2021-08-19 08:29:25 +00:00
Marcel Märtens
9ad423488f implement a new tag system for all veloren runners, including
- project tag:
   - `veloren/veloren`: for the veloren repo only
   - `veloren/*`: for projects thats are in the veloren namespace, e.g. usefull for smaller projects that dont have their own tag
   - `*/*` for projects by 3rd parties, e.g. personal projects
 - trusted tag:
   - `owned`:  The runner is hosted on veloren hardware
   - `trusted`: The runner is hosted by a private person, trusted by the veloren devs
   - NONE: if no special trust is given in a runner
 - check/build tag:
   - `check`: a job only performs a check and NO executable is build for users
   - `build`: the job contains atleast 1 executable that can be run by users
   - NONE: neither a check nor a executable is build, e.g. usefull for pages or meta jobs
 - publish tag:
   - `publish`: this job produces a artifact that is automatically pushed to users
   - NONE: no artifact is pushed automatically to users
 - pin tags:
   - `benchmark`: pin a runner to a specific job for the cause of benchmarks
   - `veloren/*:macos`: runs on a native macos runner ONLY, this needs to be a modified project tag, as otherwise also normal checks would run on this runner.
   - NONE: no runner is pinned
2021-08-19 09:23:31 +02:00
Ben Wallis
6935d0f6cd Added veloren-publish tags and veloren-build tags to CI configuration 2021-08-19 09:08:49 +02:00
Marcel
8777d12afd Merge branch 'alxly/update-ru_RU' into 'master'
alxly/update-ru_RU: add ru_RU missed translations

See merge request veloren/veloren!2757
2021-08-17 12:18:33 +00:00
AlxlY
73fdd0c5ec alxly/update-ru_RU: update translation for GPU profiler and mouse sensevity 2021-08-16 22:04:17 +02:00
Ygor Souza
9af9e58a85 Use all armor stats to calculate combat rating
- Added terms to account for poise (stun resistance), max energy bonus,
  energy reward bonus, and crit power.
- The weights were chosen to yield roughly the same CR for each of the 3
  types of armor in the same tier.
- Weapon rating multiplied by a constant to keep in the same order of
  magnitude as the other terms.
2021-08-16 19:59:54 +02:00
Samuel Keiffer
142918b37e Merge branch 'juliancoffee/balance_update' into 'master'
Abilitiy tweaks and /make_npc command

See merge request veloren/veloren!2769
2021-08-16 16:06:59 +00:00
juliancoffee
b26228bec0 Remove giants 2021-08-16 18:15:01 +03:00
juliancoffee
3b332b9213 Add ori_modifier for DashMelee and nerf it
* 0.6 -> 0.3 ori modifier during charge in DashMelee
2021-08-16 17:27:59 +03:00
juliancoffee
dc69716cd0 Implement /make_npc 2021-08-16 17:27:59 +03:00
juliancoffee
0c2df96371 Refactor supplement evaluation to use NpcData 2021-08-16 17:27:59 +03:00
juliancoffee
d93c6e2470 Add MakeNPC admin command 2021-08-16 16:45:36 +03:00
juliancoffee
1baef392e6 Abilitiy tweaks
Buff axe double_strike damage (90 -> 110 for first stage)
Decrease initial poise damage for hammer charged (20 -> 5)
2021-08-15 23:20:21 +03:00
Imbris
b05515e5bf Merge branch 'juliancoffee/explode_vines' into 'master'
Make Fireballs explode EnsnaringVines

See merge request veloren/veloren!2758
2021-08-14 19:09:05 +00:00