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

3881 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Acrimon
47750e35b2
Fix #556 2020-05-13 01:08:33 +02:00
Justin Shipsey
faf2334902 Merge branch 'slipped/animtweaks' into 'master' 
Slipped/animtweaks

See merge request veloren/veloren!980
 2020-05-12 02:42:26 +00:00
jshipsey
71f737073e keep mobs from exploding whenever they're hit 2020-05-11 21:44:21 -04:00
jshipsey
16c382ebc3 cyclops 2020-05-11 21:44:21 -04:00
jshipsey
8505fc7b02 fix swim bug 2020-05-11 21:44:21 -04:00
Imbris
d605242fe7 Merge branch 'CapsizeGlimmer/tab_completion' into 'master' 
Tab completion code review suggestions

Closes #553

See merge request veloren/veloren!979
 2020-05-11 23:56:48 +00:00
CapsizeGlimmer
805c5d651e Tab completion code review suggestions 2020-05-11 18:02:21 -04:00
Forest Anderson
ae249a1c76 Merge branch 'treeco/yeet-old-dungeons' into 'master' 
Remove old-style dungeons

See merge request veloren/veloren!976
 2020-05-11 18:36:18 +00:00
Forest Anderson
3c6025fd46 Merge branch 'CapsizeGlimmer/tab_completion' into 'master' 
Capsize glimmer/tab completion

See merge request veloren/veloren!972
 2020-05-11 17:49:26 +00:00
Treeco
db7608e2cb Increased the spawn rate of towns and dungeons 2020-05-11 18:37:34 +01:00
Treeco
6107cd8630 Removed old-style dungeons 
I believe this means that trees are the only thing still using the
old-style structure spawning. Maybe it can be simplified a lot more?
 2020-05-11 18:37:16 +01:00
Songtronix
9bad736a54 Merge branch 'songtronix/fix-server-compose' into 'master' 
fix: outdated volume path for server-cli

See merge request veloren/veloren!975
 2020-05-11 11:50:36 +00:00
Songtronix
5581767a20 fix: outdated volume path 2020-05-11 11:07:37 +02:00
Imbris
3c71ad283a Merge branch 'imbris/small-fixes' into 'master' 
Fix leaning bug and dragging panic

Closes #534 and #547

See merge request veloren/veloren!974
 2020-05-11 05:25:32 +00:00
Imbris
3c37ae3ab1 fix leaning 2020-05-11 00:53:37 -04:00
Imbris
6134387247 Add orientation to debug text 2020-05-11 00:10:03 -04:00
Imbris
12c22bf287 Show component in error message when sync modification fails because it does not exist 2020-05-11 00:09:17 -04:00
Imbris
8bd19d62b1 Fix panic with dragging into the same loadout slot 2020-05-11 00:08:43 -04:00
CapsizeGlimmer
03986d2070 Rework tp command - "/sudo player /tp" is short for "/sudo player /tp sudoer" 2020-05-10 19:17:34 -04:00
CapsizeGlimmer
c2e7d3e00a Fixed player list tab completion 2020-05-10 19:17:17 -04:00
CapsizeGlimmer
acd9f1bb6e Implement tab completion of enums (/object /time /spawn) and numbers 2020-05-10 19:16:34 -04:00
CapsizeGlimmer
e00ca17f01 Finish tab completion implementation 2020-05-10 19:16:15 -04:00
CapsizeGlimmer
078aec757a Tab completion returns real results 2020-05-10 19:16:15 -04:00
CapsizeGlimmer
cdfcdffbf8 Initial client implementation of tab completion 2020-05-10 19:16:01 -04:00
Justin Shipsey
fc711a0eb2 Merge branch 'snowram/dragon-animation' into 'master' 
dragon

See merge request veloren/veloren!969
 2020-05-10 18:39:29 +00:00
Dominik Broński
e2bba645bb Merge branch 'CapsizeGlimmer/welcome_message' into 'master' 
Update english welcome message

Closes #551

See merge request veloren/veloren!971
 2020-05-10 11:32:02 +00:00
CapsizeGlimmer
f0908210be Update english welcome message 2020-05-09 22:54:15 -04:00
CapsizeGlimmer
b0f38591cd Move cursor to end when moving through chat history 2020-05-09 21:51:02 -04:00
CapsizeGlimmer
16a32d0003 Server server::cmd depends on common::cmd 2020-05-09 21:50:51 -04:00
CapsizeGlimmer
d2a77f25bb Groundwork for tab completion of player names and command arguments 2020-05-09 21:24:33 -04:00
jshipsey
a546c4827d delete unused jump file 2020-05-09 19:59:34 -04:00
Snowram
7f7973992e Updated changelog 2020-05-10 01:41:35 +02:00
Snowram
ad6865af69 Fix dragon jaw Z fighting 2020-05-10 01:40:53 +02:00
jshipsey
5a8a534ac9 rebase 2020-05-09 18:56:08 -04:00
jshipsey
7bf0d99a9a fmt 2020-05-09 18:11:25 -04:00
jshipsey
9d6a7981ac dragon and general animation cleanup 2020-05-09 18:10:24 -04:00
Snowram
a6d16e61e1 Add cockatrice 2020-05-09 18:09:27 -04:00
Snowram
7f94028653 Cleanup 2020-05-09 18:09:27 -04:00
jshipsey
6171a1c01c dragon adjustments. tweaks to humanoid run, fix for first person glide and other small fixes 2020-05-09 18:09:06 -04:00
Snowram
73ac1c5600 Better animations 2020-05-09 18:09:06 -04:00
jshipsey
e3cbdc82bc asset and manifest tweaks 2020-05-09 18:09:06 -04:00
jshipsey
76cdd81c06 skeletal tweaks 2020-05-09 18:09:06 -04:00
Snowram
35e1a8ae60 New dragon model, added jaw, splitted head into upper/lower 2020-05-09 18:09:05 -04:00
Snowram
f671a60fff Initial fly animation work 2020-05-09 18:08:35 -04:00
Snowram
6101085193 Initial run animation work 2020-05-09 18:08:35 -04:00
Snowram
2060fcb525 Initial idle animation work 2020-05-09 18:08:35 -04:00
Snowram
6c8bfe8d70 Symmetry of dragon skeleton 2020-05-09 18:08:35 -04:00
Robin Gilh
211f1276df Dragon work 2 2020-05-09 18:07:31 -04:00
Robin Gilh
739ff253ec Dragon work 2020-05-09 18:07:31 -04:00
Forest Anderson
738f476952 Merge branch 'shandley/persistence-characters' into 'master' 
Character Persistence

See merge request veloren/veloren!916
 2020-05-09 15:41:25 +00:00