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

1769 Commits

Author SHA1 Message Date
Mysticate 87cc40fc0c Fixed a few achievements 2015-07-19 22:38:03 -04:00
Mysticate 8b2b4c2826 Added to MPS 2015-07-19 15:51:34 -04:00
Morten c5f7c4fe0e Finalized after QA testing. Pretty much ready to go 2015-07-19 19:50:53 +02:00
Morten 2cad6223a7 Ubs.. Forgot to actually upload the new kits.. :D 2015-07-18 15:15:53 +02:00
Morten b986cf968e Added new kits, Changed Compass feature, Fixed a lot of bugs 2015-07-18 15:10:03 +02:00
Mysticate 2dc2b8792c Fixes, updates 2015-07-17 17:01:24 -04:00
Sarah 8b26ffaecd Improving Team names in SG, SSM and Skywars and disabled friendly fire. 2015-07-17 14:05:27 +02:00
Cheese 5e05530b1d spawn near allies! 2015-07-17 21:28:46 +10:00
Cheese 6ed3f93df7 fixed some scoreboard stuff 2015-07-17 16:17:01 +10:00
Sarah b7ad0035bc Implementing UHC team system to ssm, sg and skywars. 2015-07-17 07:06:49 +02:00
Sarah 5389193cab Merge branch 'SSM2PlayerTeams' of http://184.154.0.242:7990/scm/min/mineplex into SSM2PlayerTeams 2015-07-17 06:31:10 +02:00
Sarah 02a71bff68 another git fix 2015-07-17 06:30:53 +02:00
Sarah aaae11d426 Git Fix. 2015-07-17 06:29:32 +02:00
Cheese cfb4911c25 added ability for teams will fill before moving onto next team 2015-07-17 12:54:53 +10:00
Cheese 63f6adf295 fixed spawn picking 2015-07-17 12:50:34 +10:00
Cheese 3335a7c288 changed skywars teams. forced at 16 teams. 2015-07-17 12:07:09 +10:00
Cheese 558b71f866 fixed thigny 2015-07-17 11:48:14 +10:00
Morten d46ac59e10 Added project start 2015-07-16 01:34:57 +02:00
Sarah 9eee425792 revert mistake from last commit. 2015-07-14 23:46:56 +02:00
Sarah e6aec58ece Updating Map source. 2015-07-14 23:14:56 +02:00
Mysticate 1e1cf6403d Added achievements 2015-07-14 13:31:41 -04:00
Sarah 3a2011ee6a Improving Map System: GameTypes can have more mapSources now. 2015-07-14 13:22:59 +02:00
Sarah 2b10aa2cf9 Improving spawn selection in SkywarsTeams. 2015-07-14 08:19:33 +02:00
Cheese 251e6206af Merge branch 'SSM2PlayerTeams' of ssh://184.154.0.242:7999/min/Mineplex into SSM2PlayerTeams 2015-07-14 14:02:50 +10:00
Cheese 0315f61038 changed team spawn selection 2015-07-14 14:02:35 +10:00
Sarah 304a51de04 Improving TeamSurvivalGames Scoreboard. 2015-07-14 05:44:58 +02:00
Sarah e72d612379 Implementing the mapSource parameter in GameType and setting up SkywarsTeams and SurvivalGamesTeams. 2015-07-14 05:25:08 +02:00
Mysticate df60659786 Core edits 2015-07-13 12:14:25 -04:00
Mysticate 616c444c16 Added some things and stuff 2015-07-12 18:15:33 -04:00
Mysticate 0a09ae29f3 Merge remote-tracking branch 'origin/master' into BombLobbers 2015-07-12 18:14:25 -04:00
Sarah bd3641cdac Updating TeamSmash with team Generation Methods. 2015-07-12 02:51:18 +02:00
Sarah be194c5493 Adding Peace Phase Announcement. 2015-07-12 01:00:50 +02:00
Sarah 625f7d3168 Some last small changes. 2015-07-12 00:45:47 +02:00
Sarah 55a1c311bf Kit improvements and balancing. 2015-07-12 00:21:13 +02:00
Sarah 251accb40a Merge branch 'SSM2PlayerTeams' of http://184.154.0.242:7990/scm/min/mineplex into SSM2PlayerTeams 2015-07-11 18:49:38 +02:00
Sarah d41fcb1b7b Improving the SSM Team Game. 2015-07-11 18:44:33 +02:00
Mysticate d0180910e9 Added two new kits. 2015-07-11 10:25:04 -04:00
Sarah 64915a0b7d Implementing Meteoroids for Game end and changing Kit description. 2015-07-11 04:28:37 +02:00
Mysticate 0353b8571d Merge branch 'BombLobbers' of http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into BombLobbers 2015-07-10 16:41:29 -04:00
Mysticate f812fd0530 Please push please 2015-07-10 16:31:37 -04:00
Sarah 5429e3eb76 snowfight kits 2015-07-10 13:17:07 +02:00
Sarah 152523fc3d snowfight update 2015-07-10 13:13:38 +02:00
Mysticate 9e07be51c7 Bug fixes 2015-07-09 12:03:56 -04:00
Mysticate 1b3d7f1c20 Fixed and added things 2015-07-08 23:57:48 -04:00
Cheese 49daf597b5 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-07-09 12:47:57 +10:00
Cheese 7d073fdc0d fixed skywars icon 
changed LOSSES to GAMESPLAYED for consistency
 2015-07-09 12:47:40 +10:00
William Burns 3ba7ba259c Added map selection to MPS. 2015-07-08 15:24:16 +01:00
William Burns e819a4dab3 Merge branches 'MPS-Maps' and 'master' of ssh://184.154.0.242:7999/min/mineplex into MPS-Maps 2015-07-08 09:56:39 +01:00
William Burns 6008e58c12 Added map selection to MPS. 2015-07-08 09:49:41 +01:00
libraryaddict 7e3fdef2e8 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-07-08 18:43:56 +12:00
libraryaddict 1f250bf951 MineWare: Add current progress 2015-07-08 18:43:37 +12:00
Ben Sihota ca880371a6 Merge remote-tracking branch 'origin/master' 2015-07-07 21:19:43 -07:00
Cheese 480a29b874 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-07-08 13:55:16 +10:00
Cheese e36b0440a4 Merge branch 'bench' 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilText.java
	Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java
	Plugins/Mineplex.StaffServer/.classpath
 2015-07-08 13:55:01 +10:00
Ben Sihota ffbee4a9aa Add more details to /game 
Fix NPE with /game set
 2015-07-07 18:20:27 -07:00
libraryaddict 9eff5b7245 Perks: Forgot to include this in last commit, no harm done. 2015-07-08 07:51:33 +12:00
libraryaddict bff3897fab Perks and kits: Change priority for unregistering to high, add new method to Perk firing when perk listener is registered. 2015-07-07 12:30:20 +12:00
Shaun Bennett 6c8c3946a3 Revert "Add IntelliJ IDE library files" 
This reverts commit 71d696278d.
 2015-07-06 17:06:29 -05:00
Ben Sihota 71d696278d Add IntelliJ IDE library files 2015-07-06 13:48:47 -07:00
libraryaddict 3d0dda382b Stacker: Fixed an infinite loop 2015-07-06 07:07:19 +12:00
Cheese 1e26ebe0bd disabled ice forming 2015-07-02 10:09:39 +10:00
Cheese 0100ca1b8c fixed a derp bug 2015-07-02 09:41:33 +10:00
Cheese dd9fc8e7c6 bridge speed increase 2015-07-01 15:14:46 +10:00
Cheese 0650b73374 more bridge tweaks 2015-07-01 14:16:56 +10:00
Cheese 190e58c37e bridges update 2015-07-01 12:58:54 +10:00
Cheese de36e3d8e4 added WATER_DAMAGE support for maps 
modified some bridges code
 2015-07-01 00:18:06 +10:00
Cheese e3d060376b disabled double gem 2015-06-30 13:10:08 +10:00
fooify 4ff456b722 Merge remote-tracking branch 'origin/master' into foo 2015-06-29 11:29:22 -07:00
Cheese 48f5fa118a fixed a few sky bugs 2015-06-29 14:26:00 +10:00
Cheese b0f8369bcd lowered block falling speed. 
fixed a bug where some chests didnt fall
 2015-06-29 10:09:36 +10:00
Cheese ead402d026 skywars art 2015-06-28 14:31:25 +10:00
Cheese 08e4ef199e added twitch to dguisecmd 2015-06-28 12:53:18 +10:00
Cheese faca14dd23 fixed disguise permission 2015-06-28 12:50:27 +10:00
Cheese 840ebabf2a added delay on mad scientist eggSpawn 
fixed Exp bug
 2015-06-27 20:39:05 +10:00
Cheese 1f34bc40a3 increased time you can hold TNT for in CS 2015-06-27 14:08:16 +10:00
Cheese 4c164ce2a6 enabled double gems 2015-06-27 12:44:43 +10:00
Cheese d0368a19d8 Players who quit early do not get full game worth of EXP. 2015-06-27 12:38:04 +10:00
Cheese 754026f403 chicken teleport fix 
scientist minion name fix
 2015-06-27 12:18:12 +10:00
Cheese 4183d6f21d some balance 2015-06-27 11:40:40 +10:00
Cheese 4e06a1aae3 fixed a few skywars bugs 
improved warning for bridges
 2015-06-27 11:24:01 +10:00
fooify 4b634d1bc3 Fix slashes (this won't affect windows users, right?) 2015-06-26 10:14:37 -07:00
fooify 333c54cff9 Merge branch 'master' into foo 2015-06-26 10:07:13 -07:00
Cheese 9a0ac821a2 fixed stat bug 2015-06-26 19:44:13 +10:00
Cheese 750769d03a fixed gem thing 2015-06-26 19:12:34 +10:00
Cheese 62a7fd6a99 you now get levels for kills/assists 
fixed scoreboard bug
 2015-06-26 19:12:11 +10:00
Cheese b0019242e7 skywars scoreboard fix 2015-06-26 19:02:34 +10:00
Jonathan Williams 8c427bee24 Fix _gameDisplay bug. 
Fix Skywars quickmenu link.
 2015-06-26 03:57:39 -05:00
Jonathan Williams 8f2c0cf9d8 Fix file names. 2015-06-26 03:15:16 -05:00
Cheese 1aa0832bb9 SkyWars to Skywars 2015-06-26 17:55:49 +10:00
Cheese 9bf58a2d98 disabled pistons 2015-06-26 17:47:04 +10:00
Cheese 1564a8bc51 disabled hoppers 2015-06-26 17:46:05 +10:00
Shaun Bennett 2657ef336a Merge remote-tracking branch 'origin/master' 2015-06-26 02:33:00 -05:00
Shaun Bennett 60901cc17e Merge remote-tracking branch 'origin/master' 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
 2015-06-26 02:32:51 -05:00
Cheese c31d3609bb soup no longer spawns in stacks 2015-06-26 17:32:46 +10:00
Shaun Bennett 7c698f65cf Quick Menu, and Stats adjustments for SkyWars. Updated Private server page to show game icon instead of player heads 2015-06-26 02:31:35 -05:00
Cheese a5aa2bc0e9 text changes 2015-06-26 17:28:23 +10:00
Cheese c514cacd5d more skywars fixes 2015-06-26 17:05:29 +10:00
Cheese 027efe02fc skywars! 2015-06-26 16:38:44 +10:00
Cheese 257c088948 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-26 16:08:17 +10:00
Cheese b744320ecc pearl trail fix 2015-06-26 16:08:04 +10:00
Cheese 16af8453e3 pearl fix 2015-06-26 16:04:07 +10:00
Cheese 338797f4a6 skywars update 2015-06-26 15:57:47 +10:00
Cheese aef8a00017 update! 2015-06-26 15:25:43 +10:00
Cheese 8f3d0ad84b fixed some bugs :O 2015-06-26 14:38:39 +10:00
Cheese 0874178973 skywars update! 2015-06-26 14:14:22 +10:00
Cheese 2d1d65b239 skywars fixes 2015-06-26 13:15:03 +10:00
fooify 7f7edddf42 Fix TNT bug in SG - tested, works fine! :) 2015-06-25 19:36:31 -07:00
Cheese 5710831777 fixed webs dropping webs 2015-06-26 12:34:26 +10:00
Cheese 7d4e36651f less random chests 2015-06-26 12:26:57 +10:00
Cheese fdbaa4e9c7 dont allow overfill 2015-06-26 12:18:25 +10:00
Cheese f1da68a82a fixed chickens not spawning 2015-06-26 12:14:35 +10:00
Cheese 00da27a3d6 added middle chests 
added chicken spawns
added zombie/chicken loot
 2015-06-26 12:06:40 +10:00
Cheese beb78270e5 skywars loot changes 2015-06-26 11:54:35 +10:00
Cheese bb569a26e2 skywars update 2015-06-26 11:22:33 +10:00
Cheese b48820a753 ore gen fixed! 2015-06-26 10:50:38 +10:00
Cheese d9a8d2b6ab ore changes 2015-06-26 10:36:45 +10:00
Jeremiah Bishop 0342a5ac61 Fixed Achievements 
Reordered Kits
Added new Kit
etc, etc, etc...
 2015-06-25 19:03:25 -04:00
Cheese 2179795677 Merge branch 'SkyWars' of ssh://184.154.0.242:7999/min/Mineplex into SkyWars 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/SkyWars.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/data/TNTGenerator.java
 2015-06-25 20:48:34 +10:00
Cheese 2bf1faa70d fixed a few skywars bugs 
added ore generation (but theres some wierd bug, still working on it)
 2015-06-25 20:24:31 +10:00
Jonathan Williams 5bdb90b459 Changed disguise perm to YOUTUBE 2015-06-25 04:57:56 -05:00
Jeremiah Bishop ed667fedee Added more achievements 2015-06-24 22:59:28 -04:00
Jeremiah Bishop cd10a2ad79 Fixed both kits 
Added game achievements.
 2015-06-24 20:08:31 -04:00
Jeremiah Bishop 5b4a3249ca Added chest loot and such. 2015-06-22 21:42:45 -04:00
Jeremiah Bishop 03c45116ef Various fixes, and added the new data to Zoologist kit 2015-06-21 23:38:25 -04:00
Jeremiah Bishop a05c2d085d Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SkyWars 2015-06-21 16:17:51 -04:00
Jeremiah Bishop e12ff7ef7d Fixed? 2015-06-20 22:20:30 -04:00
Jeremiah Bishop 3cf1297d89 Added SkyWars ;) 2015-06-20 22:08:15 -04:00
Jonathan Williams 91b5beaff2 Fixed new Chat constructor requirement. 2015-06-20 03:43:38 -05:00
Aaron Brock 8ea23f96fc Froze time using doDayNightCycle instead of setting the time on UpdateEvent. 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
 2015-06-20 01:36:05 -04:00
Aaron Brock 1f0accd2a1 Fixed a little boolean derp that stopped people from breaking blocks. 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
 2015-06-20 01:09:21 -04:00
Cheese 478a3c8591 some champs fixes/balance 
duplicate message improvement
 2015-06-20 15:00:16 +10:00
Cheese 2c43dc76c9 DMT no longer effected by 3s chat delay 
Minestrike no longer has 'terrorists'
Jr.Dev rank up!
 2015-06-20 11:12:24 +10:00
Aaron Brock 61494f93ba Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into bench 2015-06-19 18:13:48 -04:00
Cheese 8a224950b3 Added sale notifications 
Added 3s chat delay
 2015-06-19 13:27:59 +10:00
Aaron Brock 76e4dc6056 Stopped blocks from dropping and stopped people from breaking the other teams blocks with their fist. 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
 2015-06-18 19:50:06 -04:00
Jeremiah Bishop dd9e6a6866 Started adding SkyWars game mechanics 2015-06-18 14:54:26 -04:00
Cheese 9a3a014dd5 removed debug! 2015-06-18 12:04:49 +10:00
Aaron Brock 41e77b1ade Fixed double-half-slabs (line 68) 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
 2015-06-17 20:49:35 -04:00
Cheese 6886484d79 Fixed Micro Battles lag (stupid lava) 
cmds for jnr devs
smaller head hitbox in MS
added MB to parser plugin
 2015-06-17 13:02:12 +10:00
Cheese 3014521e79 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-17 10:43:01 +10:00
libraryaddict b0c026e67c Mineware: Commit what I have, fix DisguiseVillager not extending agable and adding new option to disable auto respawn 2015-06-16 14:01:52 +12:00
Cheese a141cec104 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-11 08:57:04 +10:00
Cheese 390ffcab6d bridges support for lillypads map 2015-06-11 08:56:32 +10:00
Shaun Bennett a20f41be09 Merge remote-tracking branch 'origin/master' 2015-06-09 13:21:26 -05:00
Shaun Bennett 3f9010fb7a Fix GameScore comparator 2015-06-09 13:21:15 -05:00
libraryaddict 2971761a5e Game stop command: Move unregister of game listener after the gamestate has been changed 2015-06-09 22:19:03 +12:00
libraryaddict 1f08c989b5 Minestrike: Enforce resource pack 2015-06-09 03:31:24 +12:00
libraryaddict 8cf10afb1b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-06-06 18:31:08 +12:00
libraryaddict fd3232f45d Mineware: Rename old MineWare and move packages 2015-06-06 18:30:47 +12:00
libraryaddict ef9c69f356 UtilShapes: Fix a method, add a space in OldMineWare in GameType 2015-06-06 18:08:37 +12:00