Mysticate
71408fabd2
One thing.
2015-09-23 15:24:34 -04:00
Mysticate
81e780d400
Merge branch 'monster-maze' of
...
http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into
monster-maze
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/MMMazes.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/Maze.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/MonsterMaze.java
2015-09-23 15:23:08 -04:00
Mysticate
84331901d4
Added achievements and final polish.
2015-09-23 15:18:44 -04:00
AlexTheCoder
d5ef15cd6d
- Trying to fix errors
2015-09-23 14:00:19 -04:00
AlexTheCoder
09e44d3372
- Fixed version stuff
2015-09-23 13:47:49 -04:00
AlexTheCoder
3ee6c5c7c8
- Fix Merge Error
2015-09-23 13:25:41 -04:00
AlexTheCoder
c709980db3
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2015-09-23 13:08:25 -04:00
AlexTheCoder
512714219b
- Visual edits
2015-09-23 13:04:30 -04:00
fooify
0ad91a6b0b
more changes! :D
2015-09-23 07:10:48 -07:00
Cheese
4519f2dda1
Merge branch 'EventGameUpdates'
2015-09-22 14:59:17 +10:00
fooify
1f84907309
more changes to monstermaze
2015-09-20 07:40:24 -07:00
AlexTheCoder
05f47be864
- Some fixes
2015-09-19 16:38:07 -04:00
AlexTheCoder
3a1acb9f37
- Code Cleanup
...
- Transitioning to banners fully
- Preparation to remove banner bugs
2015-09-19 00:41:23 -04:00
AlexTheCoder
52a5c63166
Merge branch 'alex-ctf' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
2015-09-18 20:08:43 -04:00
AlexTheCoder
d4b8cb253c
- Edited messages as per owner request
2015-09-18 20:08:22 -04:00
libraryaddict
8015f5428d
Flags stuff
2015-09-19 08:36:23 +12:00
fooify
0581474a16
lots of work on Monster Maze
2015-09-18 08:25:11 -07:00
Cheese
aa30c866fd
flurrry
2015-09-18 10:22:16 +10:00
libraryaddict
5e8fc77164
Add pages to spectator and in-progress server menu
2015-09-17 04:34:45 +12:00
AlexTheCoder
e6ecd2d5e1
- Fix for stolen message
2015-09-15 18:38:02 -04:00
Sarah
362d99a819
Fixing up Gem signs, Effects etc.
2015-09-15 07:10:39 +02:00
AlexTheCoder
6c5c2f4c4e
- Added slowness to flag carriers and removed any active potion effects they had
2015-09-14 20:38:32 -04:00
AlexTheCoder
0035f3abb0
- Added requested flag location updating
...
- Added sudden death mode when the timer runs out and the game is tied, respawning is turned off and the first to capture a flag wins
2015-09-14 18:54:40 -04:00
AlexTheCoder
2018374b06
- Fixed a color bug
2015-09-14 18:53:10 -04:00
AlexTheCoder
abaf94618c
- Increase flag respawn time
...
- Fix flag timer being black
2015-09-14 18:42:08 -04:00
Cheese
ac269839c5
squid skill
2015-09-14 14:14:06 +10:00
Cheese
d9142ac33f
smash balance
2015-09-14 12:34:55 +10:00
fooify
2de7fff267
Merge remote-tracking branch 'origin/master' into monster-maze
2015-09-13 08:45:34 -07:00
fooify
aa8cb8943e
more work on monster maze
2015-09-13 08:42:26 -07:00
Sarah
7ca6f58108
Adding Gem signs.
2015-09-13 10:25:44 +02:00
Sarah
a46cb2c274
last fix in the listAreaInfo method.
2015-09-13 00:35:22 +02:00
Sarah
53d5c2fd0e
adding area info command.
2015-09-13 00:30:55 +02:00
Sarah
112f94a842
forgot to add command to remove potion effects.
2015-09-13 00:00:47 +02:00
Sarah
fcec6253cd
fixing @p on signs, adding potioneffects and gadgets to areas.
2015-09-12 23:56:38 +02:00
Sarah
b6ffee73f5
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into EventGameUpdates
2015-09-12 21:17:45 +02:00
fooify
55ac104e2c
took forever to get it working, but the maze parsing works! :)
2015-09-12 09:50:06 -07:00
Cheese
119dc8ab52
changed name of method
2015-09-12 15:01:18 +10:00
Sarah
5c0ada3df6
Implementing RequiredRank file and command.
2015-09-12 06:39:40 +02:00
Sarah
b56813deef
Improving /e commands (/e kick, /e area, etc)
2015-09-12 04:33:10 +02:00
fooify
5824ec6df0
lots of changes to monster maze, check trello for list
2015-09-07 07:08:00 -07:00
Sarah
4240026024
Adding Areas and a few more commands like /e kick and /e tempgadget to the event game.
2015-09-06 18:55:00 +02:00
Sarah
5712af8ddc
Adding Redstone function signs for events.
2015-09-05 20:38:51 +02:00
fooify
c648d7c186
stuff, things...things, stuff (Monster Maze)
2015-09-05 09:30:51 -07:00
fooify
9e3f87b71e
more edits to MM
...
- displaying more information
- permanent safezones around the map
- spawn now does not deteriorate, is permanent
2015-09-05 06:41:10 -07:00
Mysticate
271b86dabd
Fixed spectators slowing evolution times.
2015-09-04 11:45:42 -04:00
Cheese
03537e4650
fixed a spacing issue
2015-09-04 12:18:02 +10:00
Cheese
0ec3a8dc10
added radar for ctf and dom
2015-09-04 12:09:26 +10:00
Mysticate
0c58de3c19
Glitches. Fixed the things.
2015-09-01 02:35:06 -04:00
Mysticate
b4ce33a916
Fixed things.
...
• Added a cancelled check to No Ability
• Removed tokens on quit.
• Checked if players are alive before giving them places.
2015-09-01 01:59:36 -04:00
AlexTheCoder
bff9c99e2c
Added system to mount flags on carrier's head for easier identification and disabling of abilities as per Chiss' request
2015-08-31 21:48:25 -04:00
AlexTheCoder
32a257fa55
Fix bug https://trello.com/c/Jf7bht6V/138-general-tp-before-game-starts
2015-08-31 15:11:57 -04:00
Sarah
58ae09ebd4
saving Project for pulling.
2015-08-31 11:32:18 +02:00
AlexTheCoder
129464a845
Added CTF to MPS menus
2015-08-31 04:42:36 -04:00
AlexTheCoder
cbf8b575c6
Changed data for certain types of spawning
2015-08-31 03:28:22 -04:00
AlexTheCoder
39a79eb818
Fixed a nullpointer
2015-08-31 03:05:43 -04:00
AlexTheCoder
474f1bd0b8
Made CTF follow Chiss' specifications and also added more advanced features
2015-08-31 03:04:18 -04:00
Mysticate
becfbe1f13
Fixed possible game breaking bug :S
2015-08-30 20:09:47 -04:00
Mysticate
33d78a5efd
Fixed eating spider eye. Yay!
2015-08-30 18:39:07 -04:00
AlexTheCoder
6fefcbd953
Kit Changes/Fixes:
...
- Fixed Kit Mobs not opening guis in Champions games
- Fixed Abilities not working in CTF
- Added new event when a player attempts to choose a kit
- Cancelled changing kit while holding a flag
2015-08-30 17:13:08 -04:00
AlexTheCoder
149d37caad
Forgot to commit with actual game
2015-08-30 04:01:01 -04:00
AlexTheCoder
eca69a8ae2
Made new branch up to date and including previous branch's code
2015-08-30 03:58:58 -04:00
Jonathan Williams
47331658ac
Merge remote-tracking branch 'remotes/origin/Myst_EVO'
2015-08-30 00:14:53 -07:00
Mini-Chiss
d944d2e5c4
Merge branch 'Myst_EVO'
2015-08-29 23:54:28 -07:00
Mysticate
046fa4f8b6
Fixed possible NPE
2015-08-29 14:30:22 -06:00
Mysticate
736d88c82f
All achievements fixed. ^_^
2015-08-29 14:13:15 -06:00
Mysticate
97c7980bbc
Fixed evolving into walls.
2015-08-29 10:54:04 -06:00
Mysticate
55a7ea0439
Fixed kit bug.
2015-08-29 10:44:11 -06:00
Mini-Chiss
6a28845cb0
Merge branch 'Myst_EVO'
2015-08-29 00:14:15 -07:00
Mysticate
12d9888a1f
Fixed wins..
2015-08-29 00:58:53 -06:00
Jonathan Williams
c98a85c2ba
Added local storage of login time.
...
Hooked in onlineTime bonus feature to real values.
2015-08-28 22:09:42 -07:00
Mini-Chiss
829c1d2ae8
Merge branch 'Myst_EVO'
2015-08-28 21:30:10 -07:00
Mysticate
c40fecb03f
Removed warning from private servers
2015-08-28 22:06:13 -06:00
Mini-Chiss
3f1c4d24b9
Merge branch 'Myst_EVO'
2015-08-28 21:00:00 -07:00
Mysticate
bb09720450
removed previous commit jesus
2015-08-28 21:56:35 -06:00
Mini-Chiss
d68f1fa547
Merge branch 'Myst_EVO'
2015-08-28 20:50:27 -07:00
Mysticate
6628f5a1ae
Added a checker for a no kit issue
2015-08-28 21:49:57 -06:00
Mini-Chiss
19b2ff5b58
fixed scoreboard
2015-08-28 20:48:32 -07:00
Mini-Chiss
11cc4a6cea
removed msg
2015-08-28 20:45:59 -07:00
Mini-Chiss
fda866a33f
Merge branch 'Myst_EVO'
2015-08-28 20:35:59 -07:00
Mysticate
4466c10441
FIXED
2015-08-28 21:35:31 -06:00
Mini-Chiss
4ac6b22e53
Merge branch 'Myst_EVO'
2015-08-28 20:31:56 -07:00
Mini-Chiss
88ca205474
fixes
2015-08-28 20:31:29 -07:00
Mysticate
815add4c59
FIXED THE THIGNS
2015-08-28 21:28:39 -06:00
Mini-Chiss
5777309d18
Merge branch 'Myst_EVO'
2015-08-28 20:07:22 -07:00
Mini-Chiss
8238a199d5
gem stuff
2015-08-28 20:06:39 -07:00
Mysticate
cc60371c1f
Fixed perk cancelling on death
2015-08-28 21:04:35 -06:00
Mini-Chiss
d879bc68ab
Merge branch 'Myst_EVO'
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/Evolution.java
2015-08-28 19:59:48 -07:00
Mini-Chiss
b5b8bef39e
evo fixes
2015-08-28 19:58:51 -07:00
Mysticate
d6c8e51104
Things ^_^
2015-08-28 20:57:47 -06:00
Mysticate
ebd3fbe6d5
Merge remote-tracking branch 'origin/master' into Myst_EVO
2015-08-28 20:19:27 -06:00
Mini-Chiss
abf1f23087
double gem
2015-08-28 19:16:49 -07:00
Mysticate
56aa235e56
Fixed kit messages
2015-08-28 19:25:52 -06:00
Mini-Chiss
c8c569281b
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-28 16:18:49 -07:00
Mini-Chiss
5562345c05
Merge branch 'SarahsAwesomeBugFixes'
2015-08-28 16:02:40 -07:00
Sarah
3be6483ed3
editing /game set for test servers.
2015-08-29 01:01:05 +02:00
Mysticate
2d770a8dd1
More final tweaks.
2015-08-28 16:36:35 -06:00
Mysticate
513662e6e3
Fixed the block open flag.
2015-08-28 15:46:38 -06:00
Mysticate
f21ca35638
Final bug changes.
2015-08-28 15:44:41 -06:00
Jonathan Williams
e9b33668bc
Added donorsOnline to MinecraftServer snapshot
...
Refactored Rank class to use lowercase methods.
2015-08-28 13:22:04 -07:00
Mysticate
571d992dbe
Fixed a few bugs.
2015-08-27 20:47:55 -06:00
Mysticate
f2f6afb6ca
Fixes :D
2015-08-26 20:10:58 -06:00
Mysticate
a351a8f1ed
Minor improvements.
2015-08-26 13:47:01 -06:00
Mysticate
cfdb0dfa4f
Added kits + achievements. Hurrah!
2015-08-26 13:19:17 -06:00
Mysticate
988382375f
Started adding kits
2015-08-25 23:36:18 -06:00
Mysticate
7b42f2155d
Tweaks. :D
2015-08-24 20:40:34 -04:00
fooify
549435224f
changes to monster maze!
2015-08-24 09:58:07 -07:00
Mini-Chiss
d454d73ccb
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-23 11:32:48 -07:00
Mini-Chiss
69ff514bf8
changed perms on write
2015-08-23 11:31:32 -07:00
Mysticate
cbaaee60d9
Removed mob spectating method from evolving.
2015-08-21 13:00:08 -04:00
libraryaddict
bad339cf04
Tweak dead bodies more
2015-08-21 20:52:57 +12:00
libraryaddict
c41328d726
Dead bodies: Change to Item from disguised arrow, fix body positioning, move to Game.java to enable in all games
2015-08-21 20:40:09 +12:00
Mysticate
86ad6a09de
Used armor stands for evolving.
2015-08-20 13:04:22 -04:00
Mini-Chiss
f97da1bdba
Merge branch 'SarahsAwesomeBugFixes'
2015-08-19 16:33:37 +02:00
Sarah
6e926b431c
Fixing snowballs and eggs in Solo Skywars.
2015-08-19 16:00:36 +02:00
Mini-Chiss
3d7c81a3b4
fixed game tips
2015-08-19 08:15:22 +02:00
Mysticate
64990ed356
Fixed parse distance.
2015-08-18 21:37:52 -04:00
fooify
15eba5b491
added more y velocity
2015-08-18 12:22:34 -07:00
Mysticate
53395a7700
Made player immovable whilst evolving.
2015-08-18 13:07:46 -04:00
fooify
a47022d242
Merge remote-tracking branch 'origin/master' into monster-maze
2015-08-17 14:54:19 -07:00
Mysticate
75a4b3d568
Changes to make evolving easier
...
• Speed 1 on kill
• Evolve chargeup decreases 1.5 seconds per kill.
2015-08-17 10:36:28 -04:00
Mini-Chiss
7a7543886f
fixed a ton of commands NPEing on no args
2015-08-17 09:04:39 +02:00
Mysticate
993ed0a92d
Fixed a possible NPE
2015-08-16 22:38:59 -04:00
Mini-Chiss
8cc5ff042c
fixed block hunt gem exploits
2015-08-16 09:33:15 +02:00
Mini-Chiss
8584e0355a
final fix!
2015-08-15 12:32:03 +02:00
Mini-Chiss
ba6806935d
fixed better
2015-08-15 12:31:19 +02:00
Mini-Chiss
25f93bac2e
fixed logic on setgame
2015-08-15 12:27:11 +02:00
Sarah
27da9b64b6
Merge branch 'KitPreferences' of http://184.154.0.242:7990/scm/min/mineplex into SarahsAwesomeBugFixes
2015-08-15 07:40:40 +02:00
Sarah
96dc86a481
Fixing map rotation.
2015-08-15 07:34:04 +02:00
Mysticate
2659dd4e39
Fixed minor bugs. Head now follows mob altitude.
2015-08-14 23:17:56 -04:00
Mysticate
ac18dd3b79
Fixed iron golem select message. Removed slot change message.
2015-08-14 20:22:00 -04:00
Mini-Chiss
80588a308b
balanaced brawler
2015-08-13 21:03:48 +02:00
Mini-Chiss
a1ba2cffac
fixed needler not doing posion
2015-08-13 20:56:02 +02:00
Mysticate
eaad787075
Removed the base kit and replaced it with Iron Golem.
2015-08-13 08:16:33 -04:00
Mini-Chiss
1487692609
completely disabled team armor in arcade. avoids typing it just as game starts.
2015-08-13 12:57:30 +02:00
Mini-Chiss
f3b58fe9b6
disabled team armor command in games D:
2015-08-13 12:51:57 +02:00
Jonathan Williams
8476578bc0
Merge pull request #28 in MIN/mineplex from Myst_LOBBERS to master
...
* commit 'f8a6a25b46b9336ae8a727e1f3478f3a7a394324':
Various Fixes.
2015-08-13 01:52:16 -05:00
Jonathan Williams
a308244966
Merge pull request #29 in MIN/mineplex from foo to master
...
* commit '07bdbdde46e2a9e7b49f4e8606c9068a0534c18d': (22 commits)
minor grammar issue
remove duplicate method
manually updating something
*crosses fingers* please work!
please work...
Freezes the time using doDayLightCycle instead of using a UpdateEvent.
Fixed double-half-slabs (line 68)
remove custom level to fix merge conflicts
squirrel!
fix getting snowballs from bedrock
add jnr_dev to updaterank
fix this agaaaaain
FOOIFY IS A NOOB OKAY
fix concurrentmodificationexception
fix turfforts bug
prevent STATIONARY_LAVA from breaking in creeper smash
fix creeper smash exploding lava and bedrock
fix spleef lava issue
ishh also wanted this :P (let me know if I should remove it)
ishh wanted it...k
...
2015-08-13 01:49:00 -05:00
Jonathan Williams
0ff7cee229
Merge pull request #32 in MIN/mineplex from Alex_MILKCOW to master
...
* commit 'cc24bb78d3968c0c364164fb43e19724007e3833':
Fixed Cows being able to fly if they had the Rabbit Farmer kit
Fixed new classes not appearing in repository
Milk The Cow: New Gameplay Feature - When a cow charges a farmer, any milk in their bucket will be lost
2015-08-13 01:45:56 -05:00
Mysticate
ed7dbddf4a
Redid how kits are done.
2015-08-13 00:12:28 -04:00
Mysticate
d7e28e9eb8
You can no longer have the option to Evolve if you kill while dead.
2015-08-12 13:28:31 -04:00
Mysticate
a7da10cb34
You no longer remain "charging" when you die.
2015-08-12 12:12:26 -04:00
Mysticate
ad94b63903
Blaze and Enderman now take water damage.
2015-08-12 10:46:12 -04:00
Mysticate
0c3c9702d9
Small fixes.
...
Added holograms to show kit abilities.
Fireworks are now client side only.
Decreased the # of emerald particles.
2015-08-12 09:44:55 -04:00
Mini-Chiss
d6f17c609b
carl
2015-08-12 08:58:46 +02:00
Mini-Chiss
c00f9a7aaa
Merge branch 'Bonus'
2015-08-12 08:39:31 +02:00
Sarah
be699558f1
Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus
2015-08-12 08:38:18 +02:00
Sarah
af19754bcd
Implementing Carl to Arcade.
2015-08-12 08:37:54 +02:00
Mini-Chiss
7cda53cb28
carl spinner in arcade/
...
tutorial fixes
2015-08-12 08:36:21 +02:00
fooify
ddc663cc75
remove duplicate method
2015-08-11 09:52:04 -07:00
fooify
10f979772b
Merge remote-tracking branch 'origin/master' into foo
2015-08-11 09:51:13 -07:00
fooify
356060eedc
more amazing changes
2015-08-11 09:41:26 -07:00
fooify
c6ec60700c
monster maze is really working now! :D
2015-08-11 09:04:45 -07:00
Mini-Chiss
18843c2cc6
Merge branch 'Bonus'
2015-08-11 17:05:59 +02:00
Mini-Chiss
89dab7ec85
some little fixes
2015-08-11 16:33:32 +02:00
Mini-Chiss
cfcfbbed3b
removed double gem
2015-08-11 13:34:32 +02:00
Mini-Chiss
b348c62a3f
Merge branch 'EventGameUpdates'
2015-08-11 13:01:33 +02:00
Shaun Bennett
fe153bee11
Fix revert issues
2015-08-11 03:19:27 -05:00
Sarah
2c30d20cb1
changing OP method, setHost permissions and /e command.
2015-08-11 09:26:01 +02:00
Sarah
d457e3a955
changing the setOP Event.
2015-08-11 08:36:39 +02:00
Mysticate
bd414cd231
Merge remote-tracking branch 'origin/master' into Myst_EVO
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java
2015-08-10 19:47:53 -04:00
Mysticate
873a2f3c56
Changed slowness from 255 - 2
2015-08-10 19:45:40 -04:00
Mysticate
a618b19b73
Small changes
2015-08-10 14:32:35 -04:00
Sarah
fef269b856
Fixing /e set.
2015-08-10 17:28:27 +02:00
Mysticate
1804d668e1
A few small tweaks. Removed the "Frozen" effect.
2015-08-10 08:42:03 -04:00
Shaun Bennett
b8b19ed4a5
Merge remote-tracking branch 'remotes/origin/master' into Bonus
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java
# Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java
# Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
# Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2015-08-10 03:24:59 -05:00
Mysticate
463dfc7049
Minor Tweaks.
...
• Fixed wrong evo location
• Added a "Frozen" effect when evolving.
2015-08-10 00:21:48 -04:00
Mysticate
a19cd3559d
Renamed "Shift" to "Crouch"
2015-08-09 23:26:59 -04:00
Mysticate
158dcdc01e
Created a new way to Evolve.
...
• Getting a kill presents you the option "Hold Shift to Evolve"
• Holding shift for about 5 seconds evolves you as normal.
2015-08-09 23:25:26 -04:00
Mysticate
f8a6a25b46
Various Fixes.
...
• Merged w/ master
• Changed to William's method of Projectile limiting.
- Prevented TNT hitting Teammates
• Fixed gem count for Sniper
• Added gems for direct hits + TNT Thrown
• Removed assists counting for kills in 6 kill.
2015-08-09 15:01:27 -04:00
Mysticate
d9a8830e75
Few changes
2015-08-09 14:34:55 -04:00
Mini-Chiss
ee65c72e86
and wizards!
2015-08-09 18:46:02 +02:00
Mini-Chiss
fdfc9ae99d
longer games wont announce stay msgs
2015-08-09 18:17:29 +02:00
Sarah
ac5ff08fad
Git fix
2015-08-09 17:23:38 +02:00
Sarah
0d70fb6b96
removing deop of Admins and adding OP condition to setHost.
2015-08-09 16:55:10 +02:00
Mysticate
b9edb92c1e
Ready for full on testing.
2015-08-09 01:08:43 -04:00
Mysticate
5298fa341e
Removed the revolving thing.
2015-08-08 16:13:54 -04:00
fooify
db521668a9
more changes! it's getting pretty cool now x)
2015-08-07 14:20:15 -07:00
Mini-Chiss
090c1f135d
Merge branch 'SarahsAwesomeBugFixes'
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java
2015-08-07 21:48:35 +02:00
Mini-Chiss
b22706e649
hub update part 1
2015-08-07 21:45:38 +02:00
Mysticate
858e57bb0d
edited a few things
2015-08-07 14:39:29 -04:00
fooify
f70b1231ab
AI fixes and such for Monster Maze
2015-08-07 10:32:31 -07:00
Mysticate
a9350bfacd
Merge remote-tracking branch 'origin/master' into Myst_EVO
2015-08-07 11:58:53 -04:00
Sarah
181b778a9c
Fixing some bugs and disallow MPS while disguised.
2015-08-07 07:39:40 +02:00
Morten
608e8bf693
For Sarah <3
2015-08-07 05:40:16 +02:00
Shaun Bennett
be18dc1bf5
Add experience rewards to reward manager
2015-08-06 21:41:56 -05:00
Morten
1680b652db
Added Hat layer skin
...
Added Sneak animation
With love from Morten <3
2015-08-07 03:10:17 +02:00
Sarah
d8041ba582
Fixing Players can disguise as disguised Players.
2015-08-06 20:57:56 +02:00
fooify
0a9f7cc888
Merge remote-tracking branch 'origin/master' into monster-maze
2015-08-06 10:13:54 -07:00
fooify
9e92a3a68d
more changes (not really ready for testing yet though...)
2015-08-06 09:44:00 -07:00
Mini-Chiss
ebbc13c0a4
lowered headshot damage
2015-08-06 17:07:52 +02:00
Sarah
4a10f8d71a
fixing very last bugs. Ready to push!!!
2015-08-06 13:23:38 +02:00
Sarah
6947b54e66
16 char limit and Steve Skin.
2015-08-06 09:45:02 +02:00
Sarah
5809359449
Random Player disguises.
2015-08-06 09:19:19 +02:00
Sarah
208ce95c97
No youtuber Disguise.
2015-08-06 09:11:39 +02:00
Sarah
b52a9477fe
No Staff disguises!
2015-08-06 09:07:30 +02:00
Sarah
16a8164030
Fixing last bugs and disabling coin bombs while diguised.
2015-08-06 08:42:09 +02:00
fooify
b5d1202674
YET MORE WORK ON MM
2015-08-05 13:09:26 -07:00
fooify
551451c533
moar changes
2015-08-05 10:30:27 -07:00
Sarah
a15e8e1b95
Fixing more /disguise bugs.
2015-08-05 15:23:16 +02:00
Sarah
83da6b7a9a
Improving the /disguise command even more. ;D
2015-08-05 13:32:05 +02:00
AlexTheCoder
cc24bb78d3
Fixed Cows being able to fly if they had the Rabbit Farmer kit
2015-08-05 03:07:19 -04:00
Mini-Chiss
5d7cc59909
fixed cases where negative stats were being uploaded
2015-08-05 08:56:52 +02:00
Sarah
91de6a1852
last fix...
2015-08-05 08:40:09 +02:00
Sarah
511c61611a
fixing earlier commit.
2015-08-05 08:32:52 +02:00
Sarah
e55557e1fd
Improving the /disguise command.
2015-08-05 07:57:52 +02:00
Mini-Chiss
88fe5b3ec6
Merge branch 'MPS-Maps'
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java
2015-08-04 17:37:32 +02:00
Mini-Chiss
1fd5c51f03
DINGO ATE MY BABY
2015-08-04 17:33:23 +02:00
Sarah
ec3bc7cc38
Try fixing the map selection.
2015-08-04 17:04:49 +02:00
William Burns
644d6c9914
Whitelist fixes. Implemented MapSource.
2015-08-04 11:21:58 +01:00
Mini-Chiss
13d139d197
team kills/deaths only store for 3 games now
2015-08-04 08:46:00 +02:00
Mysticate
d88a37832b
Work on evolving
2015-08-03 18:22:31 -06:00
AlexTheCoder
a86fdc3c21
Fixed new classes not appearing in repository
2015-08-03 18:45:16 -04:00
AlexTheCoder
b53b98d6e3
Milk The Cow:
...
New Gameplay Feature - When a cow charges a farmer, any milk in their bucket will be lost
New Perk - Steady Hands:
- Lowers the amount of milk lost by a dead player to 3
- Removes losing milk in farmer's bucket when a cow charges into them
New Kit - Sturdy Farmhand:
- Iron skin damage reduction of 2.0
- Implements Steady Hands perk
- 2000 gems
2015-08-03 18:30:42 -04:00
Mini-Chiss
2d07cc571c
reduced invis in OITQ
2015-08-03 18:53:00 +02:00
Mini-Chiss
2f571aed25
fixed bugs from my vel fixes, WHOOPS. normalisation :(
2015-08-03 18:19:31 +02:00
Mini-Chiss
40e2b6216e
oops, was right before, reverting change.
2015-08-03 16:30:38 +02:00
Mini-Chiss
f350e4efe5
further fixed gem stuff!
2015-08-03 16:25:31 +02:00
Mini-Chiss
67fd0e2c1d
fixed MPS awards formatting
2015-08-03 16:24:43 +02:00
Mini-Chiss
ab670a03fb
fixed logic error that was displaying gems wrong
2015-08-03 16:23:50 +02:00
Mini-Chiss
e10d26dae1
reduced respawn time in OITQ
...
removed respawn msg for short respawn times
2015-08-03 16:18:59 +02:00
William Burns
817b8b03f6
Whitelist fixes etc.
2015-08-03 13:40:13 +01:00
William Burns
0c5cc25634
Stuff
2015-08-03 12:48:17 +01:00
William Burns
4ad19e4579
Merge branches 'MPS-Maps' and 'master' of ssh://184.154.0.242:7999/min/mineplex into MPS-Maps
2015-08-03 10:52:00 +01:00
Mini-Chiss
bb2e15c4fd
made it so games can set another game as its 'kit source' so games can share kit unlocks
2015-08-03 11:38:16 +02:00
Mini-Chiss
1d0bfbdf2d
fixed team sheep displaying in UHC lobby
2015-08-03 10:56:23 +02:00
Mini-Chiss
b26e01649b
removed requirement for ach kit
2015-08-03 10:13:46 +02:00
Mini-Chiss
eac8a3cd1c
fixed OITQ kit being unobtainable
2015-08-03 10:12:37 +02:00
Mini-Chiss
472409dc4b
fixed broadcast formatting
2015-08-03 10:06:15 +02:00
Mini-Chiss
2e1bccb3ad
DUN ALLOW overful
2015-08-03 09:02:28 +02:00
Mini-Chiss
0a84bd69d8
fixed some OITQ stuff
2015-08-02 23:17:23 +02:00
Mysticate
0a20a04903
Used packets to spectate the rotation bat.
2015-08-02 10:48:00 -06:00
Mini-Chiss
4cc810f1c0
Merge branch 'Myst_KITS'
2015-08-02 17:55:53 +02:00
Mini-Chiss
afc41c8831
converted Player velocities to use UtilAction velocity methods, instead of Player.setVelocity
2015-08-02 11:50:26 +02:00
Mini-Chiss
ac4755a5a9
Fixed incorrect velocity
2015-08-02 11:24:34 +02:00
Mysticate
9c14e3d35a
Worked on evolution
2015-08-01 17:24:12 -06:00
fooify
519449e015
lots of stuff (:
2015-08-01 11:42:32 -07:00
Mysticate
62072077c1
Fixed evolution rotation
2015-08-01 00:47:44 -06:00
fooify
e4141a1b72
Merge remote-tracking branch 'origin/master' into snow-sprint
2015-07-31 07:32:17 -07:00
Mini-Chiss
ae8d351145
Merge branch 'SSM2PlayerTeams'
2015-07-31 14:09:55 +02:00
Sarah
fba10e4cbd
fixing the long term "Kit" bug ;D
2015-07-31 14:08:08 +02:00
Sarah
b2c538b189
little tag fix.
2015-07-31 13:40:39 +02:00
Sarah
60a1768821
Fixing Team display bug on disbanding.
2015-07-31 13:05:28 +02:00
Mini-Chiss
b2a567673c
disabled sale msg
...
added double gem weekend
2015-07-31 09:53:52 +02:00
Mysticate
53a3a29cd2
Extreme revisions. Cheers!
2015-07-31 00:50:32 -06:00
fooify
e59f2751f3
more stuff changed to snow sprint
2015-07-30 17:31:26 -07:00
fooify
014cac31f0
more changes to snow sprint
2015-07-30 14:04:39 -07:00
fooify
6c39c08abf
some progress on snow sprint
2015-07-30 11:59:04 -07:00
Mini-Chiss
a3d768af6b
added res pack for HH
2015-07-30 15:07:40 +02:00
Mini-Chiss
31fd19aab5
added res pack for CC
2015-07-30 15:07:05 +02:00
Mini-Chiss
8a5088e181
fixed SGT deathmatch not working
2015-07-30 14:47:59 +02:00
Mini-Chiss
45d117a95a
added armor hotbar to smash
...
fixed scoreboard in snowfight
2015-07-30 14:45:28 +02:00
Mysticate
f02924987e
Did things
2015-07-30 04:30:19 -06:00
Mini-Chiss
8ef93c0b33
Merge branch 'SSM2PlayerTeams'
2015-07-30 08:42:50 +02:00
Sarah
30fa3b3309
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into SSM2PlayerTeams
2015-07-30 03:07:41 +02:00
Sarah
37e432f0b2
Git fix.
2015-07-30 03:07:21 +02:00
Sarah
bf75594853
Merge branch 'SSM2PlayerTeams' of http://184.154.0.242:7990/scm/min/mineplex into SSM2PlayerTeams
2015-07-30 02:33:51 +02:00
Sarah
de4d0a7dc3
Fixing needler, projectiles in SW and "Banannas...".
2015-07-30 02:33:06 +02:00
Mysticate
a5d73d791a
Thing
2015-07-29 16:14:38 -06:00
fooify
7c4786e7d2
Merge remote-tracking branch 'origin/master' into foo
2015-07-29 14:15:24 -07:00
fooify
5da23fa322
Merge branch 'foo' of http://Fooify@184.154.0.242:7990/scm/min/mineplex.git into foo
2015-07-29 14:13:07 -07:00
fooify
db5c5a9888
*crosses fingers* please work!
2015-07-29 14:12:52 -07:00
Mini-Chiss
97a144150b
fixed an NPE that was causing games not to end in MS
2015-07-29 21:51:18 +02:00
Mysticate
ab49407584
Things
2015-07-29 11:52:44 -06:00
Aaron Brock
d583598477
Fixed double-half-slabs (line 68)
...
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-07-29 10:49:20 -07:00
Mini-Chiss
be910cced9
gamemode color change
2015-07-29 17:00:36 +02:00
Mini-Chiss
0e55ce1879
removed old hint
2015-07-29 16:54:30 +02:00
Mini-Chiss
1004203b34
fixed up some merge issues
2015-07-29 16:48:49 +02:00
William Burns
13af2cec74
Pick highest voting button
2015-07-29 15:44:29 +01:00
Mini-Chiss
52844d7b80
Merge branch 'EventGameUpdates'
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
2015-07-29 16:41:35 +02:00
Mini-Chiss
71bedbe0fc
Merge branch 'WitherAssaultUpdate'
2015-07-29 16:37:29 +02:00
Mini-Chiss
c32e959f61
Merge branch 'SnowFightUpdate'
2015-07-29 16:36:33 +02:00
Morten
1a27dea32c
Why was these not added...
2015-07-29 16:35:57 +02:00
Mini-Chiss
d570cce1b0
Merge branch 'WitherAssaultUpdate'
2015-07-29 16:33:06 +02:00
Mini-Chiss
862cdae14f
team modes
2015-07-29 16:32:11 +02:00
Mini-Chiss
e47a343e2e
added mode for team games
2015-07-29 16:20:49 +02:00
Morten
f714bfbb0f
Adding testing achievement lol
2015-07-29 16:06:43 +02:00
Morten
b5d3ad0e0d
Adding perks
2015-07-29 16:05:43 +02:00
Sarah
9c5ca750cf
Improving /e mob command and implementing other commands.
2015-07-29 15:53:45 +02:00
Mini-Chiss
ab2c865ab3
better colors
2015-07-29 15:48:12 +02:00
Mini-Chiss
51cef64554
improved text
2015-07-29 15:29:12 +02:00
Mini-Chiss
deba3f23fa
Merge branch 'MPS-Maps'
2015-07-29 15:27:11 +02:00
William Burns
2b3fec754f
Colour change cause colour!
2015-07-29 14:25:38 +01:00
William Burns
3bc66f16b6
Woo a push
2015-07-29 14:22:49 +01:00
Mini-Chiss
b2db2e988f
Merge branch 'WitherAssaultUpdate'
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java
2015-07-29 15:13:28 +02:00
Mini-Chiss
1c2bd988f9
fixed spawns for team gameds
2015-07-29 15:10:21 +02:00
William Burns
f6e64d25a2
Merge branches 'MPS-Maps' and 'master' of ssh://184.154.0.242:7999/min/mineplex into MPS-Maps
2015-07-29 13:27:45 +01:00
William Burns
f82defb1db
Whitelist
2015-07-29 13:27:26 +01:00
Mini-Chiss
30f0b3cb60
fixed close spawn stuff
2015-07-29 14:25:15 +02:00
Mini-Chiss
c9c3db70f3
Merge branch 'SSM2PlayerTeams'
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
2015-07-29 14:08:17 +02:00
Mini-Chiss
932fe197b4
Merge branch 'perm-changes'
...
Conflicts:
Plugins/.idea/encodings.xml
reverted it.
2015-07-29 14:06:21 +02:00
Mini-Chiss
ef89b96144
fixed game page bug
2015-07-29 14:02:56 +02:00
Mini-Chiss
b42be044ae
whtielisted MPS will be hidden from GUI
2015-07-29 13:20:20 +02:00
Mini-Chiss
e0ab853e57
Merge branch 'MPS-Maps'
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
Plugins/Mineplex.Core/src/mineplex/core/stats/command/TimeCommand.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
2015-07-29 13:03:05 +02:00
Jonathan Williams
10549601f8
Merge pull request #21 in MIN/mineplex from Myst_LOBBERS to master
...
* commit 'd0a45461d07904f70b5e42dee391f69843fb3978':
Fixed bug with direct hit
Final tweaks. this is as good as it's goign to get! ;d
Tweaks
Fixed waller achievement thing
Fixed waller kit bc I was stupid before ;c
Added an exception for a map to make it night.
Various improvements.
Added an achievement, removed team one, touched up another. Swag.
2015-07-29 00:15:41 -05:00
Mysticate
d0a45461d0
Fixed bug with direct hit
2015-07-28 21:25:29 -06:00
Mysticate
3e0eb03112
Final tweaks. this is as good as it's goign to get! ;d
2015-07-28 20:39:55 -06:00
Mysticate
99946ef1f3
Tweaks
2015-07-28 17:29:51 -06:00
Mysticate
2e58b75a1b
Fixed waller achievement thing
2015-07-28 08:51:21 -04:00
Mysticate
dd53d268e4
Fixed waller kit bc I was stupid before ;c
2015-07-28 08:46:37 -04:00
Mysticate
c5cf306097
Thing
2015-07-28 08:41:35 -04:00