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

5251 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Imbris
bbff0932e9 Make basic server-cli mode default to not reading input and add interactive option 2020-10-10 02:10:31 -04:00
Imbris
5856d665e8 Improve figure and sprite highlighting 2020-10-10 02:10:31 -04:00
Imbris
2a99072d21 Change projectiles to not be pushed back by collisions, moved group check into projectile system from physics system 2020-10-10 02:10:31 -04:00
Monty Marz
6429b71f8f Merge branch 'pfau/microscopic-fixes' into 'master' 
Lanterns, Gliders, Quality Stat

See merge request veloren/veloren!1400
 2020-10-07 02:23:20 +00:00
Monty Marz
d80683bc76 make clippy happy 
Delete glider.ron
 2020-10-07 02:23:20 +00:00
Marcel
7c198365c7 Merge branch 'undefined' into 'master' 
Correction of errors

See merge request veloren/veloren!1421
 2020-10-05 22:54:49 +00:00
Marcel
570366f8d2 Merge branch 'xvar/sigint-graceful-shutdown' into 'master' 
Implemented graceful shutdown and fixed various TUI bugs

See merge request veloren/veloren!1423
 2020-10-04 21:32:26 +00:00
Ben Wallis
cdf9d1b059 Implemented graceful shutdown on SIGUSR1 signal. Added shutdown <seconds> TUI command. Added abortshutdown TUI command. Fixed a bug in TUI that caused a panic on quit in basic mode on windows. 2020-10-04 21:24:45 +01:00
Samuel Keiffer
4cb618b018 Merge branch 'sam/sceptre-loot-fix' into 'master' 
Loot table fix

See merge request veloren/veloren!1422
 2020-10-04 14:54:35 +00:00
Sam
81fc925071 Loot table fix 2020-10-04 08:52:19 -05:00
pablo saavedra soler
23b3be0433 I have corrected many errors in Spanish grammar and dialect in Latin America 2020-10-04 06:41:35 +00:00
Marcel
bf09f2be4f Merge branch 'mdroogle/interaction_hint' into 'master' 
Add interaction hint #615

See merge request veloren/veloren!1394
 2020-10-01 09:31:54 +00:00
Samuel Keiffer
22e17042d6 Merge branch 'sam/sceptre-overhaul' into 'master' 
Sceptre Rework

Closes #760

See merge request veloren/veloren!1345
 2020-09-30 03:05:14 +00:00
Sam
dbe6ac0fc8 Addressed comments 2020-09-29 20:48:23 -05:00
Sam
be353c9fe0 Beam particles fixed/tweaked. 2020-09-29 19:48:17 -05:00
Sam
bf20e5090b Addressed comments 2020-09-29 19:48:17 -05:00
Sam
bd89c81907 Changelog line, final balance tweaks. 2020-09-29 19:48:16 -05:00
Sam
4ee552cd86 Add migration 2020-09-29 19:48:15 -05:00
Sam
7df6b781f1 Added keyframe support to basic beam state. Addressed some comments. 2020-09-29 19:48:15 -05:00
Sam
5803d47a94 Beam tick rate now more responsive when aiming. 2020-09-29 19:48:14 -05:00
Sam
884eb2f7e6 Improvements to beam collision. 2020-09-29 19:48:14 -05:00
Sam
aead42a336 Fixed what broke after rebasing. 2020-09-29 19:48:13 -05:00
Sam
8de843a073 Created manifest for database to filepath for items. 2020-09-29 19:48:12 -05:00
Sam
46060c22a6 Fully separated sceptres from staves. 2020-09-29 19:48:12 -05:00
Sam
b8e4f506cc Projectile effects are now drained, so that the same projectile can't trigger it's effects on multiple enemies. 2020-09-29 19:48:11 -05:00
Sam
9a9668969d Separated out energy cost for healing so it's not based off of the energy regen from dealing damage. 2020-09-29 19:48:11 -05:00
Monty Marz
2244a271a1 doubled energy consumption for M1 healing 2020-09-29 19:48:10 -05:00
Monty Marz
3848594122 fix SCT decimals not being absolutes 2020-09-29 19:48:10 -05:00
Sam
e71e487abd Addressed feedback in sceptre branch 2020-09-29 19:48:09 -05:00
Sam
813144832c Addressed round of testing feedback. 2020-09-29 19:48:09 -05:00
Sam
509bff0d79 Added healing healthsource logic to beam system. 2020-09-29 19:48:08 -05:00
Monty Marz
0d4979395e separate sceptres from staffs, show values below 1.0 as decimals in the SCT, add starting sceptre 
remove firebolt from starting sceptre
 2020-09-29 19:48:07 -05:00
Sam
410090317e Energy no longer regens when heal target is at full health. 2020-09-29 19:48:07 -05:00
Sam
8b23fc7aca Re-added necessary functionality to beam (heal, lifesteal, energy regen). 2020-09-29 19:48:06 -05:00
Sam
29f27bfdec Addressed comments. 2020-09-29 19:48:06 -05:00
Sam
628b02b1bd Tweaked beam collision logic to be more accurate. 2020-09-29 19:48:05 -05:00
Sam
f26dad94a0 Reverted changes to melee system that were added to when beam was initially in melee system. 2020-09-29 19:48:04 -05:00
Sam
a3459b309c Added beam system. Added collision code for spherical wedge/cylinder detection. 2020-09-29 19:48:04 -05:00
Sam
7a58f0c425 Placeholder animation for beam attack. 2020-09-29 19:48:03 -05:00
Sam
3fcf22b2e0 Beams now have spherical hit detection. 2020-09-29 19:48:02 -05:00
Sam
7a50b94445 M1 now only regens stamina when healing allies if they are not at full health. 2020-09-29 19:48:02 -05:00
Sam
19dadb2c8d Tick rate now exposed as a variable. 2020-09-29 19:48:01 -05:00
Monty Marz
96a76617e9 change tick rate 2020-09-29 19:48:01 -05:00
Monty Marz
c1caa2d3a8 test values 2020-09-29 19:48:00 -05:00
Sam
49dcc29d20 Fixed energy cost for playtesting purposes. 2020-09-29 19:48:00 -05:00
Sam
aaf08bde16 Fixed explosion color of sceptre M2. 2020-09-29 19:47:59 -05:00
Monty Marz
5b5ab33c90 color adjustments 2020-09-29 19:47:59 -05:00
Sam
e92116cd1d Tweaked particles. Added skill icons. 2020-09-29 19:47:58 -05:00
Sam
2dad6cf9af New sceptre M2 is functional. 2020-09-29 19:47:57 -05:00
Sam
e62c0cd1bd Lifesteal now works. Added particles to healing beam. 2020-09-29 19:47:57 -05:00