Commit Graph

76 Commits

Author SHA1 Message Date
Chiss
fa2e24d686 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java
2013-12-25 09:08:03 +11:00
Chiss
375d689cc6 fixed visual bug with hero gems 2013-12-25 09:06:22 +11:00
Jonathan Williams
3fefc8fa73 Fixed Hero message in Arcade. 2013-12-24 04:13:52 -05:00
Chiss
74e49a3ff1 Hero Rank stuff
New SSM Kit
2013-12-24 19:14:40 +11:00
Jonathan Williams
6b92b6c4a8 Added stats manager.
Added lots of missing files.
2013-12-13 21:00:56 -08:00
Chiss
2fb4bc4fbc UHC stuff 2013-12-07 23:04:10 +11:00
Chiss
f972418fd1 UHC! 2013-12-03 17:13:29 +11:00
Chiss
c8fc792fdd UHC prep for s4
Draw updates
2013-11-30 20:40:09 +11:00
Chiss
276898dced HG 2013-11-24 21:58:55 +11:00
Chiss
83bec39aef game not end 2013-11-24 21:36:35 +11:00
Chiss
3d13fb0dc9 HG Fixes 2013-11-22 23:12:39 +11:00
Chiss
0a683416ff SG Update 2013-11-22 18:40:38 +11:00
Chiss
18c70901ca gem kit fix 2013-11-17 21:04:27 +11:00
Chiss
690811dd05 cased SG debug properly 2013-11-16 17:54:30 +11:00
Chiss
b8e1c22967 BH updates 2013-11-16 17:53:42 +11:00
Chiss
2e6758e23c BH Updates 2013-11-16 13:15:16 +11:00
Chiss
29ce493f64 Hide and SEEEEEEK (block honts) 2013-11-15 18:52:46 +11:00
Chiss
3c5b1fe74f H&S Updates
some punish fixes
hub toggles no longer pulse on pressure plate
2013-11-09 09:48:40 +11:00
Chiss
dc062c7bb6 H&S Push 2013-11-07 19:49:21 +11:00
Chiss
03731de7f8 Rank changes
MAC no longer kicks lag/fly
some H&S stuff :O
2013-11-07 10:18:36 +11:00
Chiss
0cbefc1280 Paintball update! 2013-11-02 15:42:37 +11:00
Chiss
52ac670f3f More dom changes 2013-10-31 12:43:54 +11:00
Chiss
4974fc17aa Halloween balance (slightly easier)
Giant hitbox improved
2013-10-27 15:24:28 +11:00
Chiss
723b57cd46 Added paintball gun Gadget
Added bat blaster Gadget

Halloween Game near-completed

Added SSM Witch
2013-10-26 19:01:26 +11:00
Jonathan Williams
90fbc397ff Converted gem rewards to boolean return from website.
Implemented gem transactions and source.
2013-10-18 00:46:06 -07:00
Chiss
9ffc793f61 added Dragon Rider
anti-stack changes (dont anti-stack mined blocks)
2013-10-14 10:29:20 +11:00
Chiss
377f4b0680 Gem fix, now correctly displays scaled gems.
UHC public changes
Snake fixes.
2013-10-13 08:42:49 +11:00
Chiss
27fb3b4262 Snake changes
SSM Wolf fixes
2013-10-12 16:59:23 +11:00
Chiss
0b2dcc2617 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-12 09:34:59 +11:00
Chiss
8376316994 Added Paintball
Added SSM Kit: Wolf
UPDATES.
2013-10-12 09:34:46 +11:00
Jonathan Williams
fc18d0fbb1 Added null check logging to arcade custom kit name.
Removed wolf kit in SSM for release
Cleaned up PlayerAccountController
Fixed connection leak for mysql connections.
Added server shutdown if server is empty for dominate.
2013-10-10 09:01:48 -07:00
Chiss
ed804e3336 Dragon escape update 2013-10-09 21:50:39 +11:00
Chiss
1fc446ae13 Lobby text now displays map 2013-10-08 17:56:57 +11:00
Chiss
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
Chiss
ab45c717dd Merge branch 'master' of ssh://198.245.50.91:7999/min/master 2013-10-05 07:49:21 +10:00
Chiss
3ba848567c paintball added
hg additions
minor changes to other games
2013-10-05 07:49:05 +10:00
Jonathan Williams
57b0d06786 Added DisguiseWolf
Added lobby menu (disabled autogive for testing)
Removed unused commands.
2013-10-02 22:23:01 -07:00
Chiss
ce89108aea Fixed disguises in bacon brawl 2013-09-23 16:00:35 +10:00
Jonathan Williams
cc63fdccfc Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-09-21 15:02:14 -07:00
Jonathan Williams
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
Chiss
b3a78112be Fixed gem display bug 2013-09-21 13:53:12 +10:00
Chiss
9064272a38 Prepared SSM for 200 player Game (added hunger) 2013-09-21 13:34:14 +10:00
Chiss
9da18ea43f Merge branch 'master' of ssh://198.245.50.91:7999/min/master 2013-09-21 08:34:24 +10:00
Chiss
a92c74a28a HG Updates
Other minor fixes
2013-09-21 08:34:07 +10:00
Jonathan Williams
85cc6e5b2b Updated to 1.6.4 2013-09-20 01:50:56 -07:00
Jonathan Williams
ae00d3df18 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-09-17 15:52:16 -07:00
Jonathan Williams
f31a734a0d Fixed server pages to show 5 servers.
Added in creeper explode block list for UHC.java
Added task assignment/reward message only on return confirm call.
Hide players in hub when they have an inventory open.
Added gem command into donation manager.

Revamped bungee player count method.
Revamped server status method.
2013-09-17 15:50:23 -07:00
Chiss
c6a9d4675f MTC changes
Barbarians changes
OITQ enchanter desc improvement
renamed Turf Forts
Added 2.5x gems for bridges
2013-09-17 10:37:45 +10:00
Chiss
7bd13b416e Some turf forts fixes/changes
Fixed SSM lobby
2013-09-16 11:52:27 +10:00
Chiss
d51599de28 HG start
Added /hub and /leave to return to hub
2013-09-15 11:12:11 +10:00