Morten
|
5ca997f2a8
|
Merge branch 'BotspamImprovement' of http://184.154.0.242:7990/scm/min/mineplex into MortensRawBugFixes
# Conflicts:
# Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.core.prefs
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/PerkCowAngryHerd.java
|
2015-12-12 00:11:27 +01:00 |
|
Morten
|
cecc7d8141
|
Updated to JAVA 8... Weird bugs happened :(
|
2015-12-12 00:06:28 +01:00 |
|
Morten
|
bfaaf0a33b
|
Did some reguested bug fixed and challenge changes
|
2015-12-11 20:49:39 +01:00 |
|
Shaun Bennett
|
ac6d3c2c8f
|
merge with master
|
2015-12-11 06:27:23 -05:00 |
|
William Burns
|
523c1875ef
|
fix
|
2015-12-11 06:58:11 +00:00 |
|
Jonathan Williams
|
95a81ef368
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
|
2015-12-11 01:26:20 -05:00 |
|
Jonathan Williams
|
222173ab17
|
Improved and implemented GameProfile caching.
|
2015-12-11 01:24:59 -05:00 |
|
William Burns
|
a760dba783
|
i lied.
|
2015-12-11 02:59:16 +00:00 |
|
William Burns
|
7a597d90b7
|
final push goodnight
|
2015-12-11 02:48:06 +00:00 |
|
William Burns
|
1607345f04
|
title + debug
|
2015-12-11 02:41:44 +00:00 |
|
William Burns
|
563a0f0ec7
|
remove tutorial and no flicker
|
2015-12-11 02:30:44 +00:00 |
|
Shaun Bennett
|
2694787590
|
Reverting
|
2015-12-10 20:59:57 -05:00 |
|
William Burns
|
f8d7aeb5ea
|
before revert
|
2015-12-11 01:32:32 +00:00 |
|
William Burns
|
dda5ac6728
|
work
|
2015-12-11 01:20:36 +00:00 |
|
William Burns
|
626a812844
|
Many changes
|
2015-12-11 00:40:54 +00:00 |
|
William Burns
|
4cf33eef05
|
Tutorial changes!
|
2015-12-10 21:32:14 +00:00 |
|
William Burns
|
624e8bbe89
|
Merge branches 'pregametutorial' and 'william-gladiators' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators
|
2015-12-10 20:56:03 +00:00 |
|
William Burns
|
0bd276c16a
|
Merge branch 'pregametutorial' of ssh://184.154.0.242:25565/min/mineplex into pregametutorial
|
2015-12-10 20:53:01 +00:00 |
|
William Burns
|
8d7b03e3f6
|
Added the ability to have title AND subtitle per TutorialText.
|
2015-12-10 20:52:41 +00:00 |
|
William Burns
|
2951088005
|
Tutorial changes/additions.
|
2015-12-10 20:48:13 +00:00 |
|
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 |
|
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 |
|
Cheese
|
fabf3dab59
|
updated blocksearch
|
2015-12-10 13:12:01 +11: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 |
|
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 |
|
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 |
|
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 |
|
William Burns
|
f8f95c64e5
|
Fixing arena moving
|
2015-12-08 15:10:29 +00: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 |
|