Commit Graph

10808 Commits

Author SHA1 Message Date
Joshua Barretto
76ba3496a1 sync 2021-08-28 14:53:30 +01:00
Joshua Barretto
4064872b9a Better spot altitude 2021-08-28 14:53:30 +01:00
Joshua Barretto
8b8adcc1b8 More block particles, changes ore vein colour 2021-08-28 14:53:30 +01:00
Joshua Barretto
bbcd842208 Test spot entity spawning 2021-08-28 14:53:30 +01:00
Joshua Barretto
3025f043d3 Initial spot implementation 2021-08-28 14:53:30 +01:00
juliancoffee
24569b544a Rewrite multiplier_to_percentage to return f32 2021-08-28 02:36:26 +03:00
Sam
0a648e2e8f Fixed arrows dealing damage to entities if entity walked near arrow that stuck to terrain several seconds prior. 2021-08-26 19:00:28 -04:00
juliancoffee
75a0ce429f Handle some skill description in special way 2021-08-26 14:49:52 +03:00
juliancoffee
758fe19ccb Declarative skill icons 2021-08-26 14:49:52 +03:00
juliancoffee
9211b4a00a Inline skills::Boost to voxygen code 2021-08-26 14:49:52 +03:00
juliancoffee
74183ae5ec Inline redundant functions 2021-08-26 14:49:52 +03:00
juliancoffee
cc8b3c188e Split skilltree window handling per tree 2021-08-26 14:49:52 +03:00
juliancoffee
39b02411e9 Use PositionSpecifier for skill position 2021-08-26 14:49:52 +03:00
juliancoffee
9aacc33495 Inline create_new_text 2021-08-26 14:49:52 +03:00
juliancoffee
d76f65fc5a Diary refactoring 2021-08-26 14:49:52 +03:00
juliancoffee
54cb990d52 Move to one SKILL_MODIFIERS constant 2021-08-26 14:49:52 +03:00
juliancoffee
b1bac83319 SkillTreeModifiers data structs 2021-08-26 14:49:52 +03:00
juliancoffee
1ff99dcc34 Remove unused SkillBoost functions 2021-08-26 14:49:52 +03:00
juliancoffee
81bbc8c31f Split adjusted_by_skills by toolkind 2021-08-26 14:49:51 +03:00
Joshua Barretto
a2e0426d45 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
f9580a576c Fix warning agents not switching aggro on attack 2021-08-24 23:17:52 +01:00
Marcel
4f32bbba2b 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
20e33f5575 Split up iteration of rtsim entities each tick 2021-08-23 21:49:32 +00:00
Samuel Keiffer
9200eb80ff 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
a5a87a583c 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
3131c178d6 Making Block and Slots1-9 available for gamepad mapping 2021-08-23 10:38:35 +00:00
Marcel
30c446f8ee 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
Marcel Märtens
3d2d84ed15 speeling fix and feedback for CoC 2021-08-23 09:46:12 +02:00
Marcel Märtens
d16bd75010 incorporate feedback in COC 2021-08-23 09:28:45 +02:00
Marcel Märtens
c6dcb39d85 add smaller variant of the code of conduct and include feedback 2021-08-23 09:28:42 +02:00
Sam
790c3669a0 Fix mindflayer summoning minions inside pillars. 2021-08-22 12:21:24 -04:00
Bryant Deters
5983c87120 Check for existing target before initiating interaction 2021-08-21 22:28:26 -05:00
Imbris
2c3b484567 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
7acae057c5 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
08d8b01a2a 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
a612631aa4 Add comment on tuple bool field meaning in pathing 2021-08-21 15:19:12 +00:00
Ben Wallis
0c55b7b4b3 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
c00bca7e93 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
4d62b9b937 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
f93843ba23 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
fc98213996 simd must be last till we have a propper vek crate update 2021-08-20 12:44:46 +02:00
Ben Wallis
1f2ef007a9 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
9e35f5ec33 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
ef21c433dc 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
edce01c336 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
5b4a7722b1 Added veloren-publish tags and veloren-build tags to CI configuration 2021-08-19 09:08:49 +02:00
Marcel
738136e70f 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
4b62797f03 alxly/update-ru_RU: update translation for GPU profiler and mouse sensevity 2021-08-16 22:04:17 +02:00
Ygor Souza
54c3adf9af 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
5116c31f20 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