SteamWar/FightSystem
Archiviert
13
1
Commit graph

799 Commits

Autor SHA1 Nachricht Datum
5af0a9dd1a Not stable version
Signed-off-by: Yaruma3341 <yaruma3341@gmail.com>
2019-02-23 22:45:45 +01:00
34d24a2476 Not stable version
Signed-off-by: Yaruma3341 <yaruma3341@gmail.com>
2019-02-23 22:11:53 +01:00
7dc9546c72 Not stable version
Signed-off-by: Yaruma3341 <yaruma3341@gmail.com>
2019-02-23 21:58:26 +01:00
4dce49209c Not stable version
Signed-off-by: Yaruma3341 <yaruma3341@gmail.com>
2019-02-23 21:09:57 +01:00
6bef99e8e7 Merge branch 'leaderPlayer' into 'master'
Removed leaderPlayer doubles + scoreboard testing

See merge request Yaruma3341/fightsystem!8
2019-02-23 21:09:10 +01:00
lixfel
84c8e38472 Removed leaderPlayer doubles + scoreboard testing 2019-02-23 21:07:47 +01:00
bf0ffb5684 Not stable version
Signed-off-by: Yaruma3341 <yaruma3341@gmail.com>
2019-02-23 20:56:20 +01:00
3dc213c5fa Merge branch 'posFix' into 'master'
Position fixes

See merge request Yaruma3341/fightsystem!7
2019-02-23 20:35:48 +01:00
c81a454f43 Not stable version
Signed-off-by: Yaruma3341 <yaruma3341@gmail.com>
2019-02-23 20:35:30 +01:00
lixfel
19fcccef82 Position fixes 2019-02-23 20:34:22 +01:00
c06a6803cc Not stable version
Signed-off-by: Yaruma3341 <yaruma3341@gmail.com>
2019-02-23 20:22:29 +01:00
d2d126f02f Not stable version
Signed-off-by: Yaruma3341 <yaruma3341@gmail.com>
2019-02-23 17:53:31 +01:00
884be9beb3 Merge branch 'codeCleanup' into 'master'
Code cleanup

See merge request Yaruma3341/fightsystem!6
2019-02-23 17:46:23 +01:00
lixfel
b436560604 Last Adaptions 2019-02-23 17:44:36 +01:00
lixfel
78f78fb6da Rework of remaining Listeners 2019-02-23 17:14:00 +01:00
lixfel
78ff15831c Rework of PlayerMoveListener 2019-02-23 16:59:25 +01:00
lixfel
ce3bac464d Merge remote-tracking branch 'origin/master' into codeCleanup 2019-02-23 16:08:59 +01:00
lixfel
5e8c65ea94 First Cleanup + hasTeamLeader Bugfix 2019-02-23 16:07:31 +01:00
d71821e5e5 Not stable version
Signed-off-by: Yaruma3341 <yaruma3341@gmail.com>
2019-02-23 13:48:50 +01:00
b0f5833d59 Merge branch 'chatRework' into 'master'
Color adaptions

See merge request Yaruma3341/fightsystem!5
2019-02-23 13:40:28 +01:00
lixfel
6f02da7ff2 Color adaptions 2019-02-23 13:37:33 +01:00
6264f21fca Not stable version
Signed-off-by: Yaruma3341 <yaruma3341@gmail.com>
2019-02-23 13:33:50 +01:00
a6019bdbdb Merge branch 'chatRework' into 'master'
Changed Chat

See merge request Yaruma3341/fightsystem!4
2019-02-23 13:32:52 +01:00
lixfel
ff9491e4ef Changed Chat 2019-02-23 13:31:26 +01:00
2bc12730ea Not stable version
Signed-off-by: Yaruma3341 <yaruma3341@gmail.com>
2019-02-23 13:17:44 +01:00
ba981309c6 Not stable version
Signed-off-by: Yaruma3341 <yaruma3341@gmail.com>
2019-02-23 12:25:17 +01:00
1cb8b79f61 Not stable version
Signed-off-by: Yaruma3341 <yaruma3341@gmail.com>
2019-02-23 12:14:33 +01:00
8b30e77bc5 Not stable version
Signed-off-by: Yaruma3341 <yaruma3341@gmail.com>
2019-02-23 12:00:21 +01:00
9fa918d04e Not stable version
Signed-off-by: Yaruma3341 <yaruma3341@gmail.com>
2019-02-23 11:39:53 +01:00
649c1c36c7 Updated config.yml
Signed-off-by: Yaruma3341 <yaruma3341@gmail.com>
2019-02-21 20:43:50 +01:00
fd7db401f7 PlayerMove region check fix and added damage to players on ground
Signed-off-by: Yaruma3341 <yaruma3341@gmail.com>
2019-02-21 20:35:44 +01:00
abd1ea3616 Added Scoreboard
Signed-off-by: Yaruma3341 <yaruma3341@gmail.com>
2019-02-21 20:04:06 +01:00
c3d48cce73 Added dependency
Signed-off-by: Yaruma3341 <yaruma3341@gmail.com>
2019-02-19 21:38:40 +01:00
328c4c14f2 Fixed Issue #21 Replace Falsche Verwendung
Signed-off-by: Yaruma3341 <yaruma3341@gmail.com>
2019-02-19 21:32:04 +01:00
ba8f3e224a sendPlayerSchematicList() rework
Signed-off-by: Yaruma3341 <yaruma3341@gmail.com>
2019-02-19 16:59:27 +01:00
5c56e47732 PercentSystem rework; Issues: #18 #19 #20
Signed-off-by: Yaruma3341 <yaruma3341@gmail.com>
2019-02-18 20:05:21 +01:00
d956ee7353 Registered Listeners for WinConditions (only if enabled);
Added PercentSystem (Prozentsystem) as WinCondition;
Added PercentSystem to config.yml;

Signed-off-by: Yaruma3341 <yaruma3341@gmail.com>
2019-02-17 22:39:57 +01:00
2d03c39883 Added method getFightPlayer() to Fight class;
Code Cleanup PlayerDeathListener;
Added WinConditions;
Added Win/Lose/Undecided and give money to FightPlayers;
Added money variables to config.yml;

Signed-off-by: Yaruma3341 <yaruma3341@gmail.com>
2019-02-17 20:29:32 +01:00
6b4b993590 Merge branch '10-team1corner-und-team2corner-sind-bislang-nicht-zwingend-immer-die-kleinsten-werte' into 'master'
Resolve "Team1corner (und team2corner) sind (bislang) nicht zwingend immer die kleinsten Werte"

Closes #9 and #10

See merge request Yaruma3341/fightsystem!3
2019-02-16 12:24:44 +01:00
lixfel
97a4d5e077 Changing Coordinatecomputing + various Bugfixes 2019-02-16 11:09:14 +01:00
4303f9a5ea Code Cleanup und Issues abgearbeitet: #4 #5 #6 #7 #8
Signed-off-by: Yaruma3341 <yaruma3341@gmail.com>
2019-02-16 00:43:08 +01:00
02792c325f Region System erweitert und Überarbeitung der Config
Signed-off-by: Yaruma3341 <yaruma3341@gmail.com>
2019-02-15 23:23:07 +01:00
15d25dfea9 Merge branch 'AkCommand-Cleanup' into 'master'
AkCommand Cleanup

Closes #1 and #2

See merge request Yaruma3341/fightsystem!1
2019-02-15 18:04:44 +01:00
068f089c9e Merge branch 'SpecSpawnPos' into 'master'
Added Spectator Spawn Position

See merge request Yaruma3341/fightsystem!2
2019-02-15 18:04:34 +01:00
lixfel
76bdd8e8b3 Added Spectator Spawn Position
Related to #4
Related to #8
2019-02-15 16:32:51 +01:00
lixfel
4aaba7a1de AkCommand Cleanup
Updating .gitignore
Closes #1
Closes #2
2019-02-15 16:16:38 +01:00
lixfel
9815dcd380 Gitignore for automatic ignoring of intellij files 2019-02-14 22:01:45 +01:00
946ddfc69a FightSystem hinzugefügt
Signed-off-by: Yaruma3341 <yaruma3341@gmail.com>
2019-02-14 19:21:51 +01:00
9474d68fb9 Initial commit 2019-02-14 18:37:38 +01:00