3dc40d3e1a
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-10-05 05:40:21 -07:00
e058def15c
Disabled Wolf kit in SSM
...
Fixed Bridge timer.
2013-10-05 05:40:06 -07:00
e7de90c267
Bridge changes to allow for 12 team map
...
Bridge timer fix
Smash wolf remove
World parser allows more than 4 teams.
2013-10-05 22:14:57 +10:00
c9af91fcd6
Tweak on lobby to show number instead of player count in item.
2013-10-05 01:49:55 -07:00
1431961b39
Fixed issues with Pet menu.
...
Fixed typo in Welcome Tutorial
2013-10-05 00:59:45 -07:00
f389378bd2
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-10-04 23:57:58 -07:00
4ed1d97a33
Added missing pet buttons.
2013-10-04 23:56:16 -07:00
59d7a78086
Revamped pet purchase and added pet menu to player hotbar.
...
Fixed ServerStatusManager still firing errors if IgnoreUpdates was in.
2013-10-04 23:55:05 -07:00
ab45c717dd
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
2013-10-05 07:49:21 +10:00
3ba848567c
paintball added
...
hg additions
minor changes to other games
2013-10-05 07:49:05 +10:00
57b0d06786
Added DisguiseWolf
...
Added lobby menu (disabled autogive for testing)
Removed unused commands.
2013-10-02 22:23:01 -07:00
44da981cf4
Fixed dominate bug again.
...
Fixed quick game menu bug.
2013-09-27 23:06:53 -07:00
86199d2795
Fix for dominate.
2013-09-27 20:05:30 -07:00
f9400a0eb4
Fixed multiple finishes for parkours
2013-09-27 12:45:24 -07:00
b6d33010ca
- Lava parkour fire ticks are no more
...
- Lava gem rewards on npcs reflect actual value (1000 and 4000)
- Can't carry people into parkour areas now
Removed unused code with Portal
Added portal functionality for server quick join
Disabled SG text
Updated quick game menu text.
2013-09-27 12:40:09 -07:00
894a121a2e
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
2013-09-27 17:08:52 +10:00
34521eef8f
minor game fixes
...
portal method in StackerManager.java
2013-09-27 17:08:32 +10:00
7c0e3bcc53
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-26 21:20:38 -07:00
b71ff09fb5
Fixed double server status manager in MK
...
Fixed tps of 0.
Fixed couple bugs in Shop/Conf page.
2013-09-26 21:18:31 -07:00
2a3d7426d5
Some scoreboard fixes
2013-09-26 12:38:32 +10:00
f0e6a7294e
squid hitbox larger
2013-09-24 09:18:36 +10:00
0390d4f63b
desc update suqid
2013-09-24 08:56:51 +10:00
064dd97d00
HitBox support for disguises
...
Squid hitbox added
Changed squid swimming!
2013-09-24 08:56:09 +10:00
ea5cc7161a
pigssss
2013-09-24 08:19:07 +10:00
d8d4b69dda
baby pig to pig
2013-09-24 08:15:48 +10:00
82f5fcb963
Pig Fix!
2013-09-24 08:12:51 +10:00
68e068092f
Fix for ageable.
2013-09-23 15:09:52 -07:00
6d5acd29db
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
...
Conflicts:
Plugins/Libraries/craftbukkit.jar
2013-09-23 13:53:28 -07:00
10994924c2
Fixes for Bungee lobby balancer.
...
Exception handling in PlayerJoinEvents for hub (tracking a bug)
Fix in pages for shop.
Support eth1 private address setting in server status.
Fix for bug in ClientClass.
2013-09-23 13:30:40 -07:00
d4775a91a1
hitbox reduction
2013-09-23 17:45:14 +10:00
0f9f28dcc2
fixed weapon names in pigs, + baby pig on platform
2013-09-23 17:36:53 +10:00
5ba494c381
Made player names more visible in squid
2013-09-23 16:05:05 +10:00
ce89108aea
Fixed disguises in bacon brawl
2013-09-23 16:00:35 +10:00
eae38dfa22
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
...
Conflicts:
Plugins/Libraries/craftbukkit.jar
2013-09-23 15:50:30 +10:00
bf4dc35b5f
Added pig Game
...
added squid game
added recharged skill event
2013-09-23 15:48:35 +10:00
8aad215475
Added sheep color/shear for disguise
2013-09-22 21:12:08 -07:00
e098d93155
Added baby disguise ability.
...
Added Stacker recharge.
Fixed issue with ServerGameMenu Champions button.
SuperSmash decreased hunger gain on attack.
Code cleanup.
2013-09-22 20:53:24 -07:00
cc63fdccfc
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-21 15:02:14 -07:00
558d9b4cc6
Added shop link to kits.
...
REmoved client cache.
Added random messages.
Fixed problem with Confirmation Page.
2013-09-21 15:01:40 -07:00
b3a78112be
Fixed gem display bug
2013-09-21 13:53:12 +10:00
eb6bbceecd
Slowed hunger degen a little, increased regen to damage dealt.
2013-09-21 13:40:04 +10:00
9064272a38
Prepared SSM for 200 player Game (added hunger)
2013-09-21 13:34:14 +10:00
9da18ea43f
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
2013-09-21 08:34:24 +10:00
a92c74a28a
HG Updates
...
Other minor fixes
2013-09-21 08:34:07 +10:00
85cc6e5b2b
Updated to 1.6.4
2013-09-20 01:50:56 -07:00
3622808e09
Fix for task cancelling.
2013-09-19 02:39:53 -07:00
d2ab872856
Added some code for Global bungee communication.
...
Fixed up LobbyBalancer
2013-09-19 00:05:23 -07:00
7329cc0aea
Implemented quick game menu.
...
Fixed dom team size at 1.
Removed old server update code from server manager.
2013-09-18 22:11:49 -07:00
7d31b24c75
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-18 05:20:58 -07:00
978254c16c
Fixed dominate start issues.
...
Fixed issue with server status manager and config for server tracker.
Changed minekart mob name.
Updated Minekart with new server status stuff.
Updated Dominate with new server status stuff.
2013-09-18 05:16:29 -07:00
Jonathan Williams
Chiss