2049 Commits

Author SHA1 Message Date
Snowram
c9a149ade7 Add 1st and 2nd item of inventory in hotbar 2020-08-20 18:16:07 +02:00
Marcel Märtens
bd84fb8d90 fix clippy warnings in new version 2020-08-17 11:10:18 +02:00
Marcel
788d8753eb Merge branch 'xMAC94x/release_numbers' into 'master'
Change the version number to 0.7

See merge request veloren/veloren!1296
2020-08-15 10:27:31 +00:00
Marcel Märtens
f082e1225d Change the version number to 0.7 2020-08-15 11:53:59 +02:00
Justin Shipsey
bdc05accbe fixed jump anim bug and non-attack bug for bipedlarge 2020-08-14 10:50:08 +00:00
Marcel Märtens
120702ca16 fix #690 2020-08-13 10:41:34 +02:00
Joshua Barretto
7ca61abcec Merge branch 'zesterer/worldsim' into 'master'
World simulation, generation, and pathfinding improvements (including castles and caves)

See merge request veloren/veloren!1282
2020-08-12 21:40:56 +00:00
Joshua Barretto
3f2e6a3133 Fixed floating sprites in towns, clippy fixes 2020-08-12 21:16:14 +01:00
Joshua Barretto
a8b0a678d8 Fmt and clippy lints fixes 2020-08-12 21:16:14 +01:00
Joshua Barretto
90f97a7cb8 Updated changelog, cleaned up warnings, minor fixes 2020-08-12 21:16:11 +01:00
Joshua Barretto
fb6170e624 Added decals to towns 2020-08-12 21:15:53 +01:00
Joshua Barretto
621ea6695b Better surface swimming, no underwater sprites 2020-08-12 21:15:53 +01:00
Monty Marz
1450d79672 added grass sprites 2020-08-12 21:15:53 +01:00
Joshua Barretto
3b3e31f07c Added terrain scatter densities 2020-08-12 21:15:53 +01:00
Pfauenauge
77daeee721 drop gate parts 2020-08-12 21:15:53 +01:00
Joshua Barretto
8aae3eafc8 Better castles, initial light prop for lit objects 2020-08-12 21:15:52 +01:00
WelshPixie
75ca522179 fixed sprite rotations 2020-08-12 21:15:52 +01:00
Monty Marz
3e8fe47b8d UI fixes, assets update 2020-08-12 18:10:18 +00:00
Monty Marz
2d793d7e65 Add firework hues 2020-08-12 22:29:06 +08:00
scott-c
e5bf0230e9 Add firework item 2020-08-12 22:25:28 +08:00
scott-c
4796230b3f fix particle de-synchronisation with paused game 2020-08-10 19:04:30 +08:00
IBotDEU
e030a2fa08 implemented ability to select bit depth and refresh rate and implemented seperate setting for fullscreen resolution 2020-08-09 20:30:22 +00:00
Imbris
87e210514f Merge branch 'yusdacra/treeculler-update' into 'master'
change treeculler crate from git to published version

See merge request veloren/veloren!1269
2020-08-09 17:21:15 +00:00
Imbris
ee418c19f0 Merge branch 'scott-c/particles' into 'master'
Particles

See merge request veloren/veloren!1156
2020-08-09 17:09:43 +00:00
Justin Shipsey
88a5f2eb41 Merge branch 'master' into 'slipped/swim'
# Conflicts:
#   voxygen/src/anim/src/character/swim.rs
2020-08-09 15:13:56 +00:00
nepo
d5e06a30b4 nepo/new bones 2020-08-08 22:37:50 +00:00
jshipsey
c9138602a5 clippy, consdensed climb, corrected some swim bugs 2020-08-08 17:04:50 -04:00
jshipsey
c9f7a48cd6 swim alterations to condense the body on strong turns 2020-08-08 13:47:32 -04:00
jshipsey
72d56742c6 minor anim tweak 2020-08-08 13:47:32 -04:00
jshipsey
dc08f5655f changelog 2020-08-08 13:47:32 -04:00
jshipsey
e4444b36e3 bandaid fix for swim wield 2020-08-08 13:47:32 -04:00
jshipsey
45c8eb98a0 readd sneak 2020-08-08 13:47:32 -04:00
jshipsey
f1426b7bac swimming changes 2020-08-08 13:47:32 -04:00
scott-c
d3270e8274 fix rebase 2020-08-08 20:53:07 +08:00
scott-c
197285e9da Add Copy trait to dependents 2020-08-08 19:26:52 +08:00
scott-c
51fef95cbf update comment 2020-08-08 19:26:52 +08:00
scott-c
2bdec4d66c Implement particle heartbeat scheduler 2020-08-08 19:26:52 +08:00
scott-c
b5982999b5 fix rebase 2020-08-08 19:26:52 +08:00
scott-c
67fa8e0b17 refactor sfx mgr outcome useage 2020-08-08 19:26:52 +08:00
scott-c
22ee89344a cleanup redundant function 2020-08-08 19:26:52 +08:00
scott-c
aec3bb0687 clear particle gpu instance buffer when disabled 2020-08-08 19:26:52 +08:00
Joshua Barretto
27324bc232 Explosion sound and event lights 2020-08-08 19:26:52 +08:00
Joshua Barretto
6e5b44addd Added outcome sound effects, fixed directional sound, particle outcomes 2020-08-08 19:26:52 +08:00
Joshua Barretto
575319f3aa Added outcome system, sound effects 2020-08-08 19:26:48 +08:00
scott-c
0f59d978d6 Update changelog 2020-08-08 19:25:29 +08:00
scott-c
b4e5dab7c5 Add toggle particles graphics setting 2020-08-08 19:25:01 +08:00
scott-c
4d1c12a503 Add particle count to debug info 2020-08-08 19:25:00 +08:00
scott-c
29a78ceaa3 Add fireball and bomb particle effects 2020-08-08 19:25:00 +08:00
scott-c
4c765eac9b remove particle emitter component 2020-08-08 19:25:00 +08:00
scott-c
c1d1ef0549 allow for col particles 2020-08-08 19:25:00 +08:00