SteamWar/FightSystem
Archiviert
13
1
Commit graph

173 Commits

Autor SHA1 Nachricht Datum
209f1ba88a fixed some bugs; added kit to fightplayer; reworked schematic list; updated KitManager
Signed-off-by: Yaruma3341 <yaruma3341@gmail.com>
2019-04-08 19:30:23 +02:00
lixfel
6034252d67 Small Changes 2019-04-05 20:13:42 +02:00
lixfel
95975c5e96 Schematic Paste + Config refactor 2019-04-05 19:32:59 +02:00
lixfel
07813dec0a Cleanup 2019-04-05 08:14:10 +02:00
27691a6a43 finished basics of Kit System (not tested)
Signed-off-by: Yaruma3341 <yaruma3341@gmail.com>
2019-04-04 21:12:21 +02:00
02d25dfcfa finished basics of Kit System (not tested)
Signed-off-by: Yaruma3341 <yaruma3341@gmail.com>
2019-03-27 15:22:28 +01:00
9c638e9b3d started coding Kit System
Signed-off-by: Yaruma3341 <yaruma3341@gmail.com>
2019-03-26 22:59:47 +01:00
c76cac319e Merge branch 'lixfel' into 'master'
Fixes, Fixes, Fixes

See merge request Yaruma3341/fightsystem!9
2019-03-26 16:40:19 +01:00
lixfel
140959cdbd Fixes + Automatic Inspection Cleanup run (potentially something broken) 2019-03-26 12:33:33 +01:00
lixfel
9b9da7ff6c Fixes, Fixes, Fixes 2019-03-26 12:00:56 +01:00
d22ab0669e bug fixes
Signed-off-by: Yaruma3341 <yaruma3341@gmail.com>
2019-03-25 22:04:02 +01:00
872f57cff4 bug fixes
Signed-off-by: Yaruma3341 <yaruma3341@gmail.com>
2019-03-25 17:05:33 +01:00
cd5399d1a8 bug fixes
Signed-off-by: Yaruma3341 <yaruma3341@gmail.com>
2019-03-24 21:54:01 +01:00
lixfel
6e73add3ac Removing out 2019-03-24 21:30:27 +01:00
58ae2c9912 made it more modular; fixed some bugs and null pointers
Signed-off-by: Yaruma3341 <yaruma3341@gmail.com>
2019-03-24 00:45:48 +01:00
ab9dc24bc2 made it more modular; fixed some bugs and null pointers
Signed-off-by: Yaruma3341 <yaruma3341@gmail.com>
2019-03-24 00:43:05 +01:00
2676e6e125 syncronized
Signed-off-by: Yaruma3341 <yaruma3341@gmail.com>
2019-03-09 19:40:12 +01:00
4605e1f3f7 .
Signed-off-by: Yaruma3341 <yaruma3341@gmail.com>
2019-03-06 17:28:04 +01:00
3d8b05df34 Added another water remover
Signed-off-by: Yaruma3341 <yaruma3341@gmail.com>
2019-03-06 17:25:04 +01:00
2ed9685aa4 Added another water remover
Signed-off-by: Yaruma3341 <yaruma3341@gmail.com>
2019-03-06 17:09:14 +01:00
6d67cd7f6f Added Listener for Water Remover
Signed-off-by: Yaruma3341 <yaruma3341@gmail.com>
2019-03-02 14:51:36 +01:00
ed14b52948 Added Water Remover
Signed-off-by: Yaruma3341 <yaruma3341@gmail.com>
2019-03-02 13:31:07 +01:00
5fdfa6e598 Added Kits
Signed-off-by: Yaruma3341 <yaruma3341@gmail.com>
2019-03-02 11:30:15 +01:00
30eace7a05 Not stable version
Signed-off-by: Yaruma3341 <yaruma3341@gmail.com>
2019-02-25 18:42:51 +01:00
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