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
Commit Graph

4739 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Songtronix
30e3ef0fa9 Merge branch 'scott-c/particles-pause-fix' into 'master' 
fix particle de-synchronisation with paused game

See merge request veloren/veloren!1278
 2020-08-10 12:29:16 +00:00
scott-c
4796230b3f fix particle de-synchronisation with paused game 2020-08-10 19:04:30 +08:00
Imbris
40297d0b47 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
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
f05b6e4e30 Merge branch 'slipped/swim' into 'master' 
swim

See merge request veloren/veloren!1272
 2020-08-09 16:25:11 +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
Justin Shipsey
efe0a58b68 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
d5e06a30b4 nepo/new bones 2020-08-08 22:37:50 +00:00
jshipsey
68b5bf1ca2 state corrections 2020-08-08 17:05:48 -04: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
055cbad5b8 fix rebase 2020-08-08 19:26:52 +08:00
scott-c
22ee89344a cleanup redundant function 2020-08-08 19:26:52 +08:00
scott-c
ed4cab9019 change campfire cmd to spawn object instead of npc 2020-08-08 19:26:52 +08:00
scott-c
ce49b9c599 cleanup unneeded matrix and shader code 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
Joshua Barretto
7725e11aee Better hash RNG 2020-08-08 19:25:33 +08:00
scott-c
3b9ef1cba8 Add campfire command 2020-08-08 19:25:33 +08:00
scott-c
e7c1781819 Add zest's changes 2020-08-08 19:25:33 +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
scott-c
8d742a77cc Add particle velocity and ability particle emitter 2020-08-08 19:25:00 +08:00
scott-c
6e9584e061 Add particle lifespan 2020-08-08 19:25:00 +08:00
scott-c
26a0bbb7f9 Add ParticleMgr 2020-08-08 19:24:55 +08:00
scott-c
ff25a88d6e Add particle pipeline 2020-08-08 19:24:25 +08:00
scott-c
295b41abf0 Add ParticleEmitter Component 2020-08-08 19:24:22 +08:00
Monty Marz
33807ccf90 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
fb0984efa1 address comments 2020-08-08 00:13:00 -04:00
Monty Marz
4a1ee6edd3 Change to social window selection visuals 2020-08-08 01:16:35 +02:00
Imbris
10ad130712 Make clippy happy, fmt even though it is set to fmt on save in my 
editor...."
 2020-08-08 01:16:35 +02:00