Archiviert
13
0
Commit graph

150 Commits

Autor SHA1 Nachricht Datum
Chaoscaot
1206f4d75e Reverting RabbitListener.java 2021-04-06 01:56:37 +02:00
Chaoscaot
e805563f70 Revert "Kapito? Rabbito!"
This reverts commit 38f826de
2021-04-06 01:54:53 +02:00
Chaoscaot
4abe76b15c Revert "Adding more Eggs and more Rabbits"
This reverts commit a652a8f8
2021-04-06 01:54:53 +02:00
Chaoscaot
960f2f3395 Revert "Fixing Enderpearls"
This reverts commit e3952abe
2021-04-06 01:54:53 +02:00
Chaoscaot
e63e48a2a7 Revert "Fixing Rabbits"
This reverts commit 91f58029
2021-04-06 01:54:53 +02:00
24e9214414 Merge branch 'master' into rabbitos 2021-04-04 17:18:59 +02:00
Chaoscaot
91f58029b8 Fixing Rabbits 2021-04-04 17:12:04 +02:00
Chaoscaot
e3952abe6f Fixing Enderpearls 2021-04-03 23:38:07 +02:00
37a7d2b430 Merge pull request 'Kapito? Rabbito!' (#26) from rabbitos into master
Reviewed-on: #26
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2021-04-03 22:57:04 +02:00
Chaoscaot
0f06b5ff20 Fixing Rabbits 2021-04-03 20:30:05 +02:00
Chaoscaot
a652a8f83e Adding more Eggs and more Rabbits 2021-04-03 15:09:11 +02:00
Chaoscaot
38f826dede Kapito? Rabbito! 2021-04-02 18:24:30 +02:00
0ddb33b06b Merge pull request 'Particle' (#21) from Particle into master
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
2021-02-23 17:47:53 +01:00
jojo
b187221910 Simplify ParticleInventory 2021-02-23 17:40:08 +01:00
jojo
f64b60bb58 Fix Copyright notice 2021-02-23 11:51:18 +01:00
jojo
4d5abbf8e1 Fix Copyright notice 2021-02-23 11:40:20 +01:00
jojo
687f498543 Simplify ParticleInventory 2021-02-23 11:37:54 +01:00
jojo
e56da0ba68 Merge branch 'master' into Particle
# Conflicts:
#	src/de/steamwar/lobby/utils/LobbyPlayer.java
2021-02-05 18:25:00 +01:00
jojo
819855d78f Fix PlayerMoveListener 2021-01-10 03:32:32 +01:00
jojo
256e59be69 Add ParticleInventory.loreBuilder 2021-01-09 12:33:15 +01:00
jojo
19cf849bf7 Add DoubleCircleParticle
Add CloudParticle
Add more particles
2021-01-08 21:28:02 +01:00
1251c65eaf Merge pull request 'Fix Border with Enderpearl' (#23) from Border into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2021-01-08 17:47:07 +01:00
jojo
633c182cfa Fix Border with Enderpearl 2021-01-08 17:32:49 +01:00
jojo
a0498ce794 Add CloudCircleParticle 2021-01-08 15:58:43 +01:00
jojo
d44bb520d4 Add CloudParticle
Add ParticleInventory.teamParticles
Add ParticleInventory.serverteamParticles
2021-01-08 13:03:39 +01:00
jojo
3d6c9b267f Implement new ParticleInventory 2021-01-03 15:36:23 +01:00
jojo
0f5b978b62 Hotix Border 2021-01-02 15:05:32 +01:00
jojo
cbae04d39c Hotix Border 2021-01-02 15:00:17 +01:00
jojo
1dcc2335c5 Hotix Border 2021-01-02 14:58:51 +01:00
98b25650e4 Merge pull request 'Fix Border' (#22) from Border into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2021-01-02 14:51:48 +01:00
jojo
e7c9b72c39 Fix Border 2021-01-01 00:18:59 +01:00
f6c2cf92fc Merge pull request 'Add Seats' (#20) from Seats into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-12-30 16:20:49 +01:00
jojo
a8dfa3fdac Merge branch 'master' into Seats 2020-12-30 16:20:09 +01:00
b895159ee7 Merge pull request 'Fly-Command' (#18) from Fly-Command into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-12-30 16:04:13 +01:00
jojo
8d1297dec5 Rename LobbyPlayer.hasFly() -> isFlying() 2020-12-30 16:00:49 +01:00
jojo
6f04d2b811 Add CircleParticle
Add FireRing particle
2020-12-30 10:29:52 +01:00
jojo
fecaa21f08 Add FunctionalParticle
Add ParticleFunction
Add SimpleParticle
Add SpecialParticle
2020-12-30 10:22:42 +01:00
jojo
2dd555b688 Add Seats 2020-12-30 10:14:43 +01:00
jojo
e493f3cfe6 Update PlayerConnectionListener
Update LobbyPlayer.isFly()
2020-12-30 10:07:07 +01:00
jojo
1ac71d24bd Merge branch 'master' into Fly-Command
# Conflicts:
#	src/de/steamwar/lobby/utils/LobbyPlayer.java
2020-12-30 10:05:40 +01:00
f0a9979ab9 Merge pull request 'Remove border teleport to spawn' (#17) from Border into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-12-30 10:03:34 +01:00
cb93ce4bf6 Merge pull request 'Remove PlayerHider' (#19) from PlayerHider into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-12-30 10:03:19 +01:00
jojo
02e1fb4ccb Remove border teleport to spawn 2020-12-29 21:58:45 +01:00
jojo
c9f1e3be29 Add DoubleJumpListener fly detection 2020-12-29 21:55:46 +01:00
jojo
d9217984db Add DoubleJumpListener fly detection 2020-12-29 21:55:21 +01:00
jojo
0263c2eebe Add cancel to fly kick Detection 2020-12-29 21:54:07 +01:00
jojo
d91286542e Remove PlayerHider 2020-12-29 21:53:07 +01:00
jojo
4b6276f40a Add Fly Command 2020-12-29 21:50:44 +01:00
jojo
70652aa6fe Revert to before ParticleInventory changes 2020-10-25 08:49:42 +01:00
jojo
008fe4f817 Merge remote-tracking branch 'origin/master' 2020-10-25 08:47:53 +01:00