Marcel
1c6460f0ef
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
b997f746e7
Angelonfira/test action macosx build
2020-02-14 00:19:06 +00:00
Acrimon
62602368d8
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
3343f8e5c0
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
bfd2f345b1
Update common/src/sys/movement.rs
2020-02-13 08:19:36 +00:00
Ben Simpson
0cd8150e98
Update common/src/sys/movement.rs
2020-02-13 08:13:36 +00:00
Ben Simpson
a49482503d
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
1aa98dbb62
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
Adam Whitehurst
d383abf950
Re add combat
2020-02-11 07:42:17 -08: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
timokoesters
0bc07a0835
Merge remote-tracking branch 'origin/master' into clientstates
2020-02-03 22:02:32 +01:00
timokoesters
aeb37a1f33
improvement: char speed
2020-02-03 20:43:36 +01: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
timokoesters
aa52c6fd4f
fix: jumping and attacking
2020-02-03 17:03:52 +01: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
