CoderTim
9f8b119fb7
Bug fixes
2014-10-27 18:09:23 -04:00
Chiss
66b446f1e6
Added some start-game invis to players.
2014-10-25 15:48:49 +11:00
Chiss
cfcfad610f
Improved recruit/prepare countdown timers
2014-10-25 13:56:23 +11:00
Chiss
bd2e7faf3e
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-25 13:40:53 +11:00
Chiss
4002528c51
Updated GUI text.
...
- recharges/etc now use bottom text
- uses appropriate bottom/top for 1.7 or 1.8
- fixed 1.7 dragon bar so it works as it did pre-1.8
- dragon bar in 1.8 will now send dragon+wither, for more reliability
- renamed utils to be more clear
2014-10-25 13:40:34 +11:00
Shaun Bennett
6138da5f93
Merge remote-tracking branch 'origin/master'
2014-10-24 19:43:06 -05:00
Shaun Bennett
5cf3e6c3a1
Fix for arcade custom tags
2014-10-24 19:36:22 -05:00
Chiss
7dbba0a1f9
Added teleport for map parser
...
Fixed new method in UtilFirework always being BALL_LARGE
Updated lazer
2014-10-25 11:17:32 +11:00
Chiss
92d9fc4ca0
Deleted deprecated firework module and converted to Util
2014-10-25 11:03:45 +11:00
Chiss
01f311a3d6
Added missing requirements for SG Achievement Kit
...
fixed a parkour exploit
2014-10-25 10:38:47 +11:00
Chiss
95937db83a
changed firework color
2014-10-24 19:10:10 +11:00
Chiss
25fc3c0645
Achievement Kits (3 games)
...
Halloween Pumpkins
Youtube command (allows kits)
2014-10-24 19:05:57 +11:00
Chiss
d4512e464a
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-23 14:05:54 +11:00
Chiss
c2bb53c887
Halloween pumpkins
...
Minestrike balance
bug fixes
2014-10-23 14:05:35 +11:00
CoderTim
0472870e78
Fixed bug that prevented the Necromancer purchase menu from displaying
2014-10-21 20:06:13 -04:00
Shaun Bennett
a47be7a2f6
Merge remote-tracking branch 'origin/master'
2014-10-19 00:08:13 -05:00
Shaun Bennett
1394e33056
Fix for Arcade Kit NPC Names in 1.8
2014-10-18 21:15:53 -05:00
Jonathan Williams
8630a1ba4c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-17 23:39:21 -05:00
Jonathan Williams
e3cd6f0e69
Fixed Mem leak in CustomTagFix
...
Changed to ServerGameMenu
Fix for overfilling HH servers
Added staff ability to join all servers.
2014-10-17 23:29:24 -05:00
Chiss
68009d3013
A little more time to handle wave 5
2014-10-18 13:51:25 +11:00
Chiss
02ea14bcd1
Damaging Boss restores all hunger
2014-10-18 10:50:17 +11:00
Chiss
651791ad83
HH FOod update
2014-10-18 10:40:08 +11:00
Chiss
af0daf4a3d
HH Hunger Update
2014-10-18 10:29:00 +11:00
Chiss
727e137cc4
Final HH Update
2014-10-17 12:12:22 +11:00
Chiss
5db2c072a0
Halloween update
2014-10-16 16:27:09 +11:00
Chiss
eb5af41323
Added halloween reward pet
...
minor bug fixes
2014-10-15 15:44:26 +11:00
Chiss
15b6a80613
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-14 13:02:17 +11:00
Chiss
bf1f28318b
fix for UHC not ending
2014-10-14 13:02:04 +11:00
Chiss
ed9dd6e894
Minor patches
2014-10-14 12:42:53 +11:00
CoderTim
8f90c96019
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-13 20:45:55 -04:00
CoderTim
2016ea09cb
Added achievements to games and Achievement enum
2014-10-13 20:38:58 -04:00
Chiss
e41b10ccb8
minor UHC fix
2014-10-13 14:09:58 +11:00
Chiss
9b1c4783ce
lowered UHC win to 8k
2014-10-13 09:57:38 +11:00
Chiss
6e6e0e2ae0
added flags to disable gem multipliers per-game. UHC was giving too much :O
2014-10-13 09:44:30 +11:00
Chiss
a8d1cef933
Minestrike, ensure bomb does not get overridden.
2014-10-12 18:31:05 +11:00
Chiss
623cdb0f2c
Allowed players to rejoin if disconnect within first 10 minutes of UHC.
2014-10-12 18:27:49 +11:00
Chiss
603c0cb66e
Staggered UHC game teleports to help reduce lag.
2014-10-12 18:26:18 +11:00
Chiss
28285ab999
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-12 14:19:52 +11:00
Chiss
9cc28d1ad8
MAC Update
2014-10-12 14:19:35 +11:00
Jonathan Williams
3e92b02bab
Fixed max slot bug with ultra/hero
2014-10-11 05:56:47 -07:00
Chiss
1d3b792ed8
UHC head apple fixes
2014-10-11 23:09:56 +11:00
Chiss
9c8ed5360d
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-11 21:01:52 +11:00
Chiss
8e071f59d6
missing file
2014-10-11 20:59:36 +11:00
Jonathan Williams
797dd002ad
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-11 02:43:56 -07:00
Chiss
a2df64787f
remove players from closed game, on update
2014-10-11 20:30:40 +11:00
Chiss
961163c135
delaying return to hub
2014-10-11 20:26:08 +11:00
Chiss
a7ceb24b15
Hub UHC time log
2014-10-11 20:10:48 +11:00
Chiss
dc0709f17e
HH Update
...
Added UHC to skytext for hub
2014-10-11 19:43:28 +11:00
Jonathan Williams
19afebe53d
Added in mysql hooks for coins/gems/ranks for database conversion preperation.
...
Added in failover database calls in CoreClient/DonationManager
2014-10-11 01:32:22 -07:00
Chiss
e2c72a3ae2
HH update
2014-10-11 14:28:00 +11:00
CoderTim
3422f48325
New acheivements
2014-10-10 21:49:03 -04:00
Chiss
b61979a31f
UHC anti-xray; veins can now contain multiple ores. prevents veins occluded by other veins being removed.
2014-10-10 19:05:04 +11:00
Chiss
7d1a62e810
UHC anti-xray visibility update
2014-10-10 18:58:12 +11:00
Chiss
0acaf2e426
removed anti-xray on coal
2014-10-10 18:56:21 +11:00
Chiss
d0d2622ecc
added UHC on-the-fly anti-xray
2014-10-10 18:54:38 +11:00
Chiss
a739712dca
fixed game autostart flag bug.
...
added UHC gem rewards
2014-10-10 15:26:04 +11:00
Chiss
e3747b5183
Minestrike fixes
...
Hub UHC announcer
2014-10-10 13:07:59 +11:00
Chiss
232dd231d0
UHC joinability/MOTD
...
Minestrike spec shop bug fix
2014-10-10 10:49:39 +11:00
Chiss
ffc2ff5058
Modifided output of friends list
...
- buttons to left side for alignment
- sorted by sent>offline>pending>online
- improved 'no friends' message
2014-10-09 12:15:45 +11:00
Chiss
8701f9ddcc
Added TabTitle
...
Converted MineStrike to use scoreboard name hiding
2014-10-09 10:35:54 +11:00
Chiss
7a345dce95
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-05 13:40:15 +11:00
Chiss
d3f87dff46
MineStrike update
2014-10-05 13:37:27 +11:00
Jonathan Williams
9033843a31
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-03 01:50:35 -07:00
Jonathan Williams
c641eab3c7
Fixed up friends.
2014-10-03 01:50:23 -07:00
Chiss
cda9234ad3
Fixed TimeInGame stat not recording sometimes
2014-10-03 11:17:36 +10:00
Chiss
17e34e2060
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-03 10:49:42 +10:00
Chiss
31ceaad7fe
MineStrike audio update
2014-10-03 10:49:26 +10:00
CoderTim
ce306e88ed
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-09-30 02:45:28 -04:00
CoderTim
70fd8835ac
Added GamesPlayed and TimeInGame stats
2014-09-30 02:45:20 -04:00
Shaun Bennett
c7d34e70ef
Merge remote-tracking branch 'origin/master'
2014-09-29 17:42:13 -05:00
Shaun Bennett
7892c442d0
Add show mac reports user pref for mod+
2014-09-29 11:14:20 -05:00
Chiss
79e808814a
Minestrike cleans up incendiary at the end of rounds
2014-09-25 20:52:13 +10:00
Chiss
969c7c0fde
Music gadget fixes
...
Tournament point tally
Removed snow from frosty HorseMount
Added Tournament hub invite messages
2014-09-24 15:46:55 +10:00
Chiss
5774de552d
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-09-22 17:53:39 +10:00
Chiss
a58335d906
Added GameStatManager.java
2014-09-22 17:46:36 +10:00
CoderTim
77e21c0d99
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-09-22 02:53:55 -04:00
CoderTim
1949de4fd7
Database implementation of NpcManager partially complete
2014-09-21 15:45:15 -04:00
Chiss
7ca4b6830b
added in GameStatManager
2014-09-21 09:28:12 +10:00
Chiss
9fce0b1926
Added small cooldown to be able to click hub clock after your gamestate changes. (prevents accidental clicking)
...
Moved stat stuff to gamemanager.
2014-09-21 09:26:34 +10:00
Chiss
767a0247a6
More change to end game title :)
2014-09-20 16:36:30 +10:00
Chiss
6e60c301cf
fixed Title for end game
2014-09-20 16:33:24 +10:00
Chiss
d9677ddda2
Disabled saving game player log for non-tournament
2014-09-20 16:28:45 +10:00
Chiss
a830c72d22
Jukebox will be removed.
2014-09-20 15:29:59 +10:00
Chiss
0d090d7bdc
fixed issue with MASSSSSSSSSIVE PLANET SIZED gui scale
...
added lore to coins in GUI, to help new players and sell more ranks
slightly lowered hitbox for headshots in minestrike
2014-09-20 09:10:55 +10:00
Chiss
9bbac7578e
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/treasure/Treasure.java
Plugins/Mineplex.Hub/src/mineplex/hub/modules/ParkourManager.java
2014-09-20 08:29:06 +10:00
Jonathan Williams
96498af626
Fixed parkour bug with gadget blocks.
...
Removed a ton of debug messages with inventory close.
2014-09-19 09:06:42 -10:00
Chiss
21c131273e
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-09-19 18:01:52 +10:00
Chiss
91037384f9
Loot tweaks
...
Music fixes
some bug fixes
2014-09-19 18:01:38 +10:00
CoderTim
edce1c9f90
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-09-19 02:46:12 -04:00
CoderTim
8cb836d5b3
Fixed some achievement bugs
2014-09-19 02:46:04 -04:00
Shaun Bennett
5d643c00d5
treasssssurreeeeees
2014-09-18 21:03:46 -05:00
Shaun Bennett
88a8e3a896
Hackyish way to log rewards given out in a database
2014-09-18 14:35:59 -05:00
Chiss
ed59e03795
Loot update
2014-09-18 17:05:56 +10:00
CoderTim
8b14c85572
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-09-18 01:57:04 -04:00
CoderTim
f8ee20c433
Record server name in basic game stats
2014-09-18 01:56:46 -04:00
Chiss
fed3d31374
MineStrike fixes
2014-09-18 15:44:48 +10:00
Chiss
09a3cc16b0
Reward stuffs
2014-09-18 14:36:22 +10:00
Chiss
bb8e481c7f
More Reward stuff
2014-09-18 14:25:39 +10:00
Chiss
8780d5e4ee
MS fixes
2014-09-17 11:18:59 +10:00
Chiss
e6797582f9
Minor fixes
2014-09-17 08:59:09 +10:00
CoderTim
6eed36f0ee
Accidentally committed with line of code commented out
2014-09-15 23:46:44 -04:00
CoderTim
c5ff9da552
Record basic game stats (game type, timestamp, duration, winners, losers)
2014-09-15 23:31:53 -04:00
Jonathan Williams
c7e0ebefd1
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-09-13 20:52:13 -10:00
Jonathan Williams
a395cae764
Fixes for Custom tag
...
Fix for Bridge time
Fix for tournament auto whitelist.
Added UI stuf for tourney
Added build files for arcade.
2014-09-13 20:50:27 -10:00
Chiss
26a51f4ef2
Re-allowed opening of chests (for GUIs) during games.
2014-09-14 15:28:43 +10:00
Chiss
f3df86a5a9
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-09-14 14:10:51 +10:00
Chiss
7e3b9b4b3a
some 1.8 title stuff
2014-09-14 14:10:40 +10:00
Jonathan Williams
a196e43fde
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java
2014-09-12 19:46:19 -10:00
Chiss
e36f843feb
Fixed bug in MineStrike
2014-09-13 12:29:35 +10:00
Jonathan Williams
14c4152248
Fixed CustomTagFix.
...
Updated ServerData ServerGroup and SErverMonitor for new flags in Arcade.
2014-09-12 10:03:33 -10:00
Chiss
5de59b6e0e
Hub UHC countdown basics
...
UHC MOTD timer stuff
2014-09-12 18:06:51 +10:00
Chiss
b5152bd621
removed some redundant repeated color stuff
2014-09-12 11:59:32 +10:00
Chiss
0dff0412d1
Fixed game flag for not allowing inventory opens
...
Removed some redundant flags in game
Lots of MineStrike updates
Fixed NPE in WinWithoutLosingTeammateStatTracker
2014-09-12 11:47:39 +10:00
Chiss
092e9ba479
Modified UHC borders for release
2014-09-11 17:44:57 +10:00
CoderTim
235cf8cae7
Fixed win stats on solo games
2014-09-09 02:18:20 -04:00
CoderTim
b341089cfe
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-09-08 16:28:50 -04:00
CoderTim
90d88ebd0b
Fixed "The Longest Shot" achievement bug
2014-09-08 16:27:09 -04:00
Chiss
347e2b1bf5
Changed FIRE items to Blaze Powder
2014-09-08 10:14:55 +10:00
Chiss
f138a4108b
Deregister stat trackers from listener
2014-09-06 22:01:05 +10:00
Jonathan Williams
558231457c
Fixed disguises leaving extra tags
...
Fixed memory problem in Arcade.
2014-09-06 03:39:20 -07:00
Chiss
644d3da050
JOOQ for Eclipse
2014-09-06 11:31:55 +10:00
Chiss
892b67beb2
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-09-05 21:43:33 +10:00
Jonathan Williams
d01529a344
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2014-09-05 04:38:23 -07:00
Jonathan Williams
1c6790b611
Fixed for DisguiseManager
...
Rewrote packet handling
Fixed up CustomTagFix
Removed swapping kits in Block Hunt
Removed Stacked entities for 1.8 players.
2014-09-05 04:36:01 -07:00
Chiss
4064c5238c
bridges volcano fix
...
minestrike npe fix
2014-09-05 21:35:26 +10:00
CoderTim
3830ab8e0f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-09-05 06:06:13 -04:00
CoderTim
91a2266a04
Set up jOOQ, fixed some IntelliJ issues, and added leaderboard stat tracking
2014-09-05 04:00:51 -04:00
Chiss
4e94bcfd98
Block Hunt winners fix (team/solo)
2014-09-05 17:29:23 +10:00
Chiss
abc95853f7
sulhpur bomb fix
2014-09-05 15:47:35 +10:00
Chiss
8c1e0c3e9e
Fletcher data fix
...
Minestrike stuff
2014-09-05 15:45:14 +10:00
Chiss
b691b1bad0
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-09-05 12:51:59 +10:00
Chiss
f6ce9abed8
Minestrike
...
- added mixed slow/instant mode
- added accurate hitboxes for slow bullets
- added many new weapons
- removed speed from knife
- adjusted gun balance
2014-09-05 12:28:29 +10:00
Jonathan Williams
b28fc8ee6b
Added custom name tag fix for mobs for 1.8 players
...
Worked on boss bar display.
Bug with <=50% hp.
2014-09-04 11:33:51 -07:00
CoderTim
74e012a811
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-09-03 16:54:41 -04:00
CoderTim
39b46bc8f5
Fixed some NPEs
2014-09-03 16:53:29 -04:00
Jonathan Williams
92191dc19a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Nautilus.Core.CraftBukkit/src/net/minecraft/server/v1_7_R4/PlayerConnection.java
2014-09-03 03:47:15 -07:00
Jonathan Williams
a4871b5509
Updated to latest spigot with 1.8 support.
...
Tweaked disguise manager for 1.8 support.
Work on CUstomer support server + admin stuff.
2014-09-03 03:46:24 -07:00
Chiss
21225d7b65
Minor Fixes
2014-09-03 15:09:14 +10:00
Chiss
50140ef92d
Minestrike update
2014-09-03 14:49:38 +10:00
Chiss
246f2e91d9
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-09-03 12:38:57 +10:00
Chiss
58f98881f2
Minestrike Update
2014-09-03 12:38:44 +10:00
Chiss
1dec79c0fa
Minestrike update
2014-09-03 12:28:45 +10:00
Shaun Bennett
2d5c676e1b
Merge remote-tracking branch 'origin/master'
2014-09-02 18:57:35 -05:00
Chiss
d5766d62ae
nerf p90
2014-09-02 16:49:45 +10:00
Chiss
449281501f
MineStrike Update
2014-09-02 16:49:15 +10:00
Chiss
5d6834633f
MineStrike update
2014-09-02 11:16:17 +10:00
Shaun Bennett
df882012e5
When items are dropped in The Bridges, only the player that broke the block can pickup the item for 8 seconds. (Only applies to specific item types)
2014-09-01 15:38:07 -05:00
Chiss
05623b7522
Initial MineStrike push
...
fixed frames being breakable in games
2014-09-01 21:37:39 +10:00
Jonathan Williams
8198bb31c8
Added sneaking to player disguise.
...
Did work on DDoSProtectionSwitcher
Work on AccountAdministrator to fix rank issues.
2014-09-01 00:56:32 -07:00
Chiss
2b333859d1
PUUSH
2014-08-30 19:24:04 +10:00
Chiss
3767911718
updated game desc output
2014-08-30 19:07:43 +10:00
Chiss
7696349187
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-30 16:34:10 +10:00
Chiss
2c30cc3ef4
Implemented new servers flags
...
Removed OP from Admisn in HUB, gave them /gm command instead
2014-08-30 16:33:56 +10:00
CoderTim
b7baa1b2f4
Count disconnecting from the server as a loss
2014-08-30 02:30:07 -04:00
CoderTim
34f04ad4e3
Fixed Champions Assassination and Longshot achievements
2014-08-29 21:09:51 -04:00
Chiss
41daba98c4
Background work for Minestrike
...
Admins no longer have OP in hubs. They have /gm command to gamemode.
2014-08-29 18:21:08 +10:00
Chiss
1f6b9374eb
disable le minestrike
2014-08-29 11:55:06 +10:00
Chiss
c3bb0ddbcb
Chest example gadget for shauny
2014-08-29 11:00:16 +10:00
CoderTim
cc57ddf4bc
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-28 06:54:36 -04:00
CoderTim
bdef9acecd
Fixed DragonEscape win stat tracker
2014-08-28 00:53:54 -04:00
Chiss
ec4cb91a1c
Poll changes
...
Achievement output double space fix
2014-08-28 11:50:09 +10:00
Jonathan Williams
526ca42add
Fixed Gem booster problem.
...
FIxed stat problem.
2014-08-27 12:48:24 -07:00
Chiss
9439daa852
Fixed bug where spectators could trigger anti-cheat in bridges
2014-08-27 15:16:20 +10:00
Chiss
d9ef5f50be
disabled minestrike
2014-08-27 14:23:31 +10:00
Chiss
596bcbfae6
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-27 14:23:01 +10:00
Chiss
da5f953212
Fixed BlockMorph leaving blocks behind when player was teleported.
2014-08-27 14:22:35 +10:00
CoderTim
5ef2772abd
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-26 20:27:51 -04:00
CoderTim
7d6572ff4d
Fixed SheepGame Selfish achievement
2014-08-26 20:27:39 -04:00
Chiss
f25f7d3aa2
Fixed 1v3 achievement not giving achievement if players quit (required 4 at END)
2014-08-27 09:52:33 +10:00
Chiss
5540835052
removed micro debug
...
fixed a bug in achievement output
2014-08-27 09:09:06 +10:00
Chiss
f9ce0d353c
Achievements now need 75%+ players at START of game
2014-08-27 08:57:11 +10:00
CoderTim
d9e1f35985
Fixed BadHiderStatTracker and limited stat recording to when games are at least 75% full
2014-08-26 16:30:55 -04:00
Chiss
17649ce36c
Fixed bug where desc for past-completed achievements was still showing
2014-08-26 21:51:59 +10:00
Chiss
ab29a5fa29
Fixed text output in Achi GUI for completed
2014-08-26 18:06:01 +10:00
Chiss
3eae26ef80
Updated Achievement Output
2014-08-26 18:03:29 +10:00
Chiss
d62b59776f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-26 17:54:50 +10:00
Chiss
116fe496a8
Changed post game achievement output
...
Added Reward to Achi GUI
2014-08-26 17:53:54 +10:00
Chiss
7e7906865f
Fixed some stats being added after send-off
2014-08-26 17:45:35 +10:00
Jonathan Williams
526b5c333a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-26 00:34:00 -07:00
Jonathan Williams
137b8692e4
Added Gem booster use.
2014-08-26 00:33:48 -07:00
Chiss
0546c9e175
Fixed so only Supply drop chests trigger achievement
2014-08-26 17:33:23 +10:00
Chiss
1b15a57fc8
Added Gem Rewards for Achievements
2014-08-26 17:10:20 +10:00
Chiss
dd61077850
Added missing Achievements
2014-08-26 14:46:10 +10:00
Chiss
1b3e32ca26
Added Arcade Achievements
2014-08-26 14:42:17 +10:00
Chiss
28d523d696
Added Achievements
2014-08-26 13:42:42 +10:00
Chiss
86930de23e
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/AssistsStatTracker.java
2014-08-26 08:19:50 +10:00
Chiss
07ee44508e
Missing Gadgets
2014-08-26 08:17:41 +10:00
CoderTim
933d32d8f8
Fixed team death/kills stats
2014-08-25 18:06:50 -04:00
CoderTim
9acc7d8496
Added team kill and death achievement trackers
2014-08-25 17:43:49 -04:00
CoderTim
4ce537a3a7
Fixed some NPEs and achievement bugs
2014-08-25 16:27:02 -04:00
Chiss
13eb3da0fa
Achievment gui changes
2014-08-25 09:26:01 +10:00
Chiss
7669998ad3
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-25 08:38:29 +10:00
Shaun Bennett
ff441f2262
Merge remote-tracking branch 'origin/master'
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementData.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2014-08-24 16:14:29 -05:00
Shaun Bennett
2cb87b23e6
Stat Gui, Start of Treasure Gui (disabled)
2014-08-24 16:08:19 -05:00
Chiss
23f6d0ae1a
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-24 16:46:00 +10:00
Chiss
3f5cff3e21
Killing cheaters for a few things in bridges
2014-08-24 16:45:47 +10:00
CoderTim
c89461628b
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-23 16:00:26 -04:00
CoderTim
fb90336d4e
Finished stats/achievements
2014-08-23 16:00:15 -04:00
Chiss
642f8b46b9
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-23 18:01:35 +10:00
Chiss
7348a26951
fixed damage dealt npe
2014-08-23 18:00:23 +10:00
Chiss
af9bf0727a
Fixed damage taken stat NPE
...
Added tournament team auto-rejoin
2014-08-23 17:55:28 +10:00
Jonathan Williams
70beb58bd6
Enabled debugging in Hub/Arcade
2014-08-23 01:49:48 -05:00
Chiss
3ec43f90e8
GameAchievementManager now utilises TaskManager to record whether or not people have previously completed Achievements
2014-08-23 15:04:43 +10:00
CoderTim
4afafe2d51
Some stats fixes
2014-08-22 21:54:08 -04:00
CoderTim
b2b208bdba
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-22 17:30:08 -04:00
CoderTim
02bb53578a
Registered stat listeners with each game
2014-08-22 17:20:02 -04:00
Chiss
231ef2bbe1
Cosmetic Update
2014-08-23 04:30:41 +10:00
Chiss
0022586e3e
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-22 17:08:29 +10:00
Chiss
97c087a28d
Allowed commands to specify specific ranks
...
allowed youtube/build to start/set games
2014-08-22 17:05:14 +10:00
CoderTim
591b5c026c
Almost all achievements done
2014-08-21 18:55:40 -04:00
Jonathan Williams
5e47a12531
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-21 15:56:02 -05:00
CoderTim
94f2aade08
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-21 15:01:22 -04:00
Jonathan Williams
1398543490
Fixed bug with Projectile
...
Changed tp out of game to 1 per tick.
2014-08-21 02:07:54 -05:00
Chiss
ac088e85b2
Added some game flags
...
Dragon escape changes
2014-08-21 13:35:31 +10:00
CoderTim
f266f4e016
More achievements
2014-08-20 19:20:11 -04:00
Chiss
60869d114e
Dragon Escape changes
2014-08-20 15:45:10 +10:00
Shaun Bennett
a7bb84be0b
Revert chris' revert
2014-08-19 21:24:49 -05:00
CoderTim
18ca7d5656
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-19 21:16:44 -04:00
CoderTim
599277b88e
More work on achievements
2014-08-19 21:16:28 -04:00
Chiss
94e5eb03da
Fixed errors for new getPlayers method.
2014-08-20 10:43:56 +10:00
Chiss
7535f39d18
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-20 10:39:58 +10:00
Chiss
afea0ba87f
Parser Merge
2014-08-20 10:39:41 +10:00
CoderTim
09c01d90ad
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-19 19:07:37 -04:00
Shaun Bennett
e1a57a673e
Update getOnlinePlayers() to recent bukkit changes, fixes IntelliJ errors
2014-08-19 16:58:55 -05:00
CoderTim
05686cb584
Work on achievements
2014-08-18 16:41:16 -04:00
Chiss
d8123795aa
changed the way disguises show rank.
2014-08-16 16:33:18 +10:00
Chiss
508ef65fcf
Added missing file
2014-08-16 14:17:15 +10:00
CoderTim
19222c6815
Updated IntelliJ environment to be compatible with latest changes
2014-08-15 15:51:29 -04:00
Chiss
29db90837d
Spleef Update
...
Map parser block stuff
2014-08-15 15:28:50 +10:00
Chiss
85522cddca
Debug (will clean once fixed)
...
Game stats
2014-08-15 09:49:00 +10:00
Chiss
74435bac12
fixed bug where players kept inventory open, to be able to enable morphs ingame.
2014-08-14 17:31:14 +10:00
Chiss
5f80d9c57a
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
2014-08-14 11:24:51 +10:00
Chiss
b6ba142c5a
Mineplex in scoreboard is fancier.
2014-08-14 11:23:48 +10:00
Shaun Bennett
b9534bd245
Merge remote-tracking branch 'origin/master'
2014-08-13 20:07:01 -05:00
Shaun Bennett
cfe45139b6
Adjust lobby text for the removal of premium kits
2014-08-13 19:56:47 -05:00
Shaun Bennett
83f04273fa
Sort kits properly when a game uses NullKit
2014-08-13 19:45:38 -05:00
Chiss
b21ae8ef72
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-14 10:32:52 +10:00
Chiss
7a3bba45a7
Mergey!
2014-08-14 10:32:41 +10:00
Jonathan Williams
6039168601
Updated code base to build #1604 spigot
2014-08-13 18:57:37 -05:00
Chiss
95394c51cc
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-12 11:24:12 +10:00
Chiss
2d67d4ce36
Achievement fix + active
2014-08-12 11:23:53 +10:00
Shaun Bennett
d63137ead2
Merge remote-tracking branch 'origin/master'
2014-08-11 12:44:28 -05:00
Shaun Bennett
7e93ed657f
Display boss bar properly while a dragon mount is spawned in arcade
2014-08-11 12:26:56 -05:00
Chiss
02270a9d25
TNT effect only triggers off self tnt.
2014-08-11 15:33:45 +10:00
Chiss
7191d48bd0
fixed paintball pre-game bug
2014-08-11 14:25:11 +10:00
Chiss
e4871c4988
Disabling cosmetics 5s before game starts, was having some carryover due to lag.
2014-08-11 11:55:00 +10:00
Chiss
d81b32bd3a
Sneaky Assassins balance+polish
2014-08-10 21:05:41 +10:00
Chiss
06bcf5079b
Disabled Gem hunter (bugged?)
...
Disabled chicken morph letting people fly
2014-08-10 18:36:18 +10:00
Chiss
25b525837f
Fixed TNT blowing up lobby when it changed to prepare.
2014-08-10 11:07:05 +10:00
Chiss
9057246ab8
Arcade Inventory fixes
2014-08-10 10:50:31 +10:00
Chiss
3533ce1b7e
Particles dont play in stealth games.
2014-08-10 01:04:53 +10:00
Chiss
616a0ecf11
Staff get all kits unlocked.
2014-08-10 00:32:50 +10:00
Chiss
38fd85335f
Fixes disguises being disabled.
2014-08-10 00:21:45 +10:00
Chiss
62cc422f42
FINAL FIX
2014-08-10 00:13:04 +10:00
Chiss
c95cf79aa6
fxied more
2014-08-10 00:10:08 +10:00
Chiss
a43a5b2c0e
bacon brawl fix
...
signel game ultra shows in hub scoreboard
2014-08-10 00:09:39 +10:00
Chiss
3d1ddecffb
Smash Kit fix
...
Gem Booster (dragons) fix
2014-08-09 23:25:13 +10:00
Chiss
cac7f85410
Single game ultra kit unlock
2014-08-09 23:10:40 +10:00
Chiss
23f93e55cf
fixed dragons destroying pregame lobby
2014-08-09 22:59:54 +10:00
Chiss
ff6ea3c798
Added Cosmetics to Arcade
...
Set prices on cosmetics
2014-08-09 19:55:05 +10:00
Jonathan Williams
8fe4e39207
Split up Cosmetic shop and Inventory
...
Added Ammo purchase for item gadgets.
2014-08-09 03:57:56 -05:00
Chiss
91a79f0345
Pig Morph
...
Morphs have tags/
2014-08-09 14:57:01 +10:00
Chiss
fb19e93992
Gem text
2014-08-09 13:46:41 +10:00
Chiss
c93a49add2
More gem boosty!
2014-08-09 13:42:29 +10:00
Chiss
2e95548b6e
Gem Boosters!
2014-08-09 13:39:57 +10:00
Chiss
3a220b6f1c
Micro Update
...
SGTeams inv click fix.
2014-08-09 13:11:32 +10:00
Jonathan Williams
6bd9273edf
Refactored getting item count for ClientInventory
...
Fixed up Arcade gem boosters so they are hooked into inventory.
Cleaned up unused code.
2014-08-08 22:10:02 -05:00
Chiss
313f675ae4
Hub Parkour update
...
Smash kit prices
2014-08-09 12:16:37 +10:00
Chiss
b36b1cb007
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-08 17:05:23 +10:00
Chiss
fa3695be4e
Gem Booster In Lobby
...
Achievement Stuff
2014-08-08 17:05:11 +10:00
Shaun Bennett
9395711dcb
Merge remote-tracking branch 'origin/master'
2014-08-08 01:51:50 -05:00
Shaun Bennett
b7ecf5eb04
GET MINEPLEX ULTRA FOR AMAZING FUN TIMES
2014-08-08 01:51:11 -05:00
Chiss
1a33dbb5ee
Achievement Module
...
Gem Booster/Achivement
2014-08-08 13:46:35 +10:00
Shaun Bennett
2fd7621a81
Display proper team in Arcade Lobby (Fixes bug where a player connecting will break scoreboards)
2014-08-07 18:44:27 -05:00
Jonathan Williams
c01fbd279d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/gadget/GadgetManager.java
2014-08-07 00:48:32 -07:00
Jonathan Williams
6d86f403ac
Added coins Currency to web api
...
Added coins purchase for all cosmetic items
Added Stats manager
Added Inventory Manager
Redesigned gadgets/morph/particle/pets/mounts page and inventory.
2014-08-07 00:33:24 -07:00
CoderTim
8a74b08b0d
Fixed silly mistake I made
2014-08-06 23:59:52 -04:00
CoderTim
f7f9d3e703
Sneaky assassin power-up maximum is 5 and hanging entities cannot be damaged
2014-08-06 21:35:11 -04:00
Chiss
c647e6b48d
Missing morphs
...
Bacon brawl knockback increase over time
Parse color error fix
2014-08-07 09:47:11 +10:00
Chiss
a737aa8624
Game desc
2014-08-06 19:16:17 +10:00
Chiss
c4768a8a9c
Smokebomb doesnt end instantly :o
2014-08-06 19:13:25 +10:00
Chiss
f68586cca4
Micro Battle
2014-08-06 19:00:18 +10:00
Chiss
248111749f
Sneaky Changes
2014-08-06 17:14:07 +10:00
CoderTim
bea6eabb95
Sneaky Assassins: Revealed players have wither effect. Fireworks are yellow. Additional announce messages
2014-08-06 01:41:50 -04:00
CoderTim
16353c4bc9
Changes to Sneaky Assassin power-ups, including addition of compass power-up.
2014-08-06 01:23:06 -04:00
Chiss
9e047847c2
scoreboard fix
2014-08-06 12:42:07 +10:00
Chiss
4108a02f50
Sneaky scoreboard order
2014-08-06 12:37:41 +10:00
Chiss
a0010668c6
Sneaky Assassins changes
2014-08-06 12:23:02 +10:00
Chiss
f09506e436
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sneakyassassins/SneakyAssassins.java
2014-08-06 11:09:16 +10:00
Chiss
c8dfb2f02e
Parser Fixes
...
Sneaky Stuff
2014-08-06 11:07:49 +10:00
CoderTim
3ee0b271b6
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-05 01:23:37 -04:00
CoderTim
0240d50029
Sneaky Assassins Changes:
...
- when you get a kill, give an armor upgrade and 1 smoke bomb
- Revealer range increased to 12 blocks
- NPC dies once every 2 seconds
- Lose 1 hunger every second. Gain 8 when damaging player or NPC
- Reveal all players every 60 seconds, for 2 seconds
- Added cloaking back to smoke bomb
- Power-up is always green and type alternates per player. Power-ups always include smoke bomb and mushroom soup.
- NPC speed slightly decreased
- Corrected sword power-up progression
2014-08-05 01:23:24 -04:00
Shaun Bennett
e8d14e9fbf
Remove created by comment
2014-08-04 00:33:34 -05:00
Shaun Bennett
1c5b3919e1
Merge remote-tracking branch 'origin/master'
2014-08-04 00:31:56 -05:00
Shaun Bennett
0edb0d74a7
Fix bugs with kit sorting + cost of kits
2014-08-04 00:31:46 -05:00
CoderTim
e7d3cf9e02
Sneaky Assassins previous commit bug fix
2014-08-04 01:06:11 -04:00
CoderTim
012382ec48
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-04 01:02:27 -04:00
CoderTim
8a727e1365
Smarter Sneaky Assassins AI
2014-08-04 01:02:05 -04:00
Shaun Bennett
e4662ab563
Update my SneakyAssassinKit change to work with Tim's changes
2014-08-03 23:41:54 -05:00
Shaun Bennett
34dfe8dacd
Merge remote-tracking branch 'origin/master'
2014-08-03 23:32:37 -05:00
Shaun Bennett
fe32cf5444
Remove KitAvailability.Blue
2014-08-03 23:31:55 -05:00
CoderTim
39e23c16f0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-08-04 00:00:12 -04:00
CoderTim
482f48f994
Prevent players in Sneaky Assassins from breaking paintings and item frames
2014-08-04 00:00:04 -04:00
CoderTim
ec48a59301
Added option DISGUISE_TYPE:<ENTITY_TYPE> in WorldConfig.dat for Sneaky Assassins to configure which entity players are disguised as.
2014-08-03 23:59:10 -04:00
Shaun Bennett
35b16e026c
Blue kits cost gems instead of being premium kits
2014-08-03 22:44:01 -05:00
Chiss
07fe476fd3
fix for stuff that jon broke
2014-08-01 17:45:22 +10:00
Chiss
b6fe33e6fb
Ultra/hero gems removed
2014-08-01 17:03:07 +10:00
Chiss
0f9e72d623
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-08-01 14:06:13 +10:00
Chiss
599a6eb1f7
Changed kit availability to be based on free/premium.
2014-08-01 14:05:53 +10:00
CoderTim
c36242cc47
Added stained glass around power-up beacon base in sneaky assassins to identify power-up more easily.
...
Added workaround to make revealer fireworks explode consistently
Power-ups use UtilPlayer.message and have a sound effect is player when a power-up is aqcuired
Power-up bug fixes
2014-07-31 23:35:50 -04:00
CoderTim
6ac00cde99
Move Sneaky Assassins NPCs during Prepare and Live
2014-07-31 23:32:26 -04:00
CoderTim
22748eb225
Updated KitRevealer description
2014-07-31 23:31:42 -04:00
CoderTim
77b6f0250e
Play zombie_unfect sound when PerkRevealer explodes
...
PerkSmokeBomb also applies effects to NPCs
PerkSmokeBomb now uses HUGE_EXPLOSION effect
Set Sneaky Assassins PrepareFreeze flag to false
2014-07-30 23:56:40 -04:00
Chiss
308c2e1b91
Kit availability
2014-07-31 13:00:05 +10:00
Chiss
a4d579789c
Sneaky Assassins changes :)
2014-07-31 12:58:33 +10:00
Jonathan Williams
4d397438be
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-29 21:11:15 -07:00
CoderTim
0382afecd8
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-29 20:24:04 -04:00
CoderTim
fa91bf0a00
Disable dropping hunger in Sneaky Assassins
2014-07-29 20:22:46 -04:00
Jonathan Williams
46cc2576dd
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-26 10:41:04 -07:00
Jonathan Williams
4e1a05e9bd
Fixed whitelist issue with tournament mode.
2014-07-26 10:40:49 -07:00
Chiss
78b3d3b35c
restored original bridge timer :)
2014-07-26 21:05:12 +10:00
Chiss
3f4e4b6607
fixed -1 not working
2014-07-26 21:03:50 +10:00
Chiss
802415be8f
-1 team kills for suicide (only after bridge drop)
2014-07-26 20:57:40 +10:00
Chiss
f090ed9313
end game fixes
2014-07-26 20:53:48 +10:00
Chiss
4f46ccc8aa
Winner is decided on bridge tourney timeout
2014-07-26 20:29:01 +10:00
Chiss
fa73ab5335
Bridges Tourney stuff
2014-07-26 17:40:17 +10:00
Chiss
21314afabe
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-07-26 17:03:30 +10:00
Chiss
107388baa3
Added game flag to allow clicking in inventory during games
2014-07-26 17:03:03 +10:00
Jonathan Williams
a455042c07
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-25 23:38:38 -07:00
Jonathan Williams
12b42cad29
Made tournament changes:
...
Staff can't see team chat
Bridge tournament time is 90 min
Kits are not all free
Removed twitch charity text/motd
If team not picked, you go to spec.
2014-07-25 23:38:21 -07:00
CoderTim
fe46355130
Added missing description to Sneak Assassin revealer items
2014-07-24 21:25:59 -04:00
CoderTim
fe356add41
Restore original blocks when Sneaky Assassin power-up beacon is removed
2014-07-23 15:45:30 -04:00
CoderTim
a6a274069c
Prevent power-up message spam when player is fully powered-up
2014-07-21 17:26:45 -04:00
CoderTim
4460f2e651
Prevent fully powered-up Sneaky Assassin players from using additional power-ups
2014-07-21 16:29:15 -04:00
CoderTim
efa74f509a
Fixed bug where revealer doesn't always work
...
Prevent players from trading with sneaky assassin npcs
Display message when user powers up
2014-07-18 02:48:06 -04:00
CoderTim
64feaf63ed
Implemented Sneaky Assassin Revealer kit
2014-07-15 00:36:38 -04:00
CoderTim
c547801b7b
Added Sneaky Assassin NPC movement
2014-07-11 22:55:48 -04:00
CoderTim
b15534e1b2
Some work on Sneak Assassins NPCs
...
Added /game start <seconds> to start a game faster
Optimized GameTeam.GetSpawn() by avoiding unnecessary square root calculations
2014-07-11 00:56:25 -04:00
Mini-Chiss
bd6b9b8888
so many fix
2014-07-08 17:35:27 -07:00
Mini-Chiss
c5e05523d3
sneakyfix
2014-07-08 17:34:47 -07:00
Mini-Chiss
dd0040086d
Parser Permissions
...
Sneaky Assasssin thingy.
2014-07-08 17:33:22 -07:00
Mini-Chiss
1455b4001f
Parser Update
2014-07-08 15:13:30 -07:00
Jonathan Williams
963c71f128
Fixed internet status stuff for bungees.
...
Fixed new portal arg req.
2014-07-08 12:44:17 -07:00
Mini-Chiss
cf25bdc44f
Bridges fix being able to break mid chests before gamestart
...
Map parser Updates
2014-07-07 19:04:44 -07:00
Mini-Chiss
ef86fe6948
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-07-07 16:24:43 -07:00
Mini-Chiss
62f6ea815d
Champs Balance Update
...
Map Parser Update
2014-07-07 16:23:55 -07:00
CoderTim
38e4240a61
Fully implemented Sneaky Assassins Power-Ups
2014-07-07 19:10:29 -04:00
CoderTim
fe1bf95342
Fixed code style and updated IntelliJ code style settings
2014-07-07 14:45:02 -04:00
Mini-Chiss
df8562e69a
Tourney mode for UHC
2014-07-04 23:11:13 -07:00
Mini-Chiss
c65712c260
UHC fixes
...
Sneaky Assassin listener leak fix
Some map parser stuffs.
2014-07-04 23:04:46 -07:00
CoderTim
6365ec5351
Started on Sneaky Assassins kits and power-ups
2014-07-04 11:14:34 -04:00
CoderTim
2fb2aadf66
Merge remote-tracking branch 'origin/master'
2014-07-04 11:12:52 -04:00
CoderTim
46c979e088
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-04 11:12:33 -04:00
Mini-Chiss
d19b34b0e4
Removed debug
2014-07-02 17:14:52 -07:00
Mini-Chiss
22ceba9841
Fixed Scoreboards!
2014-07-02 17:12:52 -07:00
Jonathan Williams
d0fafce585
Reverted change to helper only joining full, now ultras can.
...
Added check so BETA servers cannot be joined by less than Helper.
Fixed message in AccountAdministrator for rankUpdate
2014-07-02 16:59:31 -07:00
Jonathan Williams
8eaad57516
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-02 16:05:37 -07:00
Jonathan Williams
f1393ffb33
Fixed rankUpdate changing existing higher ranked players.
...
Fixed join limits in arcade and hub.
2014-07-02 16:05:26 -07:00
Mini-Chiss
bea6902198
Spectators can use /tp
2014-07-02 13:09:47 -07:00
Mini-Chiss
82dd94de9b
Scoreboard fix
...
Unbreakable boats in hub
2014-07-02 12:50:04 -07:00
Mini-Chiss
05e116ea0d
Scoreboard flicker fixed!
2014-07-02 12:38:41 -07:00
Mini-Chiss
558f79fe34
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-07-02 10:58:34 -07:00
Mini-Chiss
17c36026f6
fixed bug where player who comes first was not being added to ranks. (get nothing)
2014-07-02 10:57:30 -07:00
Peter Miller
6c67ff9106
Resolving issues from Portal.java conflict resolution
2014-07-02 04:09:41 -04:00
Jonathan Williams
9514f6391e
Fixed bug in Arcade with client manager.
2014-07-01 21:42:00 -07:00
CoderTim
44a57a485f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-01 21:39:03 -04:00
Jonathan Williams
081260757d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-01 18:31:26 -07:00
Mini-Chiss
31772196a9
More scoreboard stuff (TDM)
...
New Tug game
2014-07-01 18:30:04 -07:00
Jonathan Williams
b627e8fdf5
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-01 10:25:12 -07:00
Jonathan Williams
9fd3f14248
Added RankUpdate command.
...
Fixed Lobby joinable issue with server monitor.
Changed server monitor to be fully dynamic for us.
2014-07-01 10:23:22 -07:00
CoderTim
7ea818c0c8
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-07-01 02:20:45 -04:00
Mini-Chiss
8c461b3e1b
Cooldown on Spec Compass
...
Hub Forcefield Update
Scoreboard MINEPLEX refactor
2014-06-30 16:12:42 -07:00
CoderTim
ccb17d5ac3
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-06-27 19:33:34 -04:00
Mini-Chiss
f10b081473
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-06-26 18:38:28 -07:00
Mini-Chiss
3d12196b17
Merge
...
UHC Public
Small refactor for player ranks in games.
Trimed scoreboard teams to 16 chars.
2014-06-26 18:38:11 -07:00
Jonathan Williams
f6ad5c5549
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-06-25 12:07:49 -07:00
Jonathan Williams
4f3ffde892
Added timing/debugging code.
2014-06-25 12:06:24 -07:00
Mini-Chiss
46849745c4
Champions TDM Update
2014-06-23 16:20:50 -07:00
Jonathan Williams
f2c82cbf95
Refactored TimeUtil and added totalling option.
2014-06-20 20:42:36 -07:00
Jonathan Williams
6cac04d399
Optimized create scoreboards.
2014-06-19 00:48:04 -07:00
Jonathan Williams
231ffd7234
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-06-15 17:21:47 -07:00
Jonathan Williams
93fbe70e9c
Added more loggingggggg.
2014-06-15 17:21:40 -07:00
Chiss
c386023a6f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-06-16 10:18:30 +10:00
Chiss
fd17c1b254
More staggered teleports on game end
...
Logging teleports.
2014-06-16 10:18:10 +10:00
Jonathan Williams
6515dd13a0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-06-15 16:25:40 -07:00
Jonathan Williams
0f7885d911
Added safety checks in ClientManager
...
Added logging and teampreference swap fix in arcade.
2014-06-15 16:25:32 -07:00
Chiss
a756bb88a2
NPE log
2014-06-16 09:25:14 +10:00
Chiss
9a79d0ede7
Fixed CME
...
Gadget cost fix
MapParser fix
2014-06-15 15:10:19 +10:00
Chiss
d5c96f95c0
Fixed bug that gave items while respawning.
2014-06-15 12:01:58 +10:00
Jonathan Williams
be8fea8ca9
Changed Chat API key.
...
Fixed PreferenceManager not saving asynchronously.
2014-06-12 08:02:47 -07:00
Chiss
661a869116
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2014-06-10 13:02:17 +10:00
Chiss
7fc2fbe564
Scoreboard Refactor
2014-06-10 12:51:47 +10:00
Chiss
6cba6b9b9e
merge
2014-06-10 10:27:25 +10:00
Jonathan Williams
3ae119d88a
Fixed hub package unlock bug.
...
Fixed Champions build page open bug.
MOved some code around because i'm a boss.
2014-06-08 11:27:14 -05:00
Chiss
967ff44d0a
gamecreation fix
2014-06-05 10:15:22 +10:00
Chiss
644f946f69
error debug
2014-06-04 17:56:21 +10:00
Chiss
4c72651f86
game creation
2014-06-04 17:55:13 +10:00
Chiss
1d549e38ff
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
2014-05-30 15:02:22 +10:00
Chiss
d4465fd8f2
merge
2014-05-30 15:01:08 +10:00
CoderTim
1b5b2d21b2
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
2014-05-28 17:51:38 -04:00