Thanos paravantis
2773518e30
Merge branch 'MortensRawBugFixes' of http://184.154.0.242:7990/scm/min/mineplex into MortensRawBugFixes
2015-12-12 10:12:42 +02:00
Morten
bfaaf0a33b
Did some reguested bug fixed and challenge changes
2015-12-11 20:49:39 +01:00
Thanos paravantis
0c85e5d199
Merge branch 'MortensRawBugFixes' of http://184.154.0.242:7990/scm/min/mineplex into MortensRawBugFixes
2015-12-05 22:53:51 +02:00
Morten
e8f7b140df
Added Achievements and fixed bugs.
2015-12-05 21:47:13 +01:00
Thanos paravantis
ec01940dde
Merge branch 'MortensRawBugFixes' of http://184.154.0.242:7990/scm/min/mineplex into MortensRawBugFixes
2015-11-25 23:12:52 +02:00
Morten
ccaa86662c
Added a bunch of changes + another game
2015-11-22 18:58:07 +01:00
Morten
0a907fb661
Final stable version reached. All challenges work as intented.
...
Now I will start working on the scoreboard and possibly some kits?
Thanos will continue with some challenge creations. But we are approaching
the final version of Mineware
2015-11-14 15:01:04 +01:00
Morten
e28878eec2
Quick update
2015-11-11 20:23:34 +01:00
Morten
148a4e9425
Merge branch 'master' into MortensRawBugFixes
2015-11-10 17:16:00 +01:00
Morten
2ef32a14df
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.core.prefs
# Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.ui.prefs
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/holeinwall/Wall.java
2015-11-10 17:15:23 +01:00
Morten
2128a0d711
Updating to 1.8... sigh
2015-11-10 17:13:27 +01:00
libraryaddict
6983af944f
Fix a craftbukkit bug
2015-11-11 00:25:20 +13:00
libraryaddict
37fdf53a51
Fixed champion's Illusion crash
2015-11-11 00:21:28 +13:00
libraryaddict
1a2c163ce2
Fix scoreboard out of bounds error
2015-11-11 00:03:08 +13:00
Jonathan Williams
6e90052480
Updated StaffServer to 1.8
2015-11-10 02:01:39 -06:00
Shaun Bennett
2707173a8b
Merge with 1.8 Branch
2015-11-10 01:48:33 -05:00
Jonathan Williams
5c89124eb6
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-09 03:25:02 -06:00
Jonathan Williams
ba7d5bbcdc
Fixed Arcade!
2015-11-09 03:24:20 -06:00
Shaun Bennett
ec3427bcc0
Giveaway manager bug fix
2015-11-09 04:08:26 -05:00
Shaun Bennett
05b52614fe
Forgot to remove debug code for testing
2015-11-09 03:49:12 -05:00
Shaun Bennett
2eaa326929
Merge remote-tracking branch 'origin/master'
2015-11-09 03:27:50 -05:00
Shaun Bennett
2c54e9e59a
Giveaway extras
2015-11-09 03:27:42 -05:00
Jonathan Williams
fb4978305f
Fixed up EnjinTranslator
...
Added extra overload for inventoryManager if you have the accountId already.
2015-11-09 02:26:45 -06:00
Shaun Bennett
2a7b272de3
Merge remote-tracking branch 'origin/master'
2015-11-09 01:55:36 -05:00
Jonathan Williams
283a774e03
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-09 00:04:55 -06:00
Jonathan Williams
4915ebc5ad
Added Purchase logging manager for Enjin.
...
Added extra callback method for SaveRank.
2015-11-09 00:04:38 -06:00
Jonathan Williams
ff936784d3
Remove debug code.
2015-11-08 17:27:00 -06:00
Jonathan Williams
e86623c8d0
Disabled TrickOrTreatManager to test for Lobby lockups.
2015-11-08 17:26:43 -06:00
Jonathan Williams
fd3ccf7ce0
Fix Bungee lobby balancer code.
2015-11-08 17:25:54 -06:00
libraryaddict
d466005c35
Fix custom names not changing
2015-11-09 05:08:08 +13:00
libraryaddict
752d8152d2
Merge pull request #72 in MIN/mineplex from iKeirNez_Bugfix to master
...
* commit '783bec75db7592dc191698b8dfbb89be08a818aa':
Fix for some preferences not applying correctly.
2015-11-08 08:23:20 -06:00
libraryaddict
1999e09e69
Update CB
2015-11-09 02:44:16 +13:00
Morten
3b641d46bb
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex
2015-11-08 14:33:53 +01:00
Morten
1958fa9f5e
quick save
2015-11-08 14:31:56 +01:00
libraryaddict
ce3af6cf9c
Update cb.jar
2015-11-09 00:15:28 +13:00
libraryaddict
e039f2249c
Update cb
2015-11-08 18:02:36 +13:00
libraryaddict
c4d6bcba02
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
2015-11-08 17:56:34 +13:00
Shaun Bennett
3c82574386
Testing pushing/ignore this
2015-11-07 20:02:07 -05:00
Shaun Bennett
bf97cf5d77
Remove debug code
2015-11-07 13:53:34 -05:00
Morten
a905726544
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex
2015-11-07 16:44:00 +01:00
Morten
d4bd1d7f93
Added Chiss' suggestions and fixed up pretty much everything
...
This is a stable version, I just need Thanos to send me his
final changes on his games
2015-11-07 16:36:22 +01:00
libraryaddict
79d0466355
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2015-11-07 21:36:36 +13:00
libraryaddict
627ce08113
Add info on note particle
2015-11-07 21:35:26 +13:00
Shaun Bennett
e1f56a5d5a
Merge remote-tracking branch 'origin/master'
2015-11-07 01:10:34 -05:00
Shaun Bennett
ec7600a4a2
Giveaway tweaks
2015-11-07 01:10:27 -05:00
Cheese
c922c3248c
disabled trick or treat
2015-11-07 13:36:16 +11:00
Cheese
f4bf685e96
removed halloween hub
...
removed titan giveaway and pumpkins
2015-11-07 13:20:29 +11:00
Shaun Bennett
4add7449eb
Merge remote-tracking branch 'origin/master'
2015-11-06 21:15:45 -05:00
Shaun Bennett
3893617d58
Logitech Giveaway (still needs testing)
2015-11-06 21:15:37 -05:00
Keir
783bec75db
Fix for some preferences not applying correctly.
2015-11-06 23:04:51 +00:00
