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 2.1 GiB
e5853dbdd4
Commit Graph

3881 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shane Handley
e5853dbdd4 Initial models, migration and client code for stats persistence. 2020-05-13 09:14:08 +10:00
Justin Shipsey
19a0ffb673 Merge branch 'slipped/animtweaks' into 'master' 
Slipped/animtweaks

See merge request veloren/veloren!980
 2020-05-12 02:42:26 +00:00
jshipsey
ceb771bb2c keep mobs from exploding whenever they're hit 2020-05-11 21:44:21 -04:00
jshipsey
ef70949d5d cyclops 2020-05-11 21:44:21 -04:00
jshipsey
137c700b80 fix swim bug 2020-05-11 21:44:21 -04:00
Imbris
7233dbee3e 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
49d1225823 Tab completion code review suggestions 2020-05-11 18:02:21 -04:00
Forest Anderson
2abc78e35c 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
28402e2bc1 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
6281ab865a Increased the spawn rate of towns and dungeons 2020-05-11 18:37:34 +01:00
Treeco
2797af0c87 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
0ee0949b8b 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
67df50708d fix: outdated volume path 2020-05-11 11:07:37 +02:00
Imbris
2b4de3730d 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
81227b917f fix leaning 2020-05-11 00:53:37 -04:00
Imbris
3450bfabfd Add orientation to debug text 2020-05-11 00:10:03 -04:00
Imbris
48a5001392 Show component in error message when sync modification fails because it does not exist 2020-05-11 00:09:17 -04:00
Imbris
8aa88b22a5 Fix panic with dragging into the same loadout slot 2020-05-11 00:08:43 -04:00
CapsizeGlimmer
3f76d1d702 Rework tp command - "/sudo player /tp" is short for "/sudo player /tp sudoer" 2020-05-10 19:17:34 -04:00
CapsizeGlimmer
9d118b55a0 Fixed player list tab completion 2020-05-10 19:17:17 -04:00
CapsizeGlimmer
b486de28ac Implement tab completion of enums (/object /time /spawn) and numbers 2020-05-10 19:16:34 -04:00
CapsizeGlimmer
28e94afd3f Finish tab completion implementation 2020-05-10 19:16:15 -04:00
CapsizeGlimmer
b0f0d716be Tab completion returns real results 2020-05-10 19:16:15 -04:00
CapsizeGlimmer
24fa23fef4 Initial client implementation of tab completion 2020-05-10 19:16:01 -04:00
Justin Shipsey
78f3f2cc32 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
a8b15209a4 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
8d3463e2f1 Update english welcome message 2020-05-09 22:54:15 -04:00
CapsizeGlimmer
58b0e9ef75 Move cursor to end when moving through chat history 2020-05-09 21:51:02 -04:00
CapsizeGlimmer
7ecea34f85 Server server::cmd depends on common::cmd 2020-05-09 21:50:51 -04:00
CapsizeGlimmer
307e478671 Groundwork for tab completion of player names and command arguments 2020-05-09 21:24:33 -04:00
jshipsey
5b48fe5661 delete unused jump file 2020-05-09 19:59:34 -04:00
Snowram
b8ed55113b Updated changelog 2020-05-10 01:41:35 +02:00
Snowram
4ba222abcd Fix dragon jaw Z fighting 2020-05-10 01:40:53 +02:00
jshipsey
41ff0bde69 rebase 2020-05-09 18:56:08 -04:00
jshipsey
cf392b5a66 fmt 2020-05-09 18:11:25 -04:00
jshipsey
62bd79dba7 dragon and general animation cleanup 2020-05-09 18:10:24 -04:00
Snowram
5b77c74497 Add cockatrice 2020-05-09 18:09:27 -04:00
Snowram
0248c6a44e Cleanup 2020-05-09 18:09:27 -04:00
jshipsey
a6de8159f6 dragon adjustments. tweaks to humanoid run, fix for first person glide and other small fixes 2020-05-09 18:09:06 -04:00
Snowram
9d2277ecd4 Better animations 2020-05-09 18:09:06 -04:00
jshipsey
e5a7086502 asset and manifest tweaks 2020-05-09 18:09:06 -04:00
jshipsey
5b518b137c skeletal tweaks 2020-05-09 18:09:06 -04:00
Snowram
cd452cc715 New dragon model, added jaw, splitted head into upper/lower 2020-05-09 18:09:05 -04:00
Snowram
875838ecdf Initial fly animation work 2020-05-09 18:08:35 -04:00
Snowram
9027967fb7 Initial run animation work 2020-05-09 18:08:35 -04:00
Snowram
7f0d1e9543 Initial idle animation work 2020-05-09 18:08:35 -04:00
Snowram
33f8a47cfa Symmetry of dragon skeleton 2020-05-09 18:08:35 -04:00
Robin Gilh
edcde84505 Dragon work 2 2020-05-09 18:07:31 -04:00
Robin Gilh
40360ff149 Dragon work 2020-05-09 18:07:31 -04:00
Forest Anderson
59c97731ad Merge branch 'shandley/persistence-characters' into 'master' 
Character Persistence

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