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
4,564 Commits 151 Branches 18 Tags 2.1 GiB
add2cfae04
Commit Graph

4564 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcel
de1f970088 Merge branch 'xMAC94x/tarpaulin-flanky' into 'master' 
increase network sleep in order to fix flanky tests

See merge request veloren/veloren!1133
 2020-06-29 12:32:52 +00:00
Marcel Märtens
11e7b1f922 increase network sleep in order to fix flanky tests 2020-06-29 14:32:20 +02:00
Marcel
8f93038027 Merge branch 'xMAC94x/docker-compose-fix' into 'master' 
fix server-cli tracing accepting RUST_LOG env var and pass RUST_LOG via...

See merge request veloren/veloren!1132
 2020-06-29 12:29:07 +00:00
Marcel Märtens
c558c9de7c fix server-cli tracing accepting RUST_LOG env var and pass RUST_LOG via docker-compose rather than hardcoding it 
- however RUST_BACKTRACE=1 is still hardcoded as its probably useful
- dont spam the server-cli with debug
 2020-06-29 11:05:55 +02:00
Marcel
0a8c896572 Merge branch 'xvar/failed-to-collect-item-fix' into 'master' 
Fixed inventory full message when pressing the pickup item key in quick succession (#651)

See merge request veloren/veloren!1131
 2020-06-29 07:58:45 +00:00
Ben Wallis
48a23e5f4c Fixed inventory full message when pressing the pickup item key in quick succession (#651) 2020-06-29 07:48:44 +01:00
Marcel
807df57f64 Merge branch 'theduke/fix-milestones-readme-link' into 'master' 
Fix Milestones link in README

See merge request veloren/veloren!1127
 2020-06-29 06:09:39 +00:00
theduke
2dafadcfb7 Fix Milestones link in README 2020-06-29 00:41:30 -04:00
Forest Anderson
be6d139e26 Merge branch 'Swedneck/add-veloren-swedish-translation' into 'master' 
Add swedish translation

See merge request veloren/veloren!824
 2020-06-29 01:55:18 +00:00
Forest Anderson
27f7c59e6d Merge branch 'polish' into 'master' 
Polish

See merge request veloren/veloren!1001
 2020-06-29 01:35:42 +00:00
Justin Shipsey
49a18ac659 Merge branch 'sam/gliderfix' into 'master' 
Fixed glider animation so glider does not block view in first person.

See merge request veloren/veloren!1130
 2020-06-29 01:35:40 +00:00
Forest Anderson
c50a2c8ac2 Fixed Veloren spelling 2020-06-28 20:41:22 -04:00
Patro
4bfe195336 final tweaks in translation 2020-06-28 20:41:22 -04:00
Patro
b37ed5f3a4 Fixed some spelling errors and retranslated some sentences to make them sound better 2020-06-28 20:41:22 -04:00
Redo11
54babe6615 Change uncanny valley to wildness as merged in 
6c4e3eb00a (be21cb369b4dfb9d7a565ddff0161533680a3583)
 2020-06-28 20:41:22 -04:00
Redo11
ecca666521 Add translated comments and add back opensans as default font, as special characters still aren't supported. 2020-06-28 20:41:22 -04:00
Redo11
2c17ecbc99 Add waypoints 2020-06-28 20:41:22 -04:00
jshipsey
622fa88b41 polish 2020-06-28 20:41:22 -04:00
Tim Stahel
3b246dee42 add swedish translation 2020-06-28 20:37:27 -04:00
Marcel
04b7837340 Merge branch 'xMAC94x/network-adj' into 'master' 
- switched participant to only error!() once a sec instead of every occurence...

See merge request veloren/veloren!1129
 2020-06-28 23:10:15 +00:00
Forest Anderson
07298cdbeb Merge branch 'nwilder/add-brazilian-portugese-translation' into 'master' 
Nwilder/add brazilian portugese translation

See merge request veloren/veloren!1128
 2020-06-28 21:29:08 +00:00
Forest Anderson
985b0e2bfd Merge branch 'wusyong/tchinese' into 'master' 
Add Traditional Chinese translation

See merge request veloren/veloren!885
 2020-06-28 21:23:57 +00:00
Forest Anderson
f5cede6a90 Merge branch 'nancok/add-spanish-translation' into 'master' 
Add Spanish translation

See merge request veloren/veloren!822
 2020-06-28 21:22:16 +00:00
unknown
7f02fa8132 Fixed glider animation so glider does not block view in first person. 2020-06-28 16:47:31 -04:00
Marcel Märtens
57453291e4 - switched participant to only error!() once a sec instead of every occurence in order to not spam error 
- switched the behavior of prio to keep the order of a stream, EVEN if messages of different length are used!
  This needs to be addresses to fulfill PROMISES_ORDERED
  I think we need to make thoughs if PRIO needs to handle this, or we add additional meta info and handle it on receiver site
 2020-06-28 22:29:42 +02:00
Forest Anderson
cda757f96c Merge branch 'FixFromDarkness/fix-russian-translations' into 'master' 
Update ru_RU.ron: Fix typos

See merge request veloren/veloren!1126
 2020-06-28 19:56:40 +00:00
Treeco
4098d69a69 Fixed up a few things 
Added fonts section to translation file required by changes to
translation system
Removed unneeded copy of translation file
 2020-06-28 14:50:42 -04:00
Luciano
948db32ba8 Uploaded Spanish (Latin American) translation, 2020-06-28 14:50:42 -04:00
Luciano
9e33fd5131 Upload Latin America Spanish translation 2020-06-28 14:50:42 -04:00
Forest Anderson
9166969c37 Changed license name 2020-06-28 14:47:26 -04:00
Forest Anderson
635c0d06f0 Merge branch 'xvar/move-sfx-from-common-to-voxygen' into 'master' 
Moved sfx from common to voxygen

See merge request veloren/veloren!1125
 2020-06-28 18:38:25 +00:00
Forest Anderson
a3eafe9b70 Merge branch 'yusdacra/crate2nix' into 'master' 
nix: Switch to crate2nix for building, and niv for dependency management

See merge request veloren/veloren!1090
 2020-06-28 18:28:29 +00:00
Ben Wallis
dc1844b489 Moved sfx from common to voxygen 2020-06-28 18:16:22 +01:00
Forest Anderson
2b2e24be5e Merge branch 'angel/fix-chattype-error' into 'master' 
Fixed meta chattype error on master

See merge request veloren/veloren!1124
 2020-06-28 17:10:01 +00:00
Forest Anderson
201f513737 Fixed meta chattype error on master 2020-06-28 17:10:01 +00:00
Forest Anderson
9246e34c1b Merge branch 'CapsizeGlimmer/chat_modes' into 'master' 
Capsize glimmer/chat modes

Closes #217

See merge request veloren/veloren!1043
 2020-06-28 14:35:39 +00:00
Monty Marz
f3a84e07a7 changed message type for motd 2020-06-28 16:04:55 +02:00
Forest Anderson
48f70bd088 Fixed double login message 2020-06-28 09:47:48 -04:00
Monty Marz
670d9e8736 remove unnecessary conversions to make clippy happy 2020-06-28 15:15:00 +02:00
Joshua Barretto
1d06df9d79 Merge branch 'xvar/loot-pickup-msgs' into 'master' 
Implemented loot pickup chat messages (#616) and the option for playing different sounds for picked up items

See merge request veloren/veloren!1118
 2020-06-28 12:34:58 +00:00
Ben Wallis
a9d3f984f0 Implemented loot pickup chat messages and the option for playing different sounds for picked up items 
* Added chat message when an item is picked up
* Changed InventoryUpdateEvent::Collected to InventoryUpdateEvent::Collected(Item) to facilitate the client being aware of what was picked up
* Added SfxInventoryEvent enum to allow different sounds to be used based on the item type. The RON mapping/de-serialization doesn't support matching on structs so we have to give it fixed enum values which are determined in TryFrom<&InventoryUpdateEvent> for SfxEvent
* Refactored InventoryManip::Pickup arm of match in inventory_manip::handle_inventory for clarity/better warning messages
* Fixed a bug that prevented the CollectFailed event from being raised when a player's inventory is full
* Added a panic for the situation where an item is pushed into the players inventory and then the deletion of the entity fails as this would indicate an item dupe bug - this could potentially be reworked to pull the item back from the player's inventory but this seems like there's be a more correct transactional way to do this.
* Added two temporary sounds to prove the per-item sound functionality (pickup sounds for Swords and Staffs)
 2020-06-28 13:05:28 +01:00
Joshua Barretto
41b03208cb Merge branch 'xvar/mouse-button-names' into 'master' 
Fixed long mouse button names overflowing hotbar slots (#637)

See merge request veloren/veloren!1120
 2020-06-28 11:11:29 +00:00
Forest Anderson
2665159790 Fixing errors after rebase 2020-06-27 19:12:12 -04:00
CapsizeGlimmer
883d9acf30 cargo fmt 2020-06-27 17:43:46 -04:00
CapsizeGlimmer
3d29c3254a Add setting for displaying character names in chat. Placate cargo clippy. 2020-06-27 17:43:46 -04:00
CapsizeGlimmer
59db2fcd3b Admin status added when registering; cargo fmt 2020-06-27 17:43:45 -04:00
CapsizeGlimmer
92127292d4 Added option to disable speech bubble icons. Aligned settings>gameplay menu again. 2020-06-27 17:40:03 -04:00
Monty Marz
a204072e78 fix 2020-06-27 17:40:03 -04:00
Monty Marz
3ed646b512 icon frame 2020-06-27 17:40:03 -04:00
Monty Marz
0969c236d6 fix dark bubble tail not being displayed correctly 2020-06-27 17:40:03 -04:00