Commit Graph

3972 Commits

Author SHA1 Message Date
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
S Handley
5a13b54cbf - Load characters after login.
- Make the character screen load with an empty character list from the server, send event to the server for character creation with data, but not yet saving them to the DB.
- Working but messy character saving to DB
- Add the character_data to the client, rather than keep it in the GLobalState.
2020-05-09 15:41:25 +00:00
Songtronix
6cebf52a1c Merge branch 'get_items_num' into 'master'
Add optional argument to /get_items

Closes #535

See merge request veloren/veloren!921
2020-05-07 18:39:49 +00:00
CapsizeGlimmer
63826d1a50 Add optional argument to /get_items 2020-05-07 18:39:48 +00:00
Monty Marz
846c3a9a0b Merge branch 'CapsizeGlimmer/fix_lanterns' into 'master'
Fix infinitys and NaNs in lights

See merge request veloren/veloren!966
2020-05-04 22:14:33 +00:00
CapsizeGlimmer
28c454f9ca Fix infinitys and NaNs in lights 2020-05-04 17:17:54 -04:00
Monty Marz
e5a87f4338 Merge branch 'CapsizeGlimmer/enter_world_with_enter' into 'master'
Enter the world by pressing "enter" at character selection

Closes #530

See merge request veloren/veloren!922
2020-05-04 18:51:31 +00:00
CapsizeGlimmer
701f38ab69 Enter the world by pressing "enter" at character selection 2020-05-04 19:08:51 +02:00
Monty Marz
522e3493c5 Merge branch 'pfau/fix-animals' into 'master'
Fix animals not attacking

See merge request veloren/veloren!960
2020-05-04 16:59:33 +00:00
Monty Marz
b589c3fc71 Fix animals not attacking 2020-05-04 16:59:32 +00:00
Forest Anderson
9378902d81 Merge branch 'songtronix/add-version-cmd' into 'master'
add server version cmd

See merge request veloren/veloren!964
2020-05-04 16:47:07 +00:00
Songtronix
1d88ec6295 server(cmd): add server version cmd 2020-05-04 17:59:53 +02:00
Monty Marz
89980284aa Merge branch 'CapsizeGlimmer/functional_lanterns' into 'master'
Equipped lanterns now provide an illumination effect.

See merge request veloren/veloren!935
2020-05-04 15:15:31 +00:00
CapsizeGlimmer
4e7f8c686a Equipped lanterns now provide an illumination effect. 2020-05-04 15:15:31 +00:00
Acrimon
a22a71fd32 Merge branch 'admin-command-limit' into 'master'
Fix #542 - Impose limits on admin commands

Closes #542

See merge request veloren/veloren!963
2020-05-04 11:34:25 +00:00
protheory8
31c0457913 Fix #542 - Impose limits on admin commands 2020-05-04 14:50:58 +05:00
Justin Shipsey
c3c907f36d Merge branch 'SFX-Update' into 'master'
Added new SFX and adjusted sfx.ron

See merge request veloren/veloren!961
2020-05-04 06:16:12 +00:00
Julian
cf9820e204 Added new SFX and adjusted sfx.ron
New SFX sounds.

add_item.wav (Better fitting pickup sound)
drop_item.wav (New sound for dropping items)
open_inventory.wav (The old pickup sound, can be used for opening the bag but needs to be implemented)
sword_in.wav (Better fitting sound)
sowrd_out.wav (Better fitting sound)

Fixed the drop sfx sound in sfx.ron
Its the drop_item sound instead of a grass moving step.
2020-05-03 21:52:11 +02:00
Joshua Yanovski
22ddbad3eb Minor shader fixes. 2020-05-02 18:54:09 +02:00
Joshua Yanovski
746a10e8d0 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes 2020-05-02 04:02:09 +02:00
Monty Marz
40ab94673e Merge branch 'cultists-hotfix' into 'master'
Shoulder offsets, meta.ron versioning

See merge request veloren/veloren!959
2020-05-01 21:27:12 +00:00
Monty Marz
f5c2341167 Shoulder offsets, meta.ron versioning 2020-05-01 21:27:12 +00:00
Joshua Yanovski
0f4a0e763d Switch back to pop-in terrain. 2020-05-01 23:03:24 +02:00