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

5991 Commits

Author SHA1 Message Date
Virizion 162b3eb33f Stopped a bunch of block events. 2015-12-27 14:34:24 -05:00
Virizion 845014b677 Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder 2015-12-25 15:49:41 -05: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
Virizion b0f8edb0f9 Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder 2015-12-23 18:25:52 -05: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
Virizion 0322ae1217 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
 2015-12-22 00:02:21 -05: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
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
Sarah 816da0f633 Fixing Gems 2015-12-20 12:00:32 +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
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
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
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