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,811 Commits 151 Branches 18 Tags
Commit Graph

4811 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Joshua Barretto
854b1a46bf Fixed client API 2020-08-12 21:15:52 +01:00
Joshua Barretto
f4040b59d7 Castle improvements 2020-08-12 21:15:52 +01:00
Joshua Barretto
73b6d6b954 Began adding castles 2020-08-12 21:15:52 +01:00
Joshua Barretto
3ab6c5ff49 Added make_block command 2020-08-12 21:15:52 +01:00
Joshua Barretto
9e5978b34b Added forts to towns, began better economy sim 2020-08-12 21:15:52 +01:00
Joshua Barretto
ecff9d6f46 Added simple keeps 2020-08-12 21:15:52 +01:00
Monty Marz
0441ad5e7e fix wrong filepath 2020-08-12 22:07:37 +02:00
Marcel
3257cf0f3a 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
50ab217cbb 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
0dc3d06482 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
3e8fe47b8d UI fixes, assets update 2020-08-12 18:10:18 +00:00
Marcel Märtens
a5f0c36ebb ru translations 2020-08-12 19:59:02 +02:00
Marcel
0ab45b2f85 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
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
Songtronix
d936828c34 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
a78629aec1 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
2475782310
nix: regenerate Cargo.nix and update niv dependencies 2020-08-10 17:20:52 +03:00
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
Songtronix
ba3fdaf31d change: update readme 2020-08-10 09:05:18 +02: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
Songtronix
8905769822 change: allow test-server alias to run in workspace root 2020-08-09 08:05:15 +02: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