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

1109 Commits

Author SHA1 Message Date
Shane Handley
016ebc7f71 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
97e8a96586 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
b131ba5b06 Add initial attack sfx code with bow shot sounds. 2020-06-08 10:19:41 +10:00
S Handley
45949e7577 Update CHANGELOG and a TODO, fix safer deserialisation for inventory 
data.
 2020-06-04 11:44:33 +00:00
Monty Marz
2ff1edae28 More item drops 2020-06-03 17:59:09 +00:00
Joshua Barretto
38ed85ab38 Merge branch 'zesterer/small-fixes' into 'master' 
Better physics comments, removed camera snapping

See merge request veloren/veloren!1034
 2020-06-01 20:50:24 +00:00
Joshua Barretto
6365015cd1 Better physics comments, removed camera snapping 2020-06-01 21:33:20 +01:00
scott-c
a895296e0e Add level up network event 2020-06-01 22:04:44 +08:00
scott-c
fd6911eb27 Fix social list having incorrect player count 2020-06-01 22:04:44 +08:00
scott-c
7cf9967e77 Add character name and level to social window 2020-06-01 22:04:44 +08:00
Monty Marz
39df00be50 Added 36 Swords 
I added 36 sword models to the code.
 2020-05-29 18:23:00 +00:00
Monty Marz
98477a4007 Merge branch '561-info-popup-for-saved-waypoints-only-appear-for-the-second-time-you-visit-one' into 'master' 
Resolve "Info popup for saved waypoints only appear for the second time you visit one"

Closes #561

See merge request veloren/veloren!1014
 2020-05-29 11:39:12 +00:00
CapsizeGlimmer
2f38332f7d Only NPCs speak when hit. Farm animal alignment changed from NPC to Tame 2020-05-27 13:49:18 +02:00
CapsizeGlimmer
a0628c7a93 NPCs now call for help when you hit them. Redraw speech bubble dark mode. 2020-05-27 13:49:18 +02:00
CapsizeGlimmer
946729ea7a Add a dark mode to speech bubbles; consistantly use 'speech bubble' instead of 'chat bubble' 2020-05-27 13:49:17 +02:00
CapsizeGlimmer
f8ae27c234 Chatting now creates speech bubbles 2020-05-27 13:49:14 +02:00
Justin Shipsey
7bbbf74fc2 orientation animation 2020-05-27 06:41:55 +00:00
CapsizeGlimmer
9e7d637c8e Waypoint notifications have a 10 second cooldown 2020-05-25 02:56:31 -04:00
Joshua Yanovski
1c7f85dfb7 Make civsim and sites deterministic. 
For anything in worldgen where you use a HashMap, *please* think
carefully about which hasher you are going to use!  This is
especially true if (for some reason) you are depending on hashmap
iteration order remaining stable for some aspect of worldgen.
 2020-05-21 21:43:54 +02:00
Joshua Barretto
59f76e9fb5 Merge branch 'zesterer/small-fixes' into 'master' 
Camera tweaks

See merge request veloren/veloren!1004
 2020-05-19 17:35:43 +00:00
Forest Anderson
6ec101ecc2 Merge branch 'jbeich/veloren-freebsd' into 'master' 
Enable system assets on more Unices

See merge request veloren/veloren!1005
 2020-05-19 00:20:07 +00:00
Joshua Barretto
833bd30602 Innumerable camera improvements 2020-05-18 23:40:28 +01:00
Jan Beich
b3fa399a82 Enable system assets on more Unices 2020-05-18 15:53:50 +00:00
Justin Shipsey
462461fc0a 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
ee9b137d5f Added 2 sets of armour. 2020-05-17 19:02:59 +00:00
Monty Marz
7a362810ee Pfau/0.6 bg 2020-05-16 12:48:29 +00:00
Marcel Märtens
5e96162ad4 Change the version number to 0.6 2020-05-16 00:50:40 +02:00
Joshua Barretto
3b8dae468a Merge branch 'small-fixes' into 'master' 
Dungeon Bosses

See merge request veloren/veloren!994
 2020-05-15 19:07:11 +00:00
Joshua Barretto
1f99350448 Added dungeon bosses, boss loot, boss arenas 2020-05-15 16:05:50 +01:00
Songtronix
5c8aefc51b Merge branch 'mockersf/fix-doc-generation' into 'master' 
fix doc generation

See merge request veloren/veloren!993
 2020-05-15 14:18:15 +00:00
Shane Handley
3fe0159ab0 Correctly set the exp target for the next level when spawning a character. 
Removed the unwrap_or from the update method for stats persistence, and
have a dedicated method for updating single rows with a new connection.
 2020-05-15 13:27:26 +10:00
François Mockers
ba0d9d3037 fix iterator type 2020-05-14 22:13:08 +02:00
CapsizeGlimmer
bb0881253d Popup message when setting waypoint 2020-05-14 16:56:10 +00:00
Forest Anderson
5ea3f19d18 Merge branch 'shandley/persistence-stats' into 'master' 
Stats Persistence

See merge request veloren/veloren!970
 2020-05-13 13:43:22 +00:00
Imbris
d587708958 Fill in entity_count in metrics 2020-05-12 19:44:27 -04:00
Shane Handley
d988b34c22 - 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
Shane Handley
ceb3e26341 Stats persistence 
- Update client code to use persisted stats
- Add a system for stats persistence
- Add a basic scheduler to control duration between execution of
persistence systems
 2020-05-13 09:14:08 +10:00
Shane Handley
622465b35d Initial models, migration and client code for stats persistence. 2020-05-13 09:14:08 +10:00
jshipsey
16c382ebc3 cyclops 2020-05-11 21:44:21 -04:00
Imbris
d605242fe7 Merge branch 'CapsizeGlimmer/tab_completion' into 'master' 
Tab completion code review suggestions

Closes #553

See merge request veloren/veloren!979
 2020-05-11 23:56:48 +00:00
CapsizeGlimmer
805c5d651e Tab completion code review suggestions 2020-05-11 18:02:21 -04:00
Forest Anderson
3c6025fd46 Merge branch 'CapsizeGlimmer/tab_completion' into 'master' 
Capsize glimmer/tab completion

See merge request veloren/veloren!972
 2020-05-11 17:49:26 +00:00
Imbris
3c37ae3ab1 fix leaning 2020-05-11 00:53:37 -04:00
Imbris
12c22bf287 Show component in error message when sync modification fails because it does not exist 2020-05-11 00:09:17 -04:00
Imbris
8bd19d62b1 Fix panic with dragging into the same loadout slot 2020-05-11 00:08:43 -04:00
CapsizeGlimmer
03986d2070 Rework tp command - "/sudo player /tp" is short for "/sudo player /tp sudoer" 2020-05-10 19:17:34 -04:00
CapsizeGlimmer
c2e7d3e00a Fixed player list tab completion 2020-05-10 19:17:17 -04:00
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