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,959 Commits 151 Branches 18 Tags 2.1 GiB
8c272ddec6
Commit Graph

3959 Commits

Author SHA1 Message Date
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
2020-05-10 18:39:29 +00:00
Dominik Broński
e2bba645bb Merge branch 'CapsizeGlimmer/welcome_message' into 'master' 
Update english welcome message

Closes 

See merge request
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
2020-05-09 15:41:25 +00:00
S Handley
7a6c392fc3 - 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
cecb1addc2 Merge branch 'get_items_num' into 'master' 
Add optional argument to /get_items

Closes 

See merge request
2020-05-07 18:39:49 +00:00
CapsizeGlimmer
a58e884e9c Add optional argument to /get_items 2020-05-07 18:39:48 +00:00
Monty Marz
ee25ae0b9c Merge branch 'CapsizeGlimmer/fix_lanterns' into 'master' 
Fix infinitys and NaNs in lights

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

Closes 

See merge request
2020-05-04 18:51:31 +00:00
CapsizeGlimmer
3c61fa3425 Enter the world by pressing "enter" at character selection 2020-05-04 19:08:51 +02:00
Monty Marz
3037a1e52f Merge branch 'pfau/fix-animals' into 'master' 
Fix animals not attacking

See merge request
2020-05-04 16:59:33 +00:00
Monty Marz
06867348fc Fix animals not attacking 2020-05-04 16:59:32 +00:00
Forest Anderson
bf9d6ec603 Merge branch 'songtronix/add-version-cmd' into 'master' 
add server version cmd

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

See merge request
2020-05-04 15:15:31 +00:00
CapsizeGlimmer
fe9deb29af Equipped lanterns now provide an illumination effect. 2020-05-04 15:15:31 +00:00
Acrimon
fedf38ae8e Merge branch 'admin-command-limit' into 'master' 
Fix  - Impose limits on admin commands

Closes 

See merge request
2020-05-04 11:34:25 +00:00
protheory8
c5765cbb3c Fix - Impose limits on admin commands 2020-05-04 14:50:58 +05:00
Justin Shipsey
205813f50c Merge branch 'SFX-Update' into 'master' 
Added new SFX and adjusted sfx.ron

See merge request
2020-05-04 06:16:12 +00:00
Julian
caa1af418d 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
Monty Marz
5f9635823c Merge branch 'cultists-hotfix' into 'master' 
Shoulder offsets, meta.ron versioning

See merge request
2020-05-01 21:27:12 +00:00
Monty Marz
20aee17e94 Shoulder offsets, meta.ron versioning 2020-05-01 21:27:12 +00:00
Monty Marz
bec2c26ade Merge branch 'pfau/assets' into 'master' 
Villagers and Cultists

See merge request
2020-04-30 20:43:24 +00:00
Monty Marz
65151bf175 Villagers and Cultists 2020-04-30 20:43:24 +00:00
Monty Marz
46b8f49231 Merge branch 'zesterer/world-changes' into 'master' 
Dungeon entrances

See merge request
2020-04-29 15:36:57 +00:00