Shaun Bennett
2e49611035
LinkedHashMaps, Buttons
2015-12-08 17:45:27 -05:00
Shaun Bennett
7f75749194
Merge remote-tracking branch 'origin/master'
2015-12-08 16:55:14 -05:00
Cheese
26c5c419f8
fixed a bug where old displayName would be used after name was updated.
2015-12-09 08:38:05 +11:00
Sarah
484dce18e1
Changing some Achievement things, to allow double values and dividing, Adding WPM, fixing some bugs.
2015-12-08 22:34:42 +01:00
Cheese
fba88ec231
mount stuff is fixed
2015-12-09 08:19:55 +11:00
Virizion
8051486fcb
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-08 16:14:41 -05:00
William Burns
a83ede3caa
Handling slow movers
2015-12-08 21:14:19 +00:00
William Burns
7bdbd5a6af
Woo almost done!
2015-12-08 21:10:27 +00:00
Cheese
2decc049c5
fixed my muddling of perks
2015-12-09 07:47:07 +11:00
Cheese
09d8367b4b
fixed method
2015-12-09 07:32:36 +11:00
Christopher Jozsa
0b8e0409b6
Merge pull request #92 in MIN/mineplex from update-SSM to master
...
* commit '504a49278cb7e140029e4c2ceb85f3defe524a33':
SSM kit description change, grammar mistake
SSM Pig bomb bug fix
2015-12-08 14:29:32 -06:00
Shaun Bennett
ca71f1f64f
Merge remote-tracking branch 'origin/master'
2015-12-08 14:32:17 -05:00
William Burns
d598f83ec0
More progress
2015-12-08 18:17:43 +00:00
Teddy
504a49278c
SSM kit description change, grammar mistake
2015-12-08 16:35:49 +00:00
Teddy
2bf1012fa4
SSM Pig bomb bug fix
2015-12-08 16:34:07 +00:00
William Burns
f8f95c64e5
Fixing arena moving
2015-12-08 15:10:29 +00:00
Shaun Bennett
a1915e324c
Some java 8 code
2015-12-08 08:42:45 -05:00
William Burns
4e2a422f27
Merge branch 'master' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/PerkCowAngryHerd.java
2015-12-08 13:13:18 +00:00
William Burns
2b12016e14
Progress
2015-12-08 13:12:30 +00:00
Shaun Bennett
addb2c8c0e
Fix java 8 compiler issue
2015-12-08 08:02:40 -05:00
William Burns
cdc602a435
Merge branch 'master' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators
2015-12-08 10:55:57 +00:00
Shaun Bennett
89e8a7a2b5
Merge pull request #91 in MIN/mineplex from clans-beta to master
...
* commit 'b22c64ca6a5419e6b23abea1681cc750d15b6d37':
Fix excludes
2015-12-08 04:51:58 -06:00
Shaun Bennett
b22c64ca6a
Fix excludes
2015-12-08 05:51:21 -05:00
Shaun Bennett
ffbf76a125
Merge pull request #90 in MIN/mineplex from clans-beta to master
...
* commit 'a84f580719d1b221bbcaa49cd19d4251defa3b11':
Update IntelliJ to Java 8
2015-12-08 04:46:47 -06:00
Shaun Bennett
a84f580719
Update IntelliJ to Java 8
2015-12-08 05:45:26 -05:00
William Burns
99cf7ea22c
Merge branch 'master' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators
2015-12-08 10:44:43 +00:00
William Burns
e6d995008e
Arenas
2015-12-08 10:44:24 +00:00
Virizion
48a5776fb7
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-07 23:30:30 -05:00
Virizion
d22a905206
Lot more stuff! :D
2015-12-07 23:29:33 -05:00
Cheese
fe1f763374
changed order blocks will be added to the list
2015-12-08 15:26:32 +11:00
xGamingDudex
b1536547d3
Cosmetic Update 2
...
+ Item Coal
+ Freeze Cannon
+ Party Popper / Party Bomb
+ Snowball
+ Coal Fumes Particle
+ Snowman sneak trail/glide
+ Teaked stuff
2015-12-08 00:50:08 +01:00
Virizion
f837fd14db
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-07 18:45:42 -05:00
Cheese
719297ebb1
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-08 10:31:25 +11:00
Cheese
4ba2e8c96c
fixed old staff being stuck invis.
...
partially changed scoreboard to show playercount
2015-12-08 10:31:11 +11:00
Shaun Bennett
42a0354c9e
Now Playing, Preference to disable ads
2015-12-07 18:28:05 -05:00
William Burns
43192317ad
Merge branches 'pregametutorial' and 'william-gladiators' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators
2015-12-07 23:20:21 +00:00
William Burns
55f0453897
Start of re-write
2015-12-07 23:20:03 +00:00
Virizion
ec4a21a282
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-07 18:19:16 -05:00
Sarah
0619fb857f
fixing invisibility.
2015-12-07 23:44:02 +01:00
Shaun Bennett
8ff034fb5d
Merge pull request #89 in MIN/mineplex from clans-beta to master
...
* commit 'eed6966a5b39d1fc9544055a5b5801758a62a56a':
Winter MOTD, Stat fixes (maybe?!)
made use ability teleport player back to where they should be
Forgot to push these changes last update!
fixed tnt blowing up in claims when offline
fixed task not getting cleanup up after /skiptutorial
fixed /skiptutorial not working, and fixed tutorial thinking you're still in tutorial after finishing/cancelling/skipping
Fix heavy attribute, disable claim visualizer
Disable subtasks for now
Clans alpha 0.17
clan claim visualizer
fixed infinite claims
2015-12-07 12:22:10 -06:00
Shaun Bennett
eed6966a5b
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-12-07 13:21:17 -05:00
Shaun Bennett
c3ace42a68
Winter MOTD, Stat fixes (maybe?!)
2015-12-07 13:21:11 -05:00
Sarah
3f7eef35d5
Forcefield range.
2015-12-07 18:59:06 +01:00
Sarah
dfb1837e81
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java
2015-12-07 18:54:19 +01:00
Shaun Bennett
ffbb057d23
Merge pull request #88 in MIN/mineplex from iKeirNez_Bugfix to master
...
* commit '9bd7869e2260e23a0ff981b7084ff9b4a3768b43':
Fix typo, "_hubInvisibilityToggled" was checked twice, whilst "_hubIgnoreVelocityToggled" was not checked at all. This causes hub velocity changes to not be saved.
2015-12-07 11:25:17 -06:00
Shaun Bennett
7984c0ac31
Add !
2015-12-07 06:12:49 -05:00
Cheese
a39b11ce67
slowed meteors
2015-12-07 21:56:00 +11:00
Cheese
1fe6b5489a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-07 21:53:49 +11:00
Cheese
d318a5cf87
interacto!
2015-12-07 21:53:34 +11:00
Shaun Bennett
c6c012031f
Less ugly formatting
2015-12-07 04:44:19 -05:00
