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
4,739 Commits 151 Branches 18 Tags 2.1 GiB
725d9469fd
Commit Graph

4739 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yusuf Bera Ertan
725d9469fd
nix: regenerate Cargo.nix and update niv dependencies 2020-08-10 17:20:52 +03:00
scott-c
d38aab8000 fix particle de-synchronisation with paused game 2020-08-10 19:04:30 +08:00
Imbris
9d7cbd9888 Merge branch 'ibotdeu/resolution-setting' into 'master' 
Implemented setting to change fullscreen resolution

See merge request veloren/veloren!1233
 2020-08-09 20:30:22 +00:00
IBotDEU
6b707a1ab7 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
01ad81322d 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
893da3622a Merge branch 'scott-c/particles' into 'master' 
Particles

See merge request veloren/veloren!1156
 2020-08-09 17:09:43 +00:00
Justin Shipsey
66bc7a194b Merge branch 'slipped/swim' into 'master' 
swim

See merge request veloren/veloren!1272
 2020-08-09 16:25:11 +00:00
Justin Shipsey
f050aeb273 Merge branch 'master' into 'slipped/swim' 
# Conflicts:
#   voxygen/src/anim/src/character/swim.rs
 2020-08-09 15:13:56 +00:00
Justin Shipsey
890dcc902e Merge branch 'nepo/new-bones' into 'master' 
nepo/new bones

See merge request veloren/veloren!1274
 2020-08-08 22:37:50 +00:00
nepo
bc1fabc41b nepo/new bones 2020-08-08 22:37:50 +00:00
jshipsey
45971fa403 state corrections 2020-08-08 17:05:48 -04:00
jshipsey
37c733a067 clippy, consdensed climb, corrected some swim bugs 2020-08-08 17:04:50 -04:00
jshipsey
d7b3e84153 swim alterations to condense the body on strong turns 2020-08-08 13:47:32 -04:00
jshipsey
be3ed4b238 minor anim tweak 2020-08-08 13:47:32 -04:00
jshipsey
854361cdaa changelog 2020-08-08 13:47:32 -04:00
jshipsey
316546af22 bandaid fix for swim wield 2020-08-08 13:47:32 -04:00
jshipsey
9ff5c23cf0 readd sneak 2020-08-08 13:47:32 -04:00
jshipsey
691607f398 swimming changes 2020-08-08 13:47:32 -04:00
scott-c
cae84dd4c9 fix rebase 2020-08-08 20:53:07 +08:00
scott-c
70ff8c3faa Add Copy trait to dependents 2020-08-08 19:26:52 +08:00
scott-c
0ace0acdcd update comment 2020-08-08 19:26:52 +08:00
scott-c
dd1e89a691 Implement particle heartbeat scheduler 2020-08-08 19:26:52 +08:00
scott-c
a0107d5cda fix rebase 2020-08-08 19:26:52 +08:00
scott-c
bf025df204 refactor sfx mgr outcome useage 2020-08-08 19:26:52 +08:00
scott-c
cc36e9c300 fix rebase 2020-08-08 19:26:52 +08:00
scott-c
bb8ba75287 cleanup redundant function 2020-08-08 19:26:52 +08:00
scott-c
ba301696f4 change campfire cmd to spawn object instead of npc 2020-08-08 19:26:52 +08:00
scott-c
267d5a141a cleanup unneeded matrix and shader code 2020-08-08 19:26:52 +08:00
scott-c
023d465370 clear particle gpu instance buffer when disabled 2020-08-08 19:26:52 +08:00
Joshua Barretto
a924f9694d Explosion sound and event lights 2020-08-08 19:26:52 +08:00
Joshua Barretto
8547cdd681 Added outcome sound effects, fixed directional sound, particle outcomes 2020-08-08 19:26:52 +08:00
Joshua Barretto
7c31baef6f Added outcome system, sound effects 2020-08-08 19:26:48 +08:00
Joshua Barretto
3f7667352d Better hash RNG 2020-08-08 19:25:33 +08:00
scott-c
1a263834e7 Add campfire command 2020-08-08 19:25:33 +08:00
scott-c
82a0ecad6b Add zest's changes 2020-08-08 19:25:33 +08:00
scott-c
5ba4d26821 Update changelog 2020-08-08 19:25:29 +08:00
scott-c
5acfe44cbb Add toggle particles graphics setting 2020-08-08 19:25:01 +08:00
scott-c
f9f9e9e190 Add particle count to debug info 2020-08-08 19:25:00 +08:00
scott-c
bb2a5c885b Add fireball and bomb particle effects 2020-08-08 19:25:00 +08:00
scott-c
4bc373a832 remove particle emitter component 2020-08-08 19:25:00 +08:00
scott-c
3139e85dff allow for col particles 2020-08-08 19:25:00 +08:00
scott-c
803677f0fb Add particle velocity and ability particle emitter 2020-08-08 19:25:00 +08:00
scott-c
da5f4828a5 Add particle lifespan 2020-08-08 19:25:00 +08:00
scott-c
39b676cd8f Add ParticleMgr 2020-08-08 19:24:55 +08:00
scott-c
7e35617f59 Add particle pipeline 2020-08-08 19:24:25 +08:00
scott-c
42a10a6059 Add ParticleEmitter Component 2020-08-08 19:24:22 +08:00
Monty Marz
7aebff26e0 Merge branch 'imbris/figraycast' into 'master' 
Add detection of entities under the cursor in Voxygen and Group functions

Closes #511 and #534

See merge request veloren/veloren!942
 2020-08-08 10:59:08 +00:00
Monty Marz
142b386628 address comments 2020-08-08 00:13:00 -04:00
Monty Marz
74ace74d5a Change to social window selection visuals 2020-08-08 01:16:35 +02:00
Imbris
2608217e83 Make clippy happy, fmt even though it is set to fmt on save in my 
editor...."
 2020-08-08 01:16:35 +02:00