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

6145 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thanos paravantis
d5dd342af3 Start changing MineWare theme. 2015-12-26 14:45:54 +02:00
Thanos paravantis
317f5799fe Fix classpath on mineplex core. 2015-12-26 12:54:47 +02:00
Thanos paravantis
499ad655c9 Merge branch 'MortensRawBugFixes' into thanos-mineware 
Conflicts:
	Plugins/Mineplex.Core/.classpath
 2015-12-26 12:29:26 +02:00
Thanos paravantis
fcc1cd46a5 Make bouncing block red wool traps less strict when player walks on them. 2015-12-26 12:28:07 +02:00
Thanos paravantis
dcff689faf Merge branch 'master' into thanos-mineware 
Conflicts:
	Plugins/Mineplex.Core/.classpath
	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
 2015-12-26 11:55:57 +02:00
Shaun Bennett
c680d91b56 Nerf TypeWars gems (again) 2015-12-25 03:12:04 -06:00
Shaun Bennett
dd8e91e463 Update MOTD 2015-12-25 03:03:53 -06:00
Shaun Bennett
25d36b546a Remove unnecessary files 2015-12-25 01:53:00 -06:00
Shaun Bennett
d08cfa0c4c Holiday Gifts 2015-12-25 01:51:36 -06:00
NewGarbo
aa50c4762f fixes (?) 2015-12-23 18:55:44 +00:00
libraryaddict
1d4a5e5804 Clean up imports, set resource pack on clans. 2015-12-24 07:47:05 +13:00
libraryaddict
000b1f85b7 Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into develop 2015-12-24 07:41:55 +13:00
libraryaddict
67bdc6832f Tentative beginnings for clans resource packs 2015-12-24 07:40:49 +13:00
NewGarbo
369687b5dd Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha 
Conflicts:
	Plugins/Mineplex.Game.Clans/.settings/org.eclipse.jdt.core.prefs
 2015-12-23 18:31:51 +00:00
NewGarbo
ff24ebc9f4 lots of changes that i can't remember at this point 2015-12-23 18:22:20 +00:00
William Burns
08b5e7b4db Working loadouts. 2015-12-23 09:21:43 +00:00
Morten
f83016e007 Also really quickly fixed the Invisibility in lobby bug (hopefully) 2015-12-23 00:39:16 +01:00
Morten
8c399f03da Removed a weird query :/ 
Status: Finished
 2015-12-22 21:36:19 +01:00
Morten
9336eb19fa Finished up the Unban feature... 2015-12-22 21:31:57 +01:00
Morten
14fd00a368 Bug fixes 2015-12-22 16:02:45 +01:00
William Burns
b255c58653 Merge branches 'develop' and 'william-gladiators' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators 2015-12-21 21:56:08 +00:00
Shaun Bennett
2ccd7a5de0 Fix Type Wars stat icon 2015-12-21 13:20:04 -05:00
Shaun Bennett
893fea49ab Merge pull request #108 in MIN/mineplex from develop to master 
* commit '7a72762c78ff56b3390fef809e3f57f51e755d14': (81 commits)
  Update MOTD
  Updating Holiday Achievements
  Updating Stats GUI
  Achievements....
  changing Category
  adding PM message.
  fixing Kit NPEs
  Fixing ending Stats.
  Wrong iterator!
  Update game display
  Adjust GUI, fix beta button
  Yo shaun debug this m8 ty
  Fixing Gems
  adjusting some timings
  Fixing Tutorial Minion
  fixing last commit
  adding Tutorial notification
  Adding Tutorial notification
  nuke delay and Stats
  Fixing some nuke stuff, Giant noises only for own Team and "Giant under attack message", spelling fixes
  ...
 2015-12-21 12:19:10 -06:00
Shaun Bennett
7a72762c78 Update MOTD 2015-12-21 12:56:37 -05:00
Shaun Bennett
c63014b51f Type-Wars merge 2015-12-21 12:49:10 -05:00
Sarah
a5436d63c0 Updating Holiday Achievements 2015-12-21 18:45:26 +01:00
Sarah
7c66bdbbde Updating Stats GUI 2015-12-21 18:25:44 +01:00
Sarah
010b1b0a5d Achievements.... 2015-12-21 18:08:11 +01:00
Sarah
6e3274ff2f changing Category 2015-12-21 18:06:00 +01:00
Sarah
f15c318e5c adding PM message. 2015-12-21 18:02:25 +01:00
Sarah
082b5e156c fixing Kit NPEs 2015-12-21 17:48:17 +01:00
Sarah
ff5761cc1d Fixing ending Stats. 2015-12-21 17:44:15 +01:00
Sarah
590da2128c Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java
 2015-12-21 17:43:51 +01:00
Morten
1726aa2530 Added a feature to unban clients across the network 
But there still a bug when you type a username of a none registered member.
Will fix ASAP - likely after Mineware
 2015-12-21 12:58:19 +01:00
Shaun Bennett
5469289d82 Wrong iterator! 2015-12-21 06:57:56 -05:00
Shaun Bennett
fae2a5d2bf Update game display 2015-12-21 04:40:30 -05:00
Shaun Bennett
a235103066 Merge pull request #106 in MIN/mineplex from update-menu to develop 
* commit 'f4050fb1ff54dbe4639b0258eff53360d800d0b9':
  Adjust GUI, fix beta button
  Yo shaun debug this m8 ty
 2015-12-21 03:36:46 -06:00
Shaun Bennett
f4050fb1ff Adjust GUI, fix beta button 2015-12-21 04:35:57 -05:00
Shaun Bennett
99285b2ac8 Merge remote-tracking branch 'remotes/origin/type-wars' into develop 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java
 2015-12-21 03:50:55 -05:00
Mysticate
0f5be6444b Yo shaun debug this m8 ty 2015-12-21 02:23:59 -05:00
Morten
c683ce5f0a Improved minors bugs and implemented a more efficient Challenge rotation system 2015-12-20 21:08:32 +01:00
Sarah
816da0f633 Fixing Gems 2015-12-20 12:00:32 +01:00
Morten
7c52b813f9 Merge branch 'MortensRawBugFixes' of http://184.154.0.242:7990/scm/min/mineplex into MortensRawBugFixes 
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.core.prefs
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeBouncingBlock.java
 2015-12-19 23:32:21 +01:00
Sarah
f1188529f2 Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 2015-12-19 13:09:26 +01:00
Sarah
c56cd0d56e adjusting some timings 2015-12-19 13:08:53 +01:00
Sarah
35966d88cf Fixing Tutorial Minion 2015-12-19 13:05:39 +01:00
Sarah
7327d9463f Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 2015-12-19 13:00:49 +01:00
Sarah
8a54388480 fixing last commit 2015-12-19 13:00:12 +01:00
Sarah
32a0dd6668 adding Tutorial notification 2015-12-19 12:59:37 +01:00
Sarah
152e759c10 Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 2015-12-19 12:56:05 +01:00