William Burns
|
3586642414
|
Added back the tutorial.
|
2015-12-10 19:32:25 +00:00 |
|
William Burns
|
af7c058f22
|
Lots of bug fixes / additions since the testing 12/9/15.
|
2015-12-10 19:06:07 +00:00 |
|
Sarah
|
0f8028f6e6
|
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-10 12:24:11 +01:00 |
|
libraryaddict
|
1ee1e7a04b
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-12-10 20:02:39 +13:00 |
|
libraryaddict
|
eaf3937004
|
Fix the damage while walking on falling block
|
2015-12-10 20:02:12 +13:00 |
|
Virizion
|
0e9d401717
|
Restore block when break is cancelled because it can be in the air phase and not get restored.
|
2015-12-09 22:32:39 -05:00 |
|
Virizion
|
9b53e15b4f
|
More stuff.
|
2015-12-09 21:38:00 -05:00 |
|
Virizion
|
662d3b464f
|
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
|
2015-12-09 21:15:39 -05:00 |
|
Virizion
|
0ff87cf134
|
Stuff.
|
2015-12-09 21:14:45 -05:00 |
|
Cheese
|
fabf3dab59
|
updated blocksearch
|
2015-12-10 13:12:01 +11:00 |
|
Sarah
|
c94c84f203
|
Some fixes
|
2015-12-10 02:59:22 +01:00 |
|
Sarah
|
76b29756ff
|
Fixing some stats and disabling Chat spam messages.
|
2015-12-10 02:02:36 +01:00 |
|
Virizion
|
be6f9ac6dc
|
Capitalize enum names.
|
2015-12-09 19:17:12 -05:00 |
|
William Burns
|
87a834c01b
|
FIX
|
2015-12-10 00:03:57 +00:00 |
|
William Burns
|
90896073d4
|
debug
|
2015-12-10 00:03:17 +00:00 |
|
William Burns
|
cea2716851
|
fight man
|
2015-12-09 23:59:20 +00:00 |
|
William Burns
|
05bd55f720
|
iter
|
2015-12-09 23:53:04 +00:00 |
|
William Burns
|
b8a2304edd
|
work
|
2015-12-09 23:39:00 +00:00 |
|
William Burns
|
3ad0a3db6e
|
fix
|
2015-12-09 23:14:08 +00:00 |
|
William Burns
|
17c989d941
|
Less per-player arena stuff
|
2015-12-09 22:39:04 +00:00 |
|
William Burns
|
513db5dd8d
|
doing byes
|
2015-12-09 21:33:31 +00:00 |
|
William Burns
|
852be97bae
|
Work
|
2015-12-09 20:16:16 +00:00 |
|
Sarah
|
a5c46545df
|
fixing timer being shown.
|
2015-12-09 14:44:22 +01:00 |
|
NewGarbo
|
667f076202
|
fixed unsafe timer
|
2015-12-09 10:46:05 +00:00 |
|
Virizion
|
507761d5b0
|
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
|
2015-12-08 21:24:21 -05:00 |
|
William Burns
|
c021fbf9ed
|
Bounce baby bounce.
|
2015-12-08 23:27:38 +00:00 |
|
William Burns
|
d709071feb
|
Much fix, many wow.
|
2015-12-08 23:20:42 +00:00 |
|
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 |
|