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

7413 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Shaun Bennett
0da28faab8 Work on new tutorial 2015-12-21 03:49:27 -05:00
Mysticate
0f5be6444b Yo shaun debug this m8 ty 2015-12-21 02:23:59 -05:00
Sarah
816da0f633 Fixing Gems 2015-12-20 12:00:32 +01:00
fooify
fe658b30a1 Grammatical errors hath been fixed! 2015-12-19 15:03:42 -08: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
Sarah
7cb002ca86 Adding Tutorial notification 2015-12-19 12:55:28 +01:00
Sarah
f8bffc9f88 nuke delay and Stats 2015-12-19 12:45:06 +01:00
Virizion
c0ab31fdac Finished up fixes. 2015-12-19 00:19:50 -05:00
AlexTheCoder
66c9fa122c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla 2015-12-18 21:33:59 -05:00
AlexTheCoder
09528a9262 - Initial broadcast stuff 2015-12-18 21:33:40 -05:00
Virizion
a5c18f4677 Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder 2015-12-18 20:05:03 -05:00
Sarah
b3afa0094e Fixing some nuke stuff, Giant noises only for own Team and "Giant under attack message", spelling fixes 2015-12-19 00:59:15 +01:00
Sarah
dab2416ccd Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 2015-12-19 00:49:16 +01:00
Sarah
6c5e3d7509 Fixing visibility. 2015-12-19 00:48:42 +01:00
Shaun Bennett
453c3a65b6 Merge pull request #103 in MIN/mineplex from feature/player-data to develop 
* commit 'c2e88c27946e1b3870b71748a936469016e4158b':
  Updated to a better check
 2015-12-18 17:33:47 -06:00
Shaun Bennett
2593a473db Merge pull request #104 in MIN/mineplex from develop to master 
* commit '298ea1e5e60ed68ca0e0aab614701c87470ffa92': (30 commits)
  Update DBPool to load from file
  FORMATTING CHANG EI'M GOING TO CRY UGH
  DONEONDONFA;SDJF;LADSF;OCAJEFOJ;FJAD;FAJSMLDFAH D
  Attempt at fixing spectator page
  Fix spectator page sorting team list
  Re-add getArcadePlayer(Player player)
  Changed to setData in PlayerCustomData
  Changes to core client manager, and finishing custom data!
  First version of ResourcePackManager that handles all resource packs globally
  Testing ArcadePlayer implementation
  Epic chnage that saved the day omg
  Add MineplexPlayer -> ArcadePlayer
  Add to Arcade and Hub
  Added custom data
  Custom data, waiting for JLO
  Die player cache
  Quick changes to improve things.
  Uncommented bouncy balls
  Final tweaks to random armorstand
  Quick thing before merge
  ...
 2015-12-18 17:29:18 -06:00
William Burns
c2e88c2794 Merge branch 'develop' of ssh://184.154.0.242:25565/min/mineplex into feature/player-data 2015-12-18 18:16:32 +00:00
William Burns
13cfc0e12a Updated to a better check 2015-12-18 18:16:20 +00:00
Keir
a72125b1dc Implement new error thingy. 2015-12-18 18:11:25 +00:00
William Burns
0e0a22ab15 Error page 2015-12-18 17:56:22 +00:00
Keir
0b4568e785 Commit progress. 2015-12-18 17:41:03 +00:00
Keir
77595c8fbc Allow search form to be loaded when no identifier is supplied (error messages are a bit crappy atm I'm aware). 2015-12-18 16:20:57 +00:00
Keir
bd887e1eef Make search box functional. 2015-12-18 15:52:20 +00:00
William Burns
f57304764c Added a hotbar layout editor 2015-12-18 15:16:00 +00:00
NewGarbo
1840572c49 Lots of changes, specifics: 
Fixed clans having more than max energy.
Made /c home work from anywhere, 20 secs warmup, 30 secs in claimed territory.
/c <clan> now works with clans with 18+ players.
 2015-12-18 11:13:38 +00:00
Shaun Bennett
298ea1e5e6 Merge pull request #101 in MIN/mineplex from update-paintball to develop 
* commit 'd561915fd32885036b55cc6a05899934a544e131':
  FORMATTING CHANG EI'M GOING TO CRY UGH
  DONEONDONFA;SDJF;LADSF;OCAJEFOJ;FJAD;FAJSMLDFAH D
  Changed dns api key to new key. Prevent server monitor redis calls to cause restarts. Added winter chests to customer support.
  Epic chnage that saved the day omg
  Die player cache
  Quick changes to improve things.
  Uncommented bouncy balls
  Final tweaks to random armorstand
  Quick thing before merge
  Worked on double.
  Switching branches
  Formatting
  Reformatted
  Fixed paintball to the max. :>>
  Class
  Switching branches c:
  Sniper work
  Work. Deemed unsuitable due to an issue with the paintballs flying wide.
  Added a sniper kit! :D
 2015-12-17 23:32:22 -06:00
Shaun Bennett
f80648bfbc Update DBPool to load from file 2015-12-18 00:32:07 -05:00
Mysticate
d561915fd3 FORMATTING CHANG EI'M GOING TO CRY UGH 2015-12-17 23:16:57 -05:00
Mysticate
2bf734a15c DONEONDONFA;SDJF;LADSF;OCAJEFOJ;FJAD;FAJSMLDFAH D 2015-12-17 23:08:07 -05:00
Shaun Bennett
2c09fd969b Attempt at fixing spectator page 2015-12-17 22:24:44 -05:00
Virizion
806b656dcf Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder 2015-12-17 21:56:01 -05:00
Shaun Bennett
53f9a051c5 Fix spectator page sorting team list 2015-12-17 21:52:34 -05:00
Virizion
7621fe793d Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-17 21:50:32 -05:00
Virizion
5f506e3810 Moved team generation. 2015-12-17 21:49:15 -05:00
Mysticate
066d0a861f Merge remote-tracking branch 'origin/master' into update-paintball 2015-12-17 21:00:15 -05:00
NewGarbo
4bf7e15055 player gold exploit checking. i know this code is strange but please don't delete it. we need it for now. 2015-12-18 01:05:02 +00:00