JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,403 Commits 1 Branch 0 Tags 481 MiB
070326e72d
Commit Graph

42 Commits

Author SHA1 Message Date
Sarah
4e9e0243cd Merge branch 'develop' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
#	Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java
 2015-12-16 18:16:08 +01:00
Shaun Bennett
2e49611035 LinkedHashMaps, Buttons 2015-12-08 17:45:27 -05:00
Sarah
bff9a065d9 Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java
#	Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
#	Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
#	Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java
 2015-11-18 18:08:51 +01:00
libraryaddict
21d10e4bec Fix typo 2015-11-04 19:15:06 +13:00
libraryaddict
b3f86ba638 Fixing bugs 2015-11-04 18:34:22 +13:00
libraryaddict
3dda9352e7 Progress 2015-10-16 13:32:23 +13:00
Sarah
2a236684ac Finalizing prototype of Type wars. 2015-08-28 14:47:49 +02:00
Sarah
96dc86a481 Fixing map rotation. 2015-08-15 07:34:04 +02:00
Sarah
3a2011ee6a Improving Map System: GameTypes can have more mapSources now. 2015-07-14 13:22:59 +02:00
Sarah
e72d612379 Implementing the mapSource parameter in GameType and setting up SkywarsTeams and SurvivalGamesTeams. 2015-07-14 05:25:08 +02:00
Mini-Chiss
e1dd3a318e UHC!!!!! 2015-05-12 15:52:19 -05:00
Mini-Chiss
e13e735246 UHC updates! 2015-05-12 14:46:21 -05:00
Mini-Chiss
5e73441b9a UHC world loading 2015-05-11 14:10:51 -05:00
Shaun Bennett
efce714375 DEVP-66 Refactor commonly used classes to Java conventions 
Refactoring + testing jira
 2015-02-26 00:07:07 -05:00
Shaun Bennett
c7f2a8072e Antistack replacement 2014-11-23 19:51:23 -06:00
Chiss
92d9fc4ca0 Deleted deprecated firework module and converted to Util 2014-10-25 11:03:45 +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
Jonathan Williams
6039168601 Updated code base to build #1604 spigot 2014-08-13 18:57:37 -05: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
Mini-Chiss
1455b4001f Parser Update 2014-07-08 15:13:30 -07:00
Jonathan Williams
4f3ffde892 Added timing/debugging code. 2014-06-25 12:06:24 -07:00
Jonathan Williams
f2c82cbf95 Refactored TimeUtil and added totalling option. 2014-06-20 20:42:36 -07:00
Jonathan Williams
93fbe70e9c Added more loggingggggg. 2014-06-15 17:21: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
Jonathan Williams
9136fa0b15 Upgraded to latest spigot. 
Fixed npcs being so loud.
Npcs are now ghosted automatically.

Added UUID on login.
 2014-04-25 00:44:14 -07:00
Jonathan Williams
0375384fb5 Converted to Spigot's latest 1.7.5 2014-04-10 17:15:44 -07:00
Jonathan Williams
bedabd84cc Added silence to kits (UtilEnt.silence) 
Cleaned up a ton of unused code....
 2014-04-08 23:31:32 -07:00
Chiss
bb3f2c6281 CHAMPS 2014-04-08 10:53:41 +10:00
Jonathan Williams
7042159f46 Updated to 1.7 and changed namespaces to 1.7 2014-03-19 02:24:26 -07:00
Jonathan Williams
516e5f7f99 Moved Rejoin ability into TeamGame. 
Added autobalance flag for game.
Punish only does exact name lookup.
 2014-02-07 08:50:13 -08:00
Chiss
3d13fb0dc9 HG Fixes 2013-11-22 23:12:39 +11:00
Chiss
e14bc76639 arcade map directory up up right left down up right update! 
some paintball fixes
H&S start
 2013-11-04 08:59:29 +11:00
Chiss
386e2e3067 Added Champs 
MAC update
 2013-10-31 09:45:11 +11:00
Chiss
f0f7a4156f saving heads to file 2013-10-28 17:53:25 +11:00
Chiss
5563d94111 Halloween event update 
hub News
hub mounts
hub gadgets
 2013-10-25 19:20:14 +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
bf4dc35b5f Added pig Game 
added squid game
added recharged skill event
 2013-09-23 15:48:35 +10:00
Jonathan Williams
85cc6e5b2b Updated to 1.6.4 2013-09-20 01:50:56 -07:00
Chiss
60dd6c84d0 Updated World Parser / Data to account for Y of corner blocks. 
Use same height to have no height limits.
 2013-09-12 09:01:37 +10:00
Chiss
2a65086b70 Added Milk the Cow 
Maps now set Min/Max Y
 2013-09-12 08:57:51 +10:00
Chiss
9fe33bab84 Added UHC 
Added pig disguise
Added func to Game base to support UHC
Moved map to Core
 2013-09-09 18:06:44 +10:00
Jonathan Williams
3fb52c5c71 Initial Commit 2013-08-27 08:14:08 -07:00