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,044 Commits 151 Branches 18 Tags
Commit Graph

3044 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rémy PHELIPOT
355a86438c [i18n] Configurable fonts 
- Add font configuration in internationalization files
- Scale font size using a configurable ratio
- Add a script to identify translation item statuses using Git metadata
- Execute the i18n script in a new gitlab-ci step (delayed)
- Clone haxrcorp_4089_cyrillic_altgr font (haxrcorp_4089_cyrillic_altgr_extended)
  to add some additional latin characters (mainly for French)
 2020-02-16 16:02:38 +01:00
Monty Marz
212ca91cdd Merge branch 'pfau/fix-healthbars' into 'master' 
Fix healthbar background alignment

See merge request veloren/veloren!803
 2020-02-16 10:58:44 +00:00
Monty Marz
8cb963899a Fix healthbar background alignment 2020-02-16 10:58:44 +00:00
Imbris
24fb10e423 Merge branch 'shandley/audio-channel-types' into 'master' 
Use non-spatial audio sinks for music

Closes #463

See merge request veloren/veloren!794
 2020-02-15 21:30:44 +00:00
S Handley
63a1bcc591 Split the audio channels into SFX and music channels. This makes the 
Music Channel for exploration music a basic Sink without spatial audio
functionality, which is not required.
 2020-02-15 21:30:44 +00:00
Forest Anderson
624c9b6449 Merge branch 'angelonfira/add-ci-tarpaulin-workaround' into 'master' 
Try tarpaulin 4 times before failing

See merge request veloren/veloren!802
 2020-02-15 20:57:53 +00:00
Forest Anderson
1ad4e79f48 Try tarpaulin 4 times before failing 2020-02-15 20:57:52 +00:00
Songtronix
e638acf4c7 Merge branch 'imarv/fix-give-exp' into 'master' 
Fix /give_exp command an introduce /set_level

Closes #481 and #460

See merge request veloren/veloren!793
 2020-02-15 17:45:29 +00:00
Marvin Altemeier
494dccd4fb resolve #481 - add /set_level command 2020-02-14 22:11:41 +01:00
Marvin Altemeier
e477a095d1 change order of /give_exp arguments 2020-02-14 22:11:20 +01:00
Marvin Altemeier
5103459eec fix #460 - /give_exp targeting wrong player 2020-02-14 22:11:20 +01:00
Imbris
b197ecaddd Merge branch 'sharp/spawn-single-species' into 'master' 
Allow spawning individual species with /spawn.

See merge request veloren/veloren!780
 2020-02-14 04:44:34 +00:00
Joshua Yanovski
f4a46729e3 Allow spawning individual species with /spawn. 
To get the old behavior, you now need to refer to the internal keywords
(like "bird_medium" or "quadruped_small") rather than the old friendly
names (like "duck" or "pig"), as the latter generate single species now.
 2020-02-14 03:12:37 +01:00
Ben Simpson
14619df6c0 Merge branch 'expandedreality/energy-regen' into 'master' 
Energy now does not regen when climbing,gliding,and swimming

Closes #483

See merge request veloren/veloren!800
 2020-02-14 01:15:47 +00:00
Ben Simpson
0db424e21f Energy now does not regen when climbing,gliding,and swimming 2020-02-13 18:46:01 -06:00
Marcel
3f63a03399 Merge branch 'angelonfira/test-action-macosx-build' into 'master' 
Angelonfira/test action macosx build

See merge request veloren/veloren!796
 2020-02-14 00:19:06 +00:00
Forest Anderson
89d092d10c Angelonfira/test action macosx build 2020-02-14 00:19:06 +00:00
Acrimon
8d444627fe Merge branch '407-rolling-and-climbing-need-and-consume-energy' into 'master' 
Resolve "Rolling and climbing need and consume energy"

Closes #407

See merge request veloren/veloren!795
 2020-02-13 09:36:41 +00:00
Ben Simpson
e78117a86b Update common/src/sys/controller.rs, common/src/sys/movement.rs, common/src/comp/energy.rs files 2020-02-13 08:36:29 +00:00
Ben Simpson
7b23bca08c Update common/src/sys/movement.rs 2020-02-13 08:19:36 +00:00
Ben Simpson
ce2b1d870d Update common/src/sys/movement.rs 2020-02-13 08:13:36 +00:00
Ben Simpson
3e67a26a3b Update common/src/sys/controller.rs, common/src/sys/movement.rs files 
Deleted energy.rs, movement.rs files
 2020-02-13 07:59:54 +00:00
Ben Simpson
3be68e1a13 Update common/src/comp/energy.rs, energy.rs, common/src/sys/controller.rs, common/src/sys/movement.rs, movement.rs files 2020-02-13 07:30:32 +00:00
Marcel
3b58087110 Merge branch 'xMAC94x/update-toolchain' into 'master' 
update toolchain to `2020-02-06`

See merge request veloren/veloren!791
 2020-02-09 22:06:45 +00:00
Marcel Märtens
ceb0821996 update toolchain to 2020-02-09 22:58:01 +01:00
Marcel
01df51392a Merge branch 'reactivate-ci' into 'master' 
Reactivate Failure is allowed for benchmark and coverity

See merge request veloren/veloren!790
 2020-02-09 19:31:37 +00:00
Marcel Märtens
5ba185d718 Reactivate Failure is allowed for benchmark and coverity 2020-02-09 20:01:44 +01:00
Songtronix
bee93babd7 Merge branch 'songtronix/improve-version-mismatch' into 'master' 
more robust version detection

Closes #350

See merge request veloren/veloren!789
 2020-02-09 18:32:29 +00:00
Songtronix
f8bee27729 fix(version): more robust version detection 
Fixes #350
 2020-02-09 18:11:40 +01:00
Imbris
d4eb6e2a58 Merge branch 'imbris/fixes' into 'master' 
Fix a few things

See merge request veloren/veloren!785
 2020-02-06 22:41:14 +00:00
Imbris
7bf4b97cde Make nametag positioning slightly better 2020-02-06 17:10:52 -05:00
Imbris
c3253023d0 Fix highlighting non-collectibles 2020-02-06 17:06:49 -05:00
Imbris
b596f196f5 Fix possession 2020-02-06 17:06:49 -05:00
Joshua Yanovski
5281cdffc9 Merge branch 'sharp/zoom-minimap' into 'master' 
Minimap rotation, zoom, orientation indicator, Mainmap changes & indicator

See merge request veloren/veloren!784
 2020-02-06 17:34:32 +00:00
Monty Marz
7702df5d8d Hack to allow minimap rotation. 
Currently it just always rotates towards the camera, but it wouldn't be
hard to create a config option that swaps out the rotation of the
indicator and the map.
 2020-02-06 17:34:32 +00:00
Joshua Barretto
09cfd6aefa Merge branch 'zesterer/small-fixes' into 'master' 
Minor performance improvements

See merge request veloren/veloren!786
 2020-02-06 09:00:31 +00:00
Joshua Barretto
85723cfee2 Minor performance improvements 2020-02-04 22:58:56 +00:00
Songtronix
1a61d2f154 Merge branch 'disable_normalize_doc_attributes' into 'master' 
Workaround for rustfmt bug that affects waylands source generation in clean builds

Closes #461

See merge request veloren/veloren!783
 2020-02-03 19:04:31 +00:00
Marcel
de502817c7 Workaround for rustfmt bug that affects waylands source generation in clean builds 
fixing #461
 2020-02-03 18:34:52 +00:00
Songtronix
d77ac45de3 Merge branch 'shandley/temp-music-system' into 'master' 
Music system

See merge request veloren/veloren!626
 2020-02-03 11:55:32 +00:00
S Handley
d0b9439b44 Move music under audio 
Also add some blank time after each track so that we get some silence
between tracks.
 2020-02-03 11:55:32 +00:00
Marcel
c4d98c539f Merge branch 'veloren-cleanup' into 'master' 
change veloren code style

See merge request veloren/veloren!657
 2020-02-02 18:14:11 +00:00
Marcel Märtens
f89407448a apply new rustfmt - touching alot of files 2020-02-01 21:39:39 +01:00
Marcel Märtens
50b42b5ca9 Apply prefixes to veloren source, espacially comments, so that reformating wont make it unreadable, 
especially enumerations and other source code in errosions file
 2020-02-01 21:37:36 +01:00
Marcel Märtens
32b2853e69 change veloren code style 2020-02-01 21:37:31 +01:00
Marcel
ed78b8380c Merge branch 'songtronix/add-new-admin' into 'master' 
add new admin to default admin list

See merge request veloren/veloren!779
 2020-01-31 21:49:01 +00:00
Marcel
ab4e7fe3aa Merge branch 'xMAC94x/release-numbers' into 'master' 
Change the version number to 0.5

See merge request veloren/veloren!775
 2020-01-31 17:20:55 +00:00
Marcel Märtens
503be4aa6c Change the version number to 0.5 2020-01-31 17:26:45 +01:00
Joshua Yanovski
1b0e16cf74 Merge branch 'vechro/above-clouds-fix' into 'master' 
Fix clouds being invisible from above on certain machines

See merge request veloren/veloren!782
 2020-01-31 11:59:28 +00:00
Vechro
156cc6bbcc Get abs value of maxd and mind 2020-01-31 12:12:57 +02:00