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,918 Commits 151 Branches 18 Tags 2.1 GiB
1fd104aa60
Commit Graph

871 Commits

Author SHA1 Message Date
Samuel Keiffer
fe47a14ba5 Spin attack for axe 2020-07-08 19:58:41 +00:00
Joshua Yanovski
23b4058906 Fix moon, use nonlinear noise for terrain. 
Note that the latter has a bit of performance cost.
 2020-07-08 10:11:19 +02:00
Monty Marz
18a08e8fe2 settings localization 2020-07-07 23:57:52 +02:00
Joshua Yanovski
0e66f02b25 All sprites sway in the wind now. 2020-07-07 20:09:01 +02:00
Joshua Yanovski
db1401a691 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes 2020-07-07 19:34:17 +02:00
Joshua Barretto
30619771af Improved block picking 2020-07-06 23:04:13 +01:00
Joshua Barretto
62b59de95a Fixed sprite select flickering 2020-07-06 22:41:21 +01:00
Joshua Barretto
ddaa0a9246 Made char select handle client events 2020-07-06 17:11:19 +01:00
Jack Rubino
2ce92b88a9 Update it_IT.ron 2020-07-06 14:27:55 +00:00
Nícolas Wildner
9f7f9f96f9 Update pt_BR.ron 2020-07-06 01:57:34 +00:00
Nícolas Wildner
0654addb98 Updating pt_BR translation 2020-07-05 22:52:42 -03:00
Piotr Korgól
d0b7958309 Fix loot table (again) 2020-07-05 18:52:34 +02:00
Joshua Barretto
fd39ee97bc Added training dummies 2020-07-05 16:15:51 +01:00
Joshua Barretto
38c422bef7 Added bombs to loot table 2020-07-05 16:15:51 +01:00
Joshua Barretto
2f6a618d5a Added bombs, throwable items, more block kinds, weaker explosions 2020-07-05 16:15:48 +01:00
jshipsey
62eb66173f tweaks and fixes 2020-07-05 09:39:55 -04:00
Snowram
1b778ca191 Various small improvements to anims and models 2020-07-05 09:38:15 -04:00
jshipsey
ca9ae13527 more latitude tilt, better attack anims, addressed aesthetic concerns, deleted dead assets 2020-07-05 09:38:15 -04:00
jshipsey
e689de3c8a better everything 2020-07-05 09:38:14 -04:00
Snowram
86b2272176 Salamander model fixes 2020-07-05 09:38:14 -04:00
jshipsey
9ef383ff03 simplify quadmed run, integrate dampener variable 2020-07-05 09:38:14 -04:00
Snowram
ce9cd29720 Add offset to quadmed legs + various fixes and improvements 2020-07-05 09:38:14 -04:00
jshipsey
94ab3665d5 pangolin and special pangolin variable 2020-07-05 09:38:14 -04:00
jshipsey
d8fff8833e quadlow spawn in world, continued adjustments 2020-07-05 09:38:14 -04:00
jshipsey
c5f7a60f3b more run animation work, adjusting pivots 2020-07-05 09:38:14 -04:00
jshipsey
03c1a97ba9 animation tweaks, fix some idle 2020-07-05 09:38:14 -04:00
jshipsey
db64972e42 starting on trot, removing some warnings 2020-07-05 09:38:14 -04:00
Snowram
648e140be3 Add wolf, frostfang and mouflon npcs 2020-07-05 09:38:14 -04:00
Snowram
4acdc24df9 Add tarasque and grolgar improvements 2020-07-05 09:38:14 -04:00
Snowram
b1f4e4b9c1 Add new tusk ram model 2020-07-05 09:38:13 -04:00
Snowram
c22d543dd2 Add rock snapper mob 2020-07-05 09:38:13 -04:00
Snowram
1be42a8f85 Add tortoise mob 2020-07-05 09:38:13 -04:00
Snowram
016b05cf38 Add new grolgar model 2020-07-05 09:38:13 -04:00
Snowram
c7df12d2ea Set new lion model offsets, fix some jaws 2020-07-05 09:38:13 -04:00
unknown
4b493b196c Add asp mob 2020-07-05 09:38:13 -04:00
jshipsey
59777ee688 more quadmed run work 2020-07-05 09:38:13 -04:00
jshipsey
7d7ee11eef manifest, vox files 2020-07-05 09:38:13 -04:00
Snowram
1ffefde739 Run anim progress 2020-07-05 09:38:12 -04:00
Snowram
1f5e0216c4 Tiger offsets, lion new model 2020-07-05 09:38:12 -04:00
Snowram
390f516e13 Homogenizes quadmed bones names 2020-07-05 09:38:12 -04:00
Snowram
9fec5f3d14 Add tiger mob 2020-07-05 09:38:12 -04:00
jshipsey
6d9356d269 starting run anim 2020-07-05 09:38:12 -04:00
jshipsey
ccf939b4fd manifests, skeleton, basic placement 2020-07-05 09:38:12 -04:00
Snowram
c527484597 Add alligator, salamander and monitor npcs 2020-07-05 09:38:12 -04:00
Snowram
00b3301d6a Remove quad_low mobs from quad_medium 2020-07-05 09:38:12 -04:00
Snowram
fe1656931c Add legs to quadruped_medium 2020-07-05 09:38:12 -04:00
Snowram
72eb03ceb5 Add quadruped_low skeleton 2020-07-05 09:38:11 -04:00
Forest Anderson
3e830aa0ca Merge branch 'angel/add-spawn-training-dummy' into 'master' 
Added spawning test dummy

See merge request veloren/veloren!1142
 2020-07-04 19:24:02 +00:00
Joshua Yanovski
ffe0f5928c Fix some issues with underwater rendering. 2020-07-04 21:21:12 +02:00
Joshua Yanovski
bfda6da42f Fix some minor display issues. 2020-07-04 19:17:59 +02:00
Joshua Yanovski
0ed752e087 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes 2020-07-04 18:14:21 +02:00
Joshua Yanovski
ccc6a06a8d Some minor changes. 2020-07-04 18:04:34 +02:00
Joshua Yanovski
4e02024670 Merge remote-tracking branch 'origin/master' into sharp/small-fixes 2020-07-04 16:17:40 +02:00
Piotr Korgól
aefa7e2f11 Make chests and enemies use the basic loot table 2020-07-04 14:07:10 +02:00
unknown
9968398ea8 Added stuff to loot table 2020-07-04 12:40:28 +02:00
Piotr Korgól
d101d7f132 Implemented a lottery system 2020-07-04 12:40:27 +02:00
Forest Anderson
c7ffe3dbeb Merge branch 'nancok/fix-es-translations' into 'master' 
Update es_la.ron

See merge request veloren/veloren!1151
 2020-07-04 03:54:55 +00:00
Forest Anderson
954a4857c4 Added proper training dummy model 2020-07-03 16:53:04 -04:00
Samuel Keiffer
85d1d4b3ff Leap now actually works. In addition, leaping while next to an entity no longer interrupts the leap. 2020-07-03 15:40:12 +00:00
Monty Marz
95a799cf85 fix artifacts, cleanup 2020-07-03 12:17:55 +02:00
Joshua Yanovski
7dd06da34c Add shadows.glsl. 2020-07-02 22:25:35 +02:00
Joshua Yanovski
618a18c998 Adding shadows, greedy meshing, and more. 2020-07-02 22:10:22 +02:00
Monty Marz
89400264dc Loot ChatType, Update german translation, map zooming 2020-07-01 19:05:44 +00:00
scott-c
d53b51954b Added ability to use 2 x 1h weapons or shields 2020-07-01 17:51:06 +08:00
Luciano
4a8443f743 Update es_la.ron 2020-06-29 14:19:12 +00: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
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
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
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
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
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
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
CapsizeGlimmer
3d29c3254a Add setting for displaying character names in chat. Placate cargo clippy. 2020-06-27 17:43:46 -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
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
CapsizeGlimmer
5ad212b7ed Add chat types for offline, online. Implement Pfau's fixes 2020-06-27 17:40:03 -04:00
Pfauenauge90
a497fb92d3 icons 2020-06-27 17:20:26 -04:00
Delyth Williams
6644375764 Fix sprites w/o models 2020-06-27 21:08:21 +00:00
CapsizeGlimmer
35ed03aa18 Implement chat mode icons in chat window 2020-06-27 17:03:30 -04:00
Delyth Williams
94164b7839 Welsh pixie/armour 2020-06-26 16:26:00 +00:00
Monty Marz
58bfa4f0ef Merge branch 'WelshPixie/FluffyBunnySlippers' into 'master' 
Added fluffy jackalope slippers

See merge request veloren/veloren!1114
 2020-06-25 22:07:47 +00:00
Monty Marz
34aadd0eb9 Merge branch 'WelshPixie/NPCAttackedText' into 'master' 
Added text when NPCs attacked

See merge request veloren/veloren!1105
 2020-06-25 21:26:30 +00:00
Monty Marz
c025b93501 Merge branch 'WelshPixie/grassets' into 'master' 
Welsh pixie/grassets

See merge request veloren/veloren!1106
 2020-06-25 21:12:31 +00:00
Delyth Williams
9a79101f57 Welsh pixie/grassets 2020-06-25 21:12:31 +00:00
WelshPixie
2825b08bee Added fluffy jackalope slippers 2020-06-25 22:47:17 +02:00
WelshPixie
281ca44d3a Added text when NPCs attacked 2020-06-25 22:45:27 +02:00
WelshPixie
9887e5d45d added seven new shoulder armour types 2020-06-25 18:36:24 +02:00
Songtronix
f44df23935 feat: add server whitelist 2020-06-24 17:36:19 +02:00
Delyth Williams
b73da5507e added new flora 2020-06-15 16:39:21 +00:00
Forest Anderson
c2beeef600 Added equip documentation and test 2020-06-14 13:56:17 -04:00
Justin Shipsey
688f917308 asset 
missing fix
 2020-06-14 09:22:21 +00:00
Monty Marz
716f936f6c fix broken main menu 2020-06-14 02:11:31 +02:00
Yusuf Bera Ertan
479e64277e Add missing strings, fix a few translations 2020-06-08 21:47:30 +00:00
S Handley
370ef80db4 Replace audio files 2020-06-08 16:26:48 +00:00
Shane Handley
6a1cec8860 Docs, make adding event mappers easier for sfx, remove placeholder 
sounds.
 2020-06-09 00:41:46 +10:00
Invisible Fox
cdcb14d26e Update ru_RU.ron: Fix typos 2020-06-08 10:31:29 +00:00
Shane Handley
fc8bb427fb Handle TripleStrike stages individually. 2020-06-08 10:19:42 +10:00
Shane Handley
987a025d36 Introduce a ToolCategory so we can ignore the specific type of weapon 
when deciding on the SFX to play when wielding/attacking.
 2020-06-08 10:19:42 +10:00
Shane Handley
802bce1698 Target the specific attack types, to handle TripeStrike etc... 
Removed the Axe sfx until the animations show the swing
 2020-06-08 10:19:41 +10:00
Shane Handley
0516af8c57 Add swoosh sounds for additional weapons. 2020-06-08 10:19:41 +10:00
Shane Handley
d5cc5c8537 Add initial attack sfx code with bow shot sounds. 2020-06-08 10:19:41 +10:00
Pfauenauge90
1c1d0d9ca6 Added spanish translation file 2020-06-06 21:46:53 +02:00
Pfauenauge90
de7ab9f5ed update default keybindings file, en.ron, de_DE.ron 2020-06-06 21:29:35 +02:00
Joey Maher
458ac4af5e Adds simple auto walk functionality. Toggleable or push to hold 2020-06-06 13:09:01 -05:00
Nícolas Wildner
9ed713b334 Replace pt_BR.ron 2020-06-04 12:52:00 +00:00
S Handley
e0633a238e Update CHANGELOG and a TODO, fix safer deserialisation for inventory 
data.
 2020-06-04 11:44:33 +00:00
Monty Marz
6c0587393e update german translation 2020-06-03 19:32:54 +00:00
Monty Marz
b34da9b07b More item drops 2020-06-03 17:59:09 +00:00
Justin Shipsey
3877efec50 optimization and tails 2020-06-01 00:33:24 +00:00
Monty Marz
f7d6f76a04 Added 36 Swords 
I added 36 sword models to the code.
 2020-05-29 18:23:00 +00:00
CapsizeGlimmer
d5216cc8f3 Redraw dark mode bubbles. Add padding to light mode bubbles. 2020-05-27 13:49:19 +02:00
CapsizeGlimmer
78a06550d0 Only NPCs speak when hit. Farm animal alignment changed from NPC to Tame 2020-05-27 13:49:18 +02:00
CapsizeGlimmer
3cea76b82f NPCs now call for help when you hit them. Redraw speech bubble dark mode. 2020-05-27 13:49:18 +02:00
CapsizeGlimmer
3c07d02218 Add a dark mode to speech bubbles; consistantly use 'speech bubble' instead of 'chat bubble' 2020-05-27 13:49:17 +02:00
CapsizeGlimmer
73a29b339c Added chat bubbles. Refactored bubble+name+hp+energy into new overhead widget 2020-05-27 13:49:13 +02:00
Justin Shipsey
ea07d744a7 orientation animation 2020-05-27 06:41:55 +00:00
Pfauenauge90
c1af72d5b8 Update help.png 2020-05-25 15:45:05 +01:00
Joshua Yanovski
eaea83fe6a Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes 2020-05-21 22:47:07 +02:00
Joshua Yanovski
2f89b863e0 Merge branch 'treeco/new-map' into 'master' 
Changed default map and seed, lowered site counts

See merge request veloren/veloren!992
 2020-05-21 20:46:54 +00:00
Joshua Yanovski
f8376fd5dc Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes 2020-05-21 17:53:57 +02:00
Monty Marz
9d7e0aad12 Aeronic/forest tune 2020-05-21 04:09:59 +00:00
Joshua Yanovski
654f7e0492 Correct backface culling. 2020-05-20 21:22:30 +02:00
Joshua Yanovski
560501df05 Greedy messhing for shadows. 2020-05-19 17:22:06 +02:00
Joshua Barretto
f1b166d15d Innumerable camera improvements 2020-05-18 23:40:28 +01:00
Joshua Barretto
68e77f43f8 Made figure placement correct with warping 2020-05-18 15:15:58 +01:00
Justin Shipsey
9e5c0ce601 Merge branch 'silentium/arms-and-armor' into 'master' 
Added 2 sets of armour.

See merge request veloren/veloren!951
 2020-05-17 19:03:00 +00:00
Silentium
1673a25e8b Added 2 sets of armour. 2020-05-17 19:02:59 +00:00
Joshua Yanovski
a4d87e1875 Shadow maps work for lantern. 2020-05-17 05:59:00 +02:00
Monty Marz
ecb7963730 Pfau/0.6 bg 2020-05-16 12:48:29 +00:00
jshipsey
855fe5da34 brazilianportugese 2020-05-15 19:19:14 -04:00
Marcel Märtens
39de4bd4fd swap main background for 0.6 background 2020-05-16 01:07:07 +02:00
Joshua Barretto
aac28d04d5 Added dungeon bosses, boss loot, boss arenas 2020-05-15 16:05:50 +01:00
Joshua Yanovski
243d0837b8 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes 2020-05-15 14:53:13 +02:00
Joshua Yanovski
04382dc286 WIP: better graphics config, better LOD, shadow maps. 2020-05-15 14:22:17 +02:00
Treeco
61bcfbeeb2 Changed default map and seed, lowered site counts 2020-05-15 11:36:19 +01:00
CapsizeGlimmer
0a723614f9 Popup message when setting waypoint 2020-05-14 16:56:10 +00:00
Shane Handley
e852e0cfab - Update the stats of characters individually, reverting the change with 
big combined updates.
- Add a timer to the stats persistence system and change the frequency
that it runs to 10s
- Seperate the loading of character data for the character list during
selection, and the full data we will grab during state creation. Ideally
additional persisted bits can get returned at the same point and added
to the ecs within the same block.
 2020-05-13 09:14:09 +10:00