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

3839 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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 #535

See merge request veloren/veloren!921
 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 veloren/veloren!966
 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 #530

See merge request veloren/veloren!922
 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 veloren/veloren!960
 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 veloren/veloren!964
 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 veloren/veloren!935
 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 #542 - Impose limits on admin commands

Closes #542

See merge request veloren/veloren!963
 2020-05-04 11:34:25 +00:00
protheory8
c5765cbb3c Fix #542 - 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 veloren/veloren!961
 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 veloren/veloren!959
 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 veloren/veloren!957
 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 veloren/veloren!955
 2020-04-29 15:36:57 +00:00
Pfauenauge90
6bdd8471a9 cleanup, more dungeon entrances 2020-04-29 17:01:35 +02:00
Joshua Barretto
3a07c69817 Updated changelog 2020-04-29 17:01:35 +02:00
Joshua Barretto
67bd4ba4c0 Better dungeon waypoint placement 2020-04-29 17:01:35 +02:00
Joshua Barretto
5219949e51 Fixed dungeon offsets 2020-04-29 17:01:34 +02:00
Joshua Barretto
70d798bafd Added dungeon entrances 2020-04-29 17:01:34 +02:00
Joshua Barretto
d7a26284b1 Merge branch 'non-integer-offsets' into 'master' 
Non integer offsets

See merge request veloren/veloren!956
 2020-04-29 14:45:21 +00:00
Joshua Barretto
fde7e6fedc Added 1 extra bit per figure vertex position component, resolved char screen bug 2020-04-29 15:22:08 +01:00
Marcel Märtens
1c5c0adf15 Allow for 0.5 offsets in figures 2020-04-29 14:10:46 +02:00
Justin Shipsey
da67b53acb Merge branch 'snowram/animals' into 'master' 
new animals

See merge request veloren/veloren!954
 2020-04-28 03:13:23 +00:00
Justin Shipsey
61c0c2991d new animals 2020-04-28 03:13:23 +00:00
Justin Shipsey
2ee86ff2c6 Merge branch 'slipped/attributes' into 'master' 
skel attribute transfer

See merge request veloren/veloren!949
 2020-04-27 05:11:34 +00:00
Justin Shipsey
cc989de3f5 skel attribute transfer 2020-04-27 05:11:34 +00:00
Joshua Barretto
f6b60fcf63 Merge branch 'zesterer/phys-fixes' into 'master' 
Added Colliders, made projectiles point particles

See merge request veloren/veloren!947
 2020-04-26 18:24:33 +00:00
Joshua Barretto
5bfeabd03a Fixed unit tests 2020-04-26 18:50:21 +01:00
Joshua Barretto
f722a67911 fmt 2020-04-26 17:56:09 +01:00
Joshua Barretto
da11d54b6c Fixed projectile solid collisions 2020-04-26 17:56:09 +01:00
Joshua Barretto
3370d0a08f Stopped velocity when point particles hit walls 2020-04-26 17:56:09 +01:00
Joshua Barretto
0763e6250f Fixed logic issue with sticky objects 2020-04-26 17:56:09 +01:00
Joshua Barretto
f4de3d0806 Added on_ceiling check for sticky entities 2020-04-26 17:56:09 +01:00
Joshua Barretto
f027114507 Added Colliders, made projectiles point particles 2020-04-26 17:56:09 +01:00