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

805 Commits

Author SHA1 Message Date
Joshua Barretto
7ca61abcec Merge branch 'zesterer/worldsim' into 'master' 
World simulation, generation, and pathfinding improvements (including castles and caves)

See merge request veloren/veloren!1282
 2020-08-12 21:40:56 +00:00
Joshua Barretto
3f2e6a3133 Fixed floating sprites in towns, clippy fixes 2020-08-12 21:16:14 +01:00
Joshua Barretto
a8b0a678d8 Fmt and clippy lints fixes 2020-08-12 21:16:14 +01:00
Joshua Barretto
621ea6695b Better surface swimming, no underwater sprites 2020-08-12 21:15:53 +01:00
Joshua Barretto
1431b9c6f2 Various improvements to castles, dungeons and more 2020-08-12 21:15:53 +01:00
Joshua Barretto
d8b7eb278f Added large caves, cave scatter, removed old caves 2020-08-12 21:15:53 +01:00
Joshua Barretto
13ea4710b5 Added labour value to economy, castle improvements 2020-08-12 21:15:52 +01:00
Joshua Barretto
73b6d6b954 Began adding castles 2020-08-12 21:15:52 +01:00
Joshua Barretto
3ab6c5ff49 Added make_block command 2020-08-12 21:15:52 +01:00
Joshua Barretto
9e5978b34b Added forts to towns, began better economy sim 2020-08-12 21:15:52 +01:00
Monty Marz
2d793d7e65 Add firework hues 2020-08-12 22:29:06 +08:00
scott-c
e5bf0230e9 Add firework item 2020-08-12 22:25:28 +08:00
scott-c
d3270e8274 fix rebase 2020-08-08 20:53:07 +08:00
scott-c
b5982999b5 fix rebase 2020-08-08 19:26:52 +08:00
scott-c
ed4cab9019 change campfire cmd to spawn object instead of npc 2020-08-08 19:26:52 +08:00
Joshua Barretto
575319f3aa Added outcome system, sound effects 2020-08-08 19:26:48 +08:00
scott-c
3b9ef1cba8 Add campfire command 2020-08-08 19:25:33 +08:00
scott-c
0f59d978d6 Update changelog 2020-08-08 19:25:29 +08:00
scott-c
4c765eac9b remove particle emitter component 2020-08-08 19:25:00 +08:00
scott-c
8d742a77cc Add particle velocity and ability particle emitter 2020-08-08 19:25:00 +08:00
scott-c
6e9584e061 Add particle lifespan 2020-08-08 19:25:00 +08:00
scott-c
26a0bbb7f9 Add ParticleMgr 2020-08-08 19:24:55 +08:00
scott-c
295b41abf0 Add ParticleEmitter Component 2020-08-08 19:24:22 +08:00
Monty Marz
fb0984efa1 address comments 2020-08-08 00:13:00 -04:00
Imbris
10ad130712 Make clippy happy, fmt even though it is set to fmt on save in my 
editor...."
 2020-08-08 01:16:35 +02:00
Imbris
1d8d8eb79b Fireballs no longer damage group members 2020-08-08 01:16:35 +02:00
Imbris
4876c7395a Remove pets from the group exp division calculation but still give them exp, fix bug with group code when pets are deleted 2020-08-08 01:16:35 +02:00
Imbris
50858245d9 Add timeout's to group invites, and configurable limit to group size 
Fix a few group bugs, enable invite timeout and group limits in ui
 2020-08-08 01:16:35 +02:00
Monty Marz
2232ca78b7 Fixed test world to run again 
Update test_world.rs
 2020-08-08 01:15:58 +02:00
Monty Marz
9869b2a8d7 group leader colouring, offset fix when debug menu is open, 
fixed social tab visuals

text width limit

group interaction wording, group window adjustments
 2020-08-08 01:15:58 +02:00
Monty Marz
a0dd070daf timeout visuals, various small fixes and two new items 2020-08-08 01:15:58 +02:00
Imbris
301205c369 Don't give exp when killing self or group members 2020-08-08 01:15:58 +02:00
Imbris
3c66e786dd Distribute exp evenly and make it easier to target entities 2020-08-08 01:14:19 +02:00
Imbris
320cbc9b3c New group UI functions 2020-08-08 01:14:19 +02:00
Imbris
7f641498ff Integrate groups with chat groups 2020-08-08 01:12:35 +02:00
Imbris
71917f9964 Make entity targeting easier, add EXP sharing 2020-08-08 01:12:35 +02:00
Imbris
03a1c7cd13 Fixes and tweaks for groups 2020-08-08 01:12:35 +02:00
Monty Marz
c5720c02c9 Basic UI 
Basic ui for groups and group window
 2020-08-08 01:12:35 +02:00
Imbris
cf0a727eb6 Add basic group functionality (no voxygen wiring yet) 2020-08-08 01:09:01 +02:00
Joshua Yanovski
3e3da609f4 Fix various migration issues. 2020-08-07 01:35:51 +02:00
Silentium2318
ab594a97fb More weapon and hit box tweaks 2020-08-06 09:43:47 -05:00
Imbris
8f813a3773 Revert "Merge branch 'BottledByte/ability_design' into 'master'" 
This reverts merge request !1264
 2020-08-06 08:04:03 +00:00
Imbris
703da622bb Merge branch 'BottledByte/ability_design' into 'master' 
Add ability IDs and use them in GUI

See merge request veloren/veloren!1264
 2020-08-06 04:44:51 +00:00
BottledByte
8cbb43ac30 Add ability IDs and use them in GUI 2020-08-05 23:00:43 +02:00
BottledByte
b8199542e0 Dehardcoded LanternKind, Consumable and Ingredient, fixed Sceptre hotbar 
Also fixed two wrong asset references and did some .ron formatting
 2020-08-05 01:21:42 +02:00
BottledByte
c7a5161b43 Removed fine-grained Item enums and replaced them with Strings 
This change allows to introduce new weapons and pair them
with graphical assets without need to recompile.
 2020-08-02 01:21:32 +00:00
Samuel Keiffer
6f73713c79 Allows for weapons to have different stats. Seperates healing staff out from staffs into its own weapon type: sceptre. Splits bow weapon type into shortbow and longbow. 2020-08-01 20:08:30 +00:00
Imbris
d24ca1a037 Fix glyph to large panic 2020-07-31 01:13:31 -04:00
Marcel Märtens
0713c1dd54 switch to auth that doesn't use agent 2020-07-31 01:05:01 +02:00
Marcel Märtens
e4eb380cdf update auth to newest version 2020-07-29 19:28:22 +02:00