Commit Graph

1638 Commits

Author SHA1 Message Date
Mysticate 365968f41d Added a bomb token thing 2015-07-23 16:26:43 -04:00
Mysticate 06d4de16cf Changed particle methods 2015-07-23 13:34:11 -04:00
Mysticate e638674444 Fixed fuse on detonator 2015-07-22 20:17:19 -04:00
Mysticate b9762bddc4 Fixes 2015-07-22 16:50:57 -04:00
Mysticate b4df9f47c5 Added a mortar kit ;o (Please don't fire me b2) 2015-07-21 11:01:45 -04:00
Mysticate 8b2b4c2826 Added to MPS 2015-07-19 15:51:34 -04:00
Mysticate 2dc2b8792c Fixes, updates 2015-07-17 17:01:24 -04:00
Mysticate 1e1cf6403d Added achievements 2015-07-14 13:31:41 -04:00
Mysticate df60659786 Core edits 2015-07-13 12:14:25 -04:00
Mysticate 616c444c16 Added some things and stuff 2015-07-12 18:15:33 -04:00
Mysticate 0a09ae29f3 Merge remote-tracking branch 'origin/master' into BombLobbers 2015-07-12 18:14:25 -04:00
Mysticate d0180910e9 Added two new kits. 2015-07-11 10:25:04 -04:00
Mysticate 0353b8571d Merge branch 'BombLobbers' of http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into BombLobbers 2015-07-10 16:41:29 -04:00
Mysticate f812fd0530 Please push please 2015-07-10 16:31:37 -04:00
Mysticate 9e07be51c7 Bug fixes 2015-07-09 12:03:56 -04:00
Mysticate 1b3d7f1c20 Fixed and added things 2015-07-08 23:57:48 -04:00
Cheese 49daf597b5 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-07-09 12:47:57 +10:00
Cheese 7d073fdc0d fixed skywars icon
changed LOSSES to GAMESPLAYED for consistency
2015-07-09 12:47:40 +10:00
libraryaddict 7e3fdef2e8 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-07-08 18:43:56 +12:00
libraryaddict 1f250bf951 MineWare: Add current progress 2015-07-08 18:43:37 +12:00
Ben Sihota ca880371a6 Merge remote-tracking branch 'origin/master' 2015-07-07 21:19:43 -07:00
Cheese 480a29b874 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-07-08 13:55:16 +10:00
Cheese e36b0440a4 Merge branch 'bench'
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilText.java
	Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java
	Plugins/Mineplex.StaffServer/.classpath
2015-07-08 13:55:01 +10:00
Ben Sihota ffbee4a9aa Add more details to /game
Fix NPE with /game set
2015-07-07 18:20:27 -07:00
libraryaddict 9eff5b7245 Perks: Forgot to include this in last commit, no harm done. 2015-07-08 07:51:33 +12: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
Shaun Bennett 6c8c3946a3 Revert "Add IntelliJ IDE library files"
This reverts commit 71d696278d.
2015-07-06 17:06:29 -05:00
Ben Sihota 71d696278d Add IntelliJ IDE library files 2015-07-06 13:48:47 -07:00
libraryaddict 3d0dda382b Stacker: Fixed an infinite loop 2015-07-06 07:07:19 +12:00
Cheese 1e26ebe0bd disabled ice forming 2015-07-02 10:09:39 +10:00
Cheese 0100ca1b8c fixed a derp bug 2015-07-02 09:41:33 +10:00
Cheese dd9fc8e7c6 bridge speed increase 2015-07-01 15:14:46 +10:00
Cheese 0650b73374 more bridge tweaks 2015-07-01 14:16:56 +10:00
Cheese 190e58c37e bridges update 2015-07-01 12:58:54 +10:00
Cheese de36e3d8e4 added WATER_DAMAGE support for maps
modified some bridges code
2015-07-01 00:18:06 +10:00
Cheese e3d060376b disabled double gem 2015-06-30 13:10:08 +10:00
fooify 4ff456b722 Merge remote-tracking branch 'origin/master' into foo 2015-06-29 11:29:22 -07:00
Cheese 48f5fa118a fixed a few sky bugs 2015-06-29 14:26:00 +10:00
Cheese b0f8369bcd lowered block falling speed.
fixed a bug where some chests didnt fall
2015-06-29 10:09:36 +10:00
Cheese ead402d026 skywars art 2015-06-28 14:31:25 +10:00
Cheese 08e4ef199e added twitch to dguisecmd 2015-06-28 12:53:18 +10:00
Cheese faca14dd23 fixed disguise permission 2015-06-28 12:50:27 +10:00
Cheese 840ebabf2a added delay on mad scientist eggSpawn
fixed Exp bug
2015-06-27 20:39:05 +10:00
Cheese 1f34bc40a3 increased time you can hold TNT for in CS 2015-06-27 14:08:16 +10:00
Cheese 4c164ce2a6 enabled double gems 2015-06-27 12:44:43 +10:00
Cheese d0368a19d8 Players who quit early do not get full game worth of EXP. 2015-06-27 12:38:04 +10:00
Cheese 754026f403 chicken teleport fix
scientist minion name fix
2015-06-27 12:18:12 +10:00
Cheese 4183d6f21d some balance 2015-06-27 11:40:40 +10:00
Cheese 4e06a1aae3 fixed a few skywars bugs
improved warning for bridges
2015-06-27 11:24:01 +10:00
fooify 4b634d1bc3 Fix slashes (this won't affect windows users, right?) 2015-06-26 10:14:37 -07:00