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

647 Commits

Author SHA1 Message Date
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
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
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
2bf734a15c DONEONDONFA;SDJF;LADSF;OCAJEFOJ;FJAD;FAJSMLDFAH D 2015-12-17 23:08:07 -05:00
Sarah
4e9e0243cd Merge branch 'develop' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
#	Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java
 2015-12-16 18:16:08 +01:00
Sarah
afa45c47ca Merge branch 'develop' of http://184.154.0.242:7990/scm/min/mineplex into pregametutorial 2015-12-14 14:23:42 +01:00
Shaun Bennett
4afca01ad0 Treasures! 2015-12-14 02:49:51 -05:00
Shaun Bennett
5be91de006 Merge master 2015-12-13 23:40:18 -05:00
Cheese
b095fa9efe Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-13 21:15:32 +11:00
Cheese
011a194dc6 fixed exploit 2015-12-13 21:14:57 +11:00
Shaun Bennett
c470ad880d Merge pull request #77 in MIN/mineplex from foo to master 
* commit 'd7497ec09881047d7461630fac2c3b51bf37a06c': (23 commits)
  Fixed Micro Battle icon not appearing in stats menu
  Gravity's icon changed to ENDER_PORTAL_FRAME
  world's smallest bugfix - admin->co-host
  Fixed advertisement being able to be bypassed by spec and instant join
  fixed naming pets non-alphanumeric characters
  changed reference to premium ranks
  removed important debug thing
  fixed ssm enderman always facing south on teleport
  fixed bacon blast exloding blocks
  fixed shield smash and fissure affecting spectators
  fixed slab issue with Assassin's Flash
  Re-fixed Barbarian bug
  Fixed SG Barbarian bug
  SSM bug fix: magma cube flame dash doesn't make player invisible
  fixed several smash bugs and one global issue
  Slightly bumped Monster Maze jump time value
  fixed bridge bug "Death Bomber counts suicides as well"
  typo fix in legendary aura description
  Update achievement kit reference text
  Fixed tnt bug (SG)
  ...
 2015-12-11 18:57:18 -06:00
xGamingDudex
6d1e4b6cab Merge remote-tracking branch 'origin/master' into project-cosmetics 2015-12-11 18:09:09 +01:00
Shaun Bennett
ac6d3c2c8f merge with master 2015-12-11 06:27:23 -05:00
Sarah
ffb75a7832 Adding CustomEnding 2015-12-11 01:44:19 +01:00
Shaun Bennett
72a8aaf556 Merge remote-tracking branch 'remotes/origin/master' into project-cosmetics 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
 2015-12-10 19:18:49 -05:00
William Burns
624e8bbe89 Merge branches 'pregametutorial' and 'william-gladiators' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators 2015-12-10 20:56:03 +00:00
William Burns
af7c058f22 Lots of bug fixes / additions since the testing 12/9/15. 2015-12-10 19:06:07 +00:00
Sarah
0f8028f6e6 Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java
 2015-12-10 12:24:11 +01:00
Sarah
a5c46545df fixing timer being shown. 2015-12-09 14:44:22 +01:00
Sarah
484dce18e1 Changing some Achievement things, to allow double values and dividing, Adding WPM, fixing some bugs. 2015-12-08 22:34:42 +01:00
Shaun Bennett
42a0354c9e Now Playing, Preference to disable ads 2015-12-07 18:28:05 -05:00
William Burns
43192317ad Merge branches 'pregametutorial' and 'william-gladiators' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators 2015-12-07 23:20:21 +00:00
Sarah
dfb1837e81 Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java
 2015-12-07 18:54:19 +01:00
Shaun Bennett
7984c0ac31 Add ! 2015-12-07 06:12:49 -05:00
Cheese
d318a5cf87 interacto! 2015-12-07 21:53:34 +11:00
Cheese
e1efcabfbf chat sale msgs 2015-12-07 20:39:31 +11:00
Cheese
7b11baf24b Christmas sale bossbars 2015-12-07 20:20:49 +11:00
Cheese
8c4615203c sale message 2015-12-07 20:07:20 +11:00
Cheese
5486d8acf6 more prep 2015-12-07 13:42:59 +11:00
Cheese
54ec0e39bb more polisshhhh on snowfight 
enabled xmas chests
 2015-12-07 13:25:32 +11:00
Sarah
10d26ca32b timer fixes. 2015-12-06 22:41:04 +01:00
Cheese
4a53667539 gadget restructure 
converted frost lord and titan particles into 4 subcategories.
 2015-12-05 10:22:00 +11:00
fooify
91aaf5f2fb world's smallest bugfix - admin->co-host 2015-12-03 16:45:30 -08:00
Sarah
19254fc4a0 Prepare Timer flag. 2015-12-03 18:06:27 +01:00
Cheese
7217cd0f33 remove conditions upon death 2015-12-01 10:44:13 +11:00
Sarah
063299ab3a Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 2015-11-26 00:23:02 +01:00
Sarah
809faf3098 changing teleport mechanic. 2015-11-26 00:14:15 +01:00
Shaun Bennett
ff5d828dd7 Merge with master, lots of clans fixes/work 2015-11-25 14:50:49 -05:00
Sarah
49f6679537 Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java
 2015-11-24 15:43:59 +01:00
Sarah
46362a3d5f Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
 2015-11-24 15:38:52 +01:00
Cheese
7454cf7443 MS + Champs bugs, balance and more 2015-11-24 15:23:37 +11:00
Sarah
66598ce97e adding teleport flag. 2015-11-23 16:16:33 +01:00
Sarah
171696ff0d final tutorial implementation. 2015-11-21 18:24:17 +01:00
Sarah
15032ac7ff Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 2015-11-21 18:19:12 +01:00
Sarah
cba5aef9f1 small fix 2015-11-21 18:18:13 +01:00
Sarah
e10a63254a saving typewars state 2015-11-21 18:16:24 +01:00
Sarah
d0b5f6d8ac starting implementation of Type wars tutorial. 2015-11-21 16:56:56 +01:00
Sarah
01f67e9d3e Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 2015-11-21 16:37:49 +01:00
Cheese
6eb1bef1c6 Merge branch 'master' into minestrike-update 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
 2015-11-21 11:09:28 +11:00