76e5d3d562
Finish update
2015-07-27 18:18:37 +01:00
aaf4991737
Fixing Banana team.
2015-07-27 18:31:01 +02:00
572ae1e99b
Updating Team names.
2015-07-27 18:22:24 +02:00
0b53bca385
Needed permission changes for Jr Developers (Pending approval)
2015-07-26 18:58:35 -07:00
1247f33b1e
end game stats will display, even if no gems awarded.
2015-07-26 11:43:24 +02:00
0586e5fb77
Added an exception for a map to make it night.
2015-07-26 00:27:09 -04:00
4ceb156e69
Various improvements.
2015-07-25 23:44:55 -04:00
0fd59e9fdb
Added an achievement, removed team one, touched up another. Swag.
2015-07-25 21:50:37 -04:00
cf61b50d98
More changes.
2015-07-25 17:35:43 +01:00
dffde68982
fixed bug
...
removed debug
2015-07-25 17:11:02 +02:00
7c7b166b4d
reduced particles a little
2015-07-25 16:05:12 +02:00
aebd3eeb4f
Merge branch 'Myst_LOBBERS' of ssh://184.154.0.242:7999/min/mineplex into Myst_LOBBERS
2015-07-25 15:56:23 +02:00
9feac87a15
Fixed not being able to buy Armorer. Lowered view distance on particles.
2015-07-25 09:51:23 -04:00
91d0a37d77
Animation change etc.
2015-07-25 12:48:39 +01:00
d64d713a87
Merge branch 'Myst_LOBBERS'
2015-07-25 10:50:55 +02:00
9fa8c6ac45
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
2015-07-25 10:48:06 +02:00
d3fede790a
Merge pull request #17 in MIN/mineplex from MinorTweaks to master
...
* commit '335eb5eacdcf9d837af48445d9fa9a59b4ef986a':
Fixed report link
http://pastebin.com/BRhT7pZP
Reverted things
Reverted Trainee to Helper due to popular demand.
LOTS of tweaks :D
Cleaned up somethings (lib's request)
I'm a dumbass
Fixed a few achievements
Changed mineplex.com/supporthub > mineplex.com/reports
2015-07-25 03:37:28 -05:00
ae5c74680c
SMALL CHANGE OMG DON'T MERGE WITH MASTER YET PELASE
2015-07-25 04:30:56 -04:00
59d14624c0
Merge branch 'Myst_LOBBERS'
2015-07-25 10:26:47 +02:00
d295cead09
Final stuff
2015-07-25 04:18:18 -04:00
a002da4c0f
Redid how lobbers works
2015-07-25 03:21:56 -04:00
5d87d9e1e4
.
2015-07-25 02:01:55 -04:00
c1e5c2a9dc
MPS changed requested by <insert meow here>.
2015-07-24 21:15:19 +01:00
956d685549
Added MPS Game Voting.
2015-07-24 20:24:21 +01:00
13fa6bca8b
Make it go back to game choose page.
2015-07-24 16:24:17 +01:00
dcb6e0ec59
Added rejected games and whitelist to MPS.
2015-07-24 16:03:53 +01:00
a50455acf5
Fising last character bug.
2015-07-24 15:44:36 +02:00
c3742ec794
Fixing the too long String bug.
2015-07-24 15:00:49 +02:00
609199a6b8
Improving Team names in Team games.
2015-07-24 13:14:41 +02:00
7205065a56
Merge branch 'master' of http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into Myst_KITS
2015-07-23 17:47:33 -04:00
9a3c4f3a00
Added Ninja Kit to OITQ. New Achievement kit.
2015-07-23 17:46:10 -04:00
365968f41d
Added a bomb token thing
2015-07-23 16:26:43 -04:00
06d4de16cf
Changed particle methods
2015-07-23 13:34:11 -04:00
5deb699b02
Added rejected games and whitelist to MPS.
2015-07-23 18:24:41 +01:00
71148ef387
gave twitch same perms as youtubers
2015-07-23 16:29:42 +02:00
de1ed4ca59
Improving the Event System with ShinyRukii's requests.
2015-07-23 12:06:40 +02:00
e4ecc9e858
http://pastebin.com/BRhT7pZP
2015-07-22 23:31:07 -04:00
e638674444
Fixed fuse on detonator
2015-07-22 20:17:19 -04:00
b9762bddc4
Fixes
2015-07-22 16:50:57 -04:00
eff71c3e17
Champions: Add Morten G's changes to fix BlockToss
2015-07-22 08:10:57 +12:00
b4df9f47c5
Added a mortar kit ;o (Please don't fire me b2)
2015-07-21 11:01:45 -04:00
d38fc1a603
Reverted things
2015-07-20 16:40:37 -04:00
b239f0af28
Fixed some bugs with the Editor kit
2015-07-20 20:40:43 +02:00
6addf00037
LOTS of tweaks :D
2015-07-20 14:27:10 -04:00
63df369700
Cleaned up somethings (lib's request)
2015-07-20 10:18:50 -04:00
bb769aa0f4
I'm a dumbass
2015-07-20 10:02:50 -04:00
87cc40fc0c
Fixed a few achievements
2015-07-19 22:38:03 -04:00
8b2b4c2826
Added to MPS
2015-07-19 15:51:34 -04:00
c5f7c4fe0e
Finalized after QA testing. Pretty much ready to go
2015-07-19 19:50:53 +02:00
2cad6223a7
Ubs.. Forgot to actually upload the new kits.. :D
2015-07-18 15:15:53 +02:00
b986cf968e
Added new kits, Changed Compass feature, Fixed a lot of bugs
2015-07-18 15:10:03 +02:00
2dc2b8792c
Fixes, updates
2015-07-17 17:01:24 -04:00
8b26ffaecd
Improving Team names in SG, SSM and Skywars and disabled friendly fire.
2015-07-17 14:05:27 +02:00
5e05530b1d
spawn near allies!
2015-07-17 21:28:46 +10:00
6ed3f93df7
fixed some scoreboard stuff
2015-07-17 16:17:01 +10:00
b7ad0035bc
Implementing UHC team system to ssm, sg and skywars.
2015-07-17 07:06:49 +02:00
5389193cab
Merge branch 'SSM2PlayerTeams' of http://184.154.0.242:7990/scm/min/mineplex into SSM2PlayerTeams
2015-07-17 06:31:10 +02:00
02a71bff68
another git fix
2015-07-17 06:30:53 +02:00
aaae11d426
Git Fix.
2015-07-17 06:29:32 +02:00
cfb4911c25
added ability for teams will fill before moving onto next team
2015-07-17 12:54:53 +10:00
63f6adf295
fixed spawn picking
2015-07-17 12:50:34 +10:00
3335a7c288
changed skywars teams. forced at 16 teams.
2015-07-17 12:07:09 +10:00
558b71f866
fixed thigny
2015-07-17 11:48:14 +10:00
d46ac59e10
Added project start
2015-07-16 01:34:57 +02:00
9eee425792
revert mistake from last commit.
2015-07-14 23:46:56 +02:00
e6aec58ece
Updating Map source.
2015-07-14 23:14:56 +02:00
1e1cf6403d
Added achievements
2015-07-14 13:31:41 -04:00
3a2011ee6a
Improving Map System: GameTypes can have more mapSources now.
2015-07-14 13:22:59 +02:00
2b10aa2cf9
Improving spawn selection in SkywarsTeams.
2015-07-14 08:19:33 +02:00
251e6206af
Merge branch 'SSM2PlayerTeams' of ssh://184.154.0.242:7999/min/Mineplex into SSM2PlayerTeams
2015-07-14 14:02:50 +10:00
0315f61038
changed team spawn selection
2015-07-14 14:02:35 +10:00
304a51de04
Improving TeamSurvivalGames Scoreboard.
2015-07-14 05:44:58 +02:00
e72d612379
Implementing the mapSource parameter in GameType and setting up SkywarsTeams and SurvivalGamesTeams.
2015-07-14 05:25:08 +02:00
df60659786
Core edits
2015-07-13 12:14:25 -04:00
616c444c16
Added some things and stuff
2015-07-12 18:15:33 -04:00
0a09ae29f3
Merge remote-tracking branch 'origin/master' into BombLobbers
2015-07-12 18:14:25 -04:00
bd3641cdac
Updating TeamSmash with team Generation Methods.
2015-07-12 02:51:18 +02:00
be194c5493
Adding Peace Phase Announcement.
2015-07-12 01:00:50 +02:00
625f7d3168
Some last small changes.
2015-07-12 00:45:47 +02:00
55a1c311bf
Kit improvements and balancing.
2015-07-12 00:21:13 +02:00
251accb40a
Merge branch 'SSM2PlayerTeams' of http://184.154.0.242:7990/scm/min/mineplex into SSM2PlayerTeams
2015-07-11 18:49:38 +02:00
d41fcb1b7b
Improving the SSM Team Game.
2015-07-11 18:44:33 +02:00
d0180910e9
Added two new kits.
2015-07-11 10:25:04 -04:00
64915a0b7d
Implementing Meteoroids for Game end and changing Kit description.
2015-07-11 04:28:37 +02:00
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
f812fd0530
Please push please
2015-07-10 16:31:37 -04:00
5429e3eb76
snowfight kits
2015-07-10 13:17:07 +02:00
152523fc3d
snowfight update
2015-07-10 13:13:38 +02:00
9e07be51c7
Bug fixes
2015-07-09 12:03:56 -04:00
1b3d7f1c20
Fixed and added things
2015-07-08 23:57:48 -04:00
49daf597b5
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-07-09 12:47:57 +10:00
7d073fdc0d
fixed skywars icon
...
changed LOSSES to GAMESPLAYED for consistency
2015-07-09 12:47:40 +10:00
3ba7ba259c
Added map selection to MPS.
2015-07-08 15:24:16 +01:00
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
6008e58c12
Added map selection to MPS.
2015-07-08 09:49:41 +01:00
7e3fdef2e8
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-07-08 18:43:56 +12:00
1f250bf951
MineWare: Add current progress
2015-07-08 18:43:37 +12:00
ca880371a6
Merge remote-tracking branch 'origin/master'
2015-07-07 21:19:43 -07:00
480a29b874
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-07-08 13:55:16 +10:00
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
ffbee4a9aa
Add more details to /game
...
Fix NPE with /game set
2015-07-07 18:20:27 -07:00
9eff5b7245
Perks: Forgot to include this in last commit, no harm done.
2015-07-08 07:51:33 +12:00
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
6c8c3946a3
Revert "Add IntelliJ IDE library files"
...
This reverts commit 71d696278d
2015-07-06 17:06:29 -05:00
71d696278d
Add IntelliJ IDE library files
2015-07-06 13:48:47 -07:00
3d0dda382b
Stacker: Fixed an infinite loop
2015-07-06 07:07:19 +12:00
1e26ebe0bd
disabled ice forming
2015-07-02 10:09:39 +10:00
0100ca1b8c
fixed a derp bug
2015-07-02 09:41:33 +10:00
dd9fc8e7c6
bridge speed increase
2015-07-01 15:14:46 +10:00
0650b73374
more bridge tweaks
2015-07-01 14:16:56 +10:00
190e58c37e
bridges update
2015-07-01 12:58:54 +10:00
de36e3d8e4
added WATER_DAMAGE support for maps
...
modified some bridges code
2015-07-01 00:18:06 +10:00
e3d060376b
disabled double gem
2015-06-30 13:10:08 +10:00
4ff456b722
Merge remote-tracking branch 'origin/master' into foo
2015-06-29 11:29:22 -07:00
48f5fa118a
fixed a few sky bugs
2015-06-29 14:26:00 +10:00
b0f8369bcd
lowered block falling speed.
...
fixed a bug where some chests didnt fall
2015-06-29 10:09:36 +10:00
ead402d026
skywars art
2015-06-28 14:31:25 +10:00
08e4ef199e
added twitch to dguisecmd
2015-06-28 12:53:18 +10:00
faca14dd23
fixed disguise permission
2015-06-28 12:50:27 +10:00
840ebabf2a
added delay on mad scientist eggSpawn
...
fixed Exp bug
2015-06-27 20:39:05 +10:00
1f34bc40a3
increased time you can hold TNT for in CS
2015-06-27 14:08:16 +10:00
4c164ce2a6
enabled double gems
2015-06-27 12:44:43 +10:00
d0368a19d8
Players who quit early do not get full game worth of EXP.
2015-06-27 12:38:04 +10:00
754026f403
chicken teleport fix
...
scientist minion name fix
2015-06-27 12:18:12 +10:00
4183d6f21d
some balance
2015-06-27 11:40:40 +10:00
4e06a1aae3
fixed a few skywars bugs
...
improved warning for bridges
2015-06-27 11:24:01 +10:00
4b634d1bc3
Fix slashes (this won't affect windows users, right?)
2015-06-26 10:14:37 -07:00
333c54cff9
Merge branch 'master' into foo
2015-06-26 10:07:13 -07:00
9a0ac821a2
fixed stat bug
2015-06-26 19:44:13 +10:00
750769d03a
fixed gem thing
2015-06-26 19:12:34 +10:00
62a7fd6a99
you now get levels for kills/assists
...
fixed scoreboard bug
2015-06-26 19:12:11 +10:00
b0019242e7
skywars scoreboard fix
2015-06-26 19:02:34 +10:00
8c427bee24
Fix _gameDisplay bug.
...
Fix Skywars quickmenu link.
2015-06-26 03:57:39 -05:00
8f2c0cf9d8
Fix file names.
2015-06-26 03:15:16 -05:00
1aa0832bb9
SkyWars to Skywars
2015-06-26 17:55:49 +10:00
9bf58a2d98
disabled pistons
2015-06-26 17:47:04 +10:00
1564a8bc51
disabled hoppers
2015-06-26 17:46:05 +10:00
2657ef336a
Merge remote-tracking branch 'origin/master'
2015-06-26 02:33:00 -05:00
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
c31d3609bb
soup no longer spawns in stacks
2015-06-26 17:32:46 +10:00
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
a5aa2bc0e9
text changes
2015-06-26 17:28:23 +10:00
c514cacd5d
more skywars fixes
2015-06-26 17:05:29 +10:00
027efe02fc
skywars!
2015-06-26 16:38:44 +10:00
257c088948
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-06-26 16:08:17 +10:00
b744320ecc
pearl trail fix
2015-06-26 16:08:04 +10:00
16af8453e3
pearl fix
2015-06-26 16:04:07 +10:00
338797f4a6
skywars update
2015-06-26 15:57:47 +10:00
aef8a00017
update!
2015-06-26 15:25:43 +10:00
8f3d0ad84b
fixed some bugs :O
2015-06-26 14:38:39 +10:00
William Burns
Sarah
Ben Sihota
Mini-Chiss
Mysticate
Jonathan Williams
libraryaddict
Cheese
Shaun Bennett
fooify