Shaun Bennett
|
939c6189a7
|
Merge energy and war with master
|
2015-02-03 14:16:07 -05:00 |
|
Shaun Bennett
|
6cefeb1b74
|
More work on War
|
2015-02-03 14:02:45 -05:00 |
|
Chiss
|
7f4bcd1210
|
Smash Update
new scoreboard (not implemented yet)
reward changes
|
2015-01-29 11:54:59 +11:00 |
|
Chiss
|
10ab390bd7
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-01-26 11:20:12 +11:00 |
|
Chiss
|
40ef3317dd
|
committing necessary files to merge
|
2015-01-26 11:20:02 +11:00 |
|
Jonathan Williams
|
c83643564b
|
Fixed scoreboards reading from file.
Fixed scoreboard server name length
Changed how we pull server group on startup.
|
2015-01-13 12:22:47 -08:00 |
|
Jonathan Williams
|
ac709d09ce
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-01-11 00:42:55 -08:00 |
|
Jonathan Williams
|
8e04a2a5f2
|
Portal now checks server status and player's rank before sending them to a server to prevent login spam.
Refactored portal method names.
|
2015-01-11 00:42:31 -08:00 |
|
Chiss
|
5f36c8e424
|
minor scoreboard changes
legend loot bonus
|
2014-12-30 08:50:37 +11:00 |
|
Chiss
|
78977788a1
|
fixed bug
|
2014-12-23 23:18:29 +11:00 |
|
Chiss
|
f4c5922b05
|
added messages for when server is expired
|
2014-12-23 23:17:21 +11:00 |
|
Jonathan Williams
|
07cca7a1d4
|
Fixed NPE in GameHostManager
Fixed CD for creating server.
|
2014-12-23 06:46:05 -05:00 |
|
Chiss
|
a15256da88
|
update
|
2014-12-23 19:04:10 +11:00 |
|
Shaun Bennett
|
eb0f23318f
|
Fix my fix for scoreboard - mine broke when new players joined
|
2014-12-23 00:06:30 -06:00 |
|
Shaun Bennett
|
4b4ebd0e36
|
Change admin item to sparkling melon
|
2014-12-23 00:06:04 -06:00 |
|
Shaun Bennett
|
8f9794a5f7
|
Merge remote-tracking branch 'origin/master'
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
|
2014-12-22 23:56:18 -06:00 |
|
Shaun Bennett
|
706b3e25ef
|
Fix broken player count when changing max players
|
2014-12-22 23:54:51 -06:00 |
|
Chiss
|
64d37d1886
|
minor snd changes
|
2014-12-23 16:50:31 +11:00 |
|
Shaun Bennett
|
1957db25d9
|
Add player head button
|
2014-12-22 23:20:20 -06:00 |
|
Chiss
|
f961fd0233
|
Merge remote-tracking branch 'remotes/origin/searchanddestroy'
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
|
2014-12-23 15:09:58 +11:00 |
|
Chiss
|
19a7e6d666
|
time update
|
2014-12-23 13:01:44 +11:00 |
|
Chiss
|
4797b251b1
|
YAY Champions enable/disable works.
|
2014-12-23 11:39:03 +11:00 |
|
Chiss
|
71cf8e8fd2
|
undid champs stuff :(
|
2014-12-23 11:22:41 +11:00 |
|
Chiss
|
ec9401506c
|
Game servers can now run champions/normal on the fly.
|
2014-12-23 11:18:48 +11:00 |
|
Chiss
|
a197724de8
|
fixed le bugs.
|
2014-12-23 10:48:15 +11:00 |
|
Shaun Bennett
|
1396c3395a
|
Add kill button, rename ban to remove, add some messages for actions, add remove admin
|
2014-12-22 17:37:02 -06:00 |
|
Chiss
|
ec8e1f0546
|
more MPS stuff
fixed bridges exploit
|
2014-12-22 16:31:13 +11:00 |
|
Chiss
|
2472ca95ec
|
MPS updates
|
2014-12-22 13:19:45 +11:00 |
|
Chiss
|
0e7dec919d
|
minor updates
|
2014-12-22 10:51:19 +11:00 |
|
Chiss
|
184c6cb4ba
|
added func to change attackreason for combatmanager
|
2014-12-19 13:59:18 +11:00 |
|
Chiss
|
437c1aeabe
|
MPS rank todo
|
2014-12-18 13:06:57 +11:00 |
|
Chiss
|
679f7909b0
|
Merge branch 'feature/private-servers' of ssh://184.154.0.242:7999/min/mineplex into feature/private-servers
|
2014-12-18 12:45:56 +11:00 |
|
Chiss
|
56d14b7bc0
|
Particle stuff
|
2014-12-18 12:45:45 +11:00 |
|
Shaun Bennett
|
a63c48e338
|
Refactoring private server menu
|
2014-12-17 18:45:15 -06:00 |
|
Chiss
|
12973aba7d
|
Merge branch 'master' into feature/private-servers
|
2014-12-17 16:47:19 +11:00 |
|
libraryaddict
|
0e7adab3eb
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2014-12-17 18:32:50 +13:00 |
|
libraryaddict
|
17ac36d9ae
|
Add wither pet, pets are no longer stackable. Enderdragon no longer has his health changed in the hub
|
2014-12-17 18:31:51 +13:00 |
|
Shaun Bennett
|
6eb3efa0b6
|
More changes
|
2014-12-16 20:37:14 -06:00 |
|
Shaun Bennett
|
62a621270e
|
More work on private server gui. Still need to do a bunch of refactoring
|
2014-12-16 13:43:01 -06:00 |
|
Shaun Bennett
|
83218c9a73
|
Pushing unfinished code for laptop
|
2014-12-16 11:42:06 -06:00 |
|
Chiss
|
a433ad764d
|
Wither Morph
Legend Particle
|
2014-12-16 16:18:09 +11:00 |
|
Chiss
|
d7eb01e8f0
|
fixed CC Bug :D
|
2014-12-15 15:49:52 +11:00 |
|
Chiss
|
95081a8ab7
|
Gems cannot be given multiple times for certain things (prevents bugs giving mass gems)
|
2014-12-15 14:33:38 +11:00 |
|
Chiss
|
0aba82eee6
|
fixed some eclipse java6 stuff with mail
Christmas game update
|
2014-12-10 15:38:57 +11:00 |
|
Chiss
|
bee81ff455
|
lowered coin rewards
|
2014-12-09 20:23:56 +11:00 |
|
Chiss
|
50358c0c30
|
removed EULA breach in bridges private blocks
|
2014-12-08 18:23:47 +11:00 |
|
Chiss
|
ef8e5104f1
|
SnD Kits
minor bug fixes
|
2014-12-08 17:28:18 +11:00 |
|
Jonathan Williams
|
abaf9f4693
|
Refactored IRelation method names
Added support for negative amounts in Support server.
Clans in core testing state.
|
2014-12-03 13:06:50 -08:00 |
|
Jonathan Williams
|
9d39cb922c
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-12-01 01:22:51 -08:00 |
|
Jonathan Williams
|
433483dcca
|
Fixed error in GameLootManager
|
2014-12-01 01:22:43 -08:00 |
|