Sarah
|
dab2416ccd
|
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
|
2015-12-19 00:49:16 +01:00 |
|
Sarah
|
4e9e0243cd
|
Merge branch 'develop' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
# Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java
|
2015-12-16 18:16:08 +01:00 |
|
Sarah
|
afa45c47ca
|
Merge branch 'develop' of http://184.154.0.242:7990/scm/min/mineplex into pregametutorial
|
2015-12-14 14:23:42 +01:00 |
|
xGamingDudex
|
6d1e4b6cab
|
Merge remote-tracking branch 'origin/master' into project-cosmetics
|
2015-12-11 18:09:09 +01:00 |
|
Shaun Bennett
|
ac6d3c2c8f
|
merge with master
|
2015-12-11 06:27:23 -05:00 |
|
Sarah
|
ffb75a7832
|
Adding CustomEnding
|
2015-12-11 01:44:19 +01:00 |
|
Shaun Bennett
|
72a8aaf556
|
Merge remote-tracking branch 'remotes/origin/master' into project-cosmetics
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
|
2015-12-10 19:18:49 -05: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 |
|
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 |
|
Sarah
|
a5c46545df
|
fixing timer being shown.
|
2015-12-09 14:44:22 +01: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 |
|
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 |
|
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 |
|
Cheese
|
e1efcabfbf
|
chat sale msgs
|
2015-12-07 20:39:31 +11:00 |
|
Cheese
|
7b11baf24b
|
Christmas sale bossbars
|
2015-12-07 20:20:49 +11:00 |
|
Cheese
|
8c4615203c
|
sale message
|
2015-12-07 20:07:20 +11:00 |
|
Sarah
|
10d26ca32b
|
timer fixes.
|
2015-12-06 22:41:04 +01:00 |
|
Cheese
|
4a53667539
|
gadget restructure
converted frost lord and titan particles into 4 subcategories.
|
2015-12-05 10:22:00 +11:00 |
|
Sarah
|
19254fc4a0
|
Prepare Timer flag.
|
2015-12-03 18:06:27 +01:00 |
|
Sarah
|
063299ab3a
|
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
|
2015-11-26 00:23:02 +01:00 |
|
Sarah
|
809faf3098
|
changing teleport mechanic.
|
2015-11-26 00:14:15 +01:00 |
|
Sarah
|
49f6679537
|
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-11-24 15:43:59 +01:00 |
|
Sarah
|
66598ce97e
|
adding teleport flag.
|
2015-11-23 16:16:33 +01:00 |
|
Sarah
|
171696ff0d
|
final tutorial implementation.
|
2015-11-21 18:24:17 +01:00 |
|
Sarah
|
15032ac7ff
|
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
|
2015-11-21 18:19:12 +01:00 |
|
Sarah
|
cba5aef9f1
|
small fix
|
2015-11-21 18:18:13 +01:00 |
|
Sarah
|
e10a63254a
|
saving typewars state
|
2015-11-21 18:16:24 +01:00 |
|
Sarah
|
d0b5f6d8ac
|
starting implementation of Type wars tutorial.
|
2015-11-21 16:56:56 +01:00 |
|
Sarah
|
01f67e9d3e
|
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
|
2015-11-21 16:37:49 +01:00 |
|
Sarah
|
97471b0d9c
|
Finalizing Game Tutorials.
|
2015-11-20 23:38:02 +01:00 |
|
Sarah
|
a8ba1f1ea6
|
some perspektive changes to the tutorial and removing prepare timer.
|
2015-11-18 22:33:47 +01:00 |
|
Shaun Bennett
|
0b41450603
|
Revert "Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta""
This reverts commit 6c17b2926c .
|
2015-11-12 17:51:13 -05:00 |
|
Shaun Bennett
|
6c17b2926c
|
Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta"
This reverts commit ce1c09b88f , reversing
changes made to 1aef7fe0b9 .
|
2015-11-12 16:35:31 -05:00 |
|
NewGarbo
|
ce1c09b88f
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
Conflicts:
Plugins/.idea/compiler.xml
Plugins/Classpath.Dummy/src/net/minecraft/server/v1_7_R4/PacketPlayOutPlayerInfo.java
Plugins/Libraries/craftbukkit.jar
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilParticle.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java
Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java
Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java
Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketVerifier.java
Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java
Plugins/Mineplex.Core/src/mineplex/core/shop/page/ShopPageBase.java
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Illusion.java
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/ItemFactory.java
Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/explosion/CustomExplosion.java
|
2015-11-11 19:35:44 +00:00 |
|
libraryaddict
|
14a524cf54
|
Stuff
|
2015-10-17 00:08:30 +13:00 |
|
Ty Sayers
|
a9f5197c64
|
Merge branch 'clans/world-events' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
Plugins/Mineplex.Database/src/mineplex/database/Account.java
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/BlockToss.java
|
2015-08-22 15:18:51 -04:00 |
|
Mini-Chiss
|
d6f17c609b
|
carl
|
2015-08-12 08:58:46 +02:00 |
|
Mini-Chiss
|
7cda53cb28
|
carl spinner in arcade/
tutorial fixes
|
2015-08-12 08:36:21 +02:00 |
|
William Burns
|
956d685549
|
Added MPS Game Voting.
|
2015-07-24 20:24:21 +01:00 |
|
Shaun Bennett
|
2b2e5e5c97
|
Spelling fixes + Observer mode
|
2015-07-16 15:51:21 -05:00 |
|
libraryaddict
|
bff3897fab
|
Perks and kits: Change priority for unregistering to high, add new method to Perk firing when perk listener is registered.
|
2015-07-07 12:30:20 +12:00 |
|
Mini-Chiss
|
e13e735246
|
UHC updates!
|
2015-05-12 14:46:21 -05:00 |
|
Mini-Chiss
|
123af16bd2
|
UHC map gen
|
2015-05-11 13:25:05 -05:00 |
|
Mini-Chiss
|
5ec60d234a
|
UHC changes
|
2015-05-11 12:27:43 -05:00 |
|
Mini-Chiss
|
9b0736816b
|
UHC changes
abstracted out some common attribs
|
2015-05-11 12:21:32 -05:00 |
|
libraryaddict
|
1f0e204eb3
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SurvivalGames
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/subclasses/HealingRune.java
|
2015-03-18 00:04:41 +13:00 |
|
libraryaddict
|
f12d0bf9ef
|
Allow disabling of game start sounds, and changing of the game PrepareTime.
|
2015-03-17 23:52:58 +13:00 |
|
Cheese
|
3ceb0ff678
|
Converted spec away from CREATIVE
|
2015-03-12 15:31:40 +11:00 |
|
Cheese
|
0336df55aa
|
Event update
|
2015-03-06 19:43:17 +11:00 |
|