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

4956 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joshua Barretto
1f4cec773b Added make_block command 2020-08-12 21:15:52 +01:00
Joshua Barretto
f21a50e393 Added forts to towns, began better economy sim 2020-08-12 21:15:52 +01:00
Joshua Barretto
ae8195fac9 Added simple keeps 2020-08-12 21:15:52 +01:00
Monty Marz
0a4b763a6a fix wrong filepath 2020-08-12 22:07:37 +02:00
Marcel
f3ea67510d Merge branch 'yusdacra/nix-dependency-updates' into 'master' 
nix: regenerate Cargo.nix and update niv dependencies

See merge request veloren/veloren!1245
 2020-08-12 19:04:30 +00:00
Marcel
9871637656 Merge branch 'DoNeo/ru_translation' into 'master' 
ru translations

See merge request veloren/veloren!1286
 2020-08-12 18:42:46 +00:00
Monty Marz
5e6dc04714 Merge branch 'pfau/small_fixes' into 'master' 
UI fixes, assets update

See merge request veloren/veloren!1280
 2020-08-12 18:10:18 +00:00
Monty Marz
fcdd875bff UI fixes, assets update 2020-08-12 18:10:18 +00:00
Marcel Märtens
86659244e0 ru translations 2020-08-12 19:59:02 +02:00
Marcel
5fb0f7f6c2 Merge branch 'scott-c/firework' into 'master' 
scott-c/firework

See merge request veloren/veloren!1281
 2020-08-12 16:51:29 +00:00
Monty Marz
6789b7ae27 Add firework hues 2020-08-12 22:29:06 +08:00
scott-c
9aab296264 Add firework item 2020-08-12 22:25:28 +08:00
Songtronix
eea64f78ff Merge branch 'songtronix/update-readme' into 'master' 
change: update readme

See merge request veloren/veloren!1276
 2020-08-12 07:11:40 +00:00
Imbris
e00ec1910c Merge branch 'songtronix/test-server' into 'master' 
change: allow `test-server` alias to run in workspace root

See merge request veloren/veloren!1275
 2020-08-11 07:22:20 +00:00
Yusuf Bera Ertan
725d9469fd
nix: regenerate Cargo.nix and update niv dependencies 2020-08-10 17:20:52 +03:00
Songtronix
8cb4983ac1 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
d38aab8000 fix particle de-synchronisation with paused game 2020-08-10 19:04:30 +08:00
Songtronix
d0937d337e change: update readme 2020-08-10 09:05:18 +02: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
Songtronix
6a9b089ad5 change: allow test-server alias to run in workspace root 2020-08-09 08:05:15 +02: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