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,022 Commits 151 Branches 18 Tags 2.1 GiB
b739623579
Commit Graph

3022 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
S Handley
b739623579 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
Marcel
56c4b50a27 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
8f5e409ac4 update toolchain to 2020-02-09 22:58:01 +01:00
Marcel
9f0307b926 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
90bcd87007 Reactivate Failure is allowed for benchmark and coverity 2020-02-09 20:01:44 +01:00
Songtronix
d53d7f4649 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
b8e12811bf fix(version): more robust version detection 
Fixes #350
 2020-02-09 18:11:40 +01:00
Imbris
a62eb1b17b 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
fb7edd2404 Make nametag positioning slightly better 2020-02-06 17:10:52 -05:00
Imbris
f8283116a8 Fix highlighting non-collectibles 2020-02-06 17:06:49 -05:00
Imbris
177f331259 Fix possession 2020-02-06 17:06:49 -05:00
Joshua Yanovski
e524e86090 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
93d7c67cdc 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
1c8b864ed6 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
e520712077 Minor performance improvements 2020-02-04 22:58:56 +00:00
Songtronix
ed620fd70d 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
f06f0da69d Workaround for rustfmt bug that affects waylands source generation in clean builds 
fixing #461
 2020-02-03 18:34:52 +00:00
Songtronix
6e1a85a15a 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
b7ce91fead 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
5b46587c2d 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
dae31ae5b6 apply new rustfmt - touching alot of files 2020-02-01 21:39:39 +01:00
Marcel Märtens
dd21235ff8 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
3671c8867a change veloren code style 2020-02-01 21:37:31 +01:00
Marcel
7940ced71e 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
f97bf5b3ec 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
e960c2233b Change the version number to 0.5 2020-01-31 17:26:45 +01:00
Joshua Yanovski
4f62efe2ff 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
377433c2fc Get abs value of maxd and mind 2020-01-31 12:12:57 +02:00
Songtronix
145be79585 add new admin to default admin list 2020-01-30 19:01:24 +01:00
Joshua Barretto
52eb4d5946 Merge branch 'zesterer/small-fixes' into 'master' 
Prevent tamed entities constantly trying to 'return home'

See merge request veloren/veloren!776
 2020-01-29 17:00:01 +00:00
Joshua Barretto
a76740182d Prevent tamed entities constantly trying to 'return home' 2020-01-29 16:37:46 +00:00
Joshua Barretto
c18e0ade23 Merge branch 'zesterer/not-a-feature' into 'master' 
Collars

See merge request veloren/veloren!772
 2020-01-29 12:01:28 +00:00
Joshua Barretto
faa86226c7 Collars 2020-01-29 12:01:28 +00:00
Justin Shipsey
4f90a0dde0 Merge branch 'slipped/animtweaks' into 'master' 
minor anim tweaks

See merge request veloren/veloren!774
 2020-01-29 06:38:08 +00:00
Justin Shipsey
908e099aa5 minor anim tweaks 2020-01-29 06:38:08 +00:00
Joshua Yanovski
76060f5360 Merge branch 'sharp/fix-npc-names' into 'master' 
Per-species NPC names!

See merge request veloren/veloren!773
 2020-01-29 04:47:09 +00:00
Joshua Yanovski
3fa21b3dc7 Per-speces NPC names! 
Is also able to refactor some of the uglier code and introduces a
framework that (suitably extended) could be useful in removing
boilerplate elsewhere.
 2020-01-29 04:41:32 +01:00
Joshua Barretto
2d9e60e566 Merge branch 'zesterer/no-assets' into 'master' 
Fixed logic derp

See merge request veloren/veloren!771
 2020-01-28 01:13:23 +00:00
Joshua Barretto
116bc0d0b2 Fixed logic derp 2020-01-28 01:12:17 +00:00
Joshua Barretto
1bf06530cf Merge branch 'zesterer/no-assets' into 'master' 
Zesterer/no assets

See merge request veloren/veloren!770
 2020-01-28 01:04:00 +00:00
Joshua Barretto
d87fc37aa2 Fixed watch compilation issue 2020-01-27 23:59:59 +00:00
Joshua Barretto
e391d6e4fd Added no-assets feature to common 2020-01-27 22:41:30 +00:00
Joshua Yanovski
56a553c968 Merge branch 'optimize_and_fix_i18n' into 'master' 
Optimize and fix i18n

Closes #436

See merge request veloren/veloren!743
 2020-01-27 22:10:26 +00:00
Rémy PHELIPOT
ce54f27531 Add missing translations 2020-01-27 20:34:36 +01:00
Joshua Barretto
3bd3422f8a Merge branch 'zesterer/small-fixes' into 'master' 
NPC AI bug fixes, improvements

See merge request veloren/veloren!767
 2020-01-27 19:05:07 +00:00
Rémy PHELIPOT
69cc30343a Fix disclaimer text 2020-01-27 19:59:17 +01:00
Rémy PHELIPOT
c7271d43f1 Improve French translation 2020-01-27 19:59:17 +01:00
Rémy PHELIPOT
c501b2d0bf Use English instead of saved language if loading fails 2020-01-27 19:59:17 +01:00
Rémy PHELIPOT
8946ed8d82 Add missing translations in voxygen 
Fix #436
 2020-01-27 19:59:17 +01:00
Rémy PHELIPOT
f60a68d96d Improve i18n "get" performances by returning a &str 2020-01-27 19:59:17 +01:00