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

6050 Commits

Author SHA1 Message Date
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
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
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
Shaun Bennett 53f9a051c5 Fix spectator page sorting team list 2015-12-17 21:52:34 -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
Jonathan Williams c2fb6e6c15 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-17 18:34:25 -05:00
Jonathan Williams 2953fe395f Changed dns api key to new key. 
Prevent server monitor redis calls to cause restarts.
Added winter chests to customer support.
 2015-12-17 18:33:49 -05:00
Shaun Bennett b1a3dfdad8 Merge pull request #100 in MIN/mineplex from feature/player-data to develop 
* commit 'e7243d4b9c814266ebe3c03a08730b054fadc56b':
  Re-add getArcadePlayer(Player player)
  Changed to setData in PlayerCustomData
  Changes to core client manager, and finishing custom data!
  Testing ArcadePlayer implementation
  Add MineplexPlayer -> ArcadePlayer
  Add to Arcade and Hub
  Added custom data
  Custom data, waiting for JLO
 2015-12-17 17:28:55 -06:00
William Burns e7243d4b9c Re-add getArcadePlayer(Player player) 2015-12-17 22:19:45 +00:00
William Burns 3e8c3cb928 Changed to setData in PlayerCustomData 2015-12-17 22:16:05 +00:00
William Burns 2ac28c4fd5 Merge branches 'develop' and 'feature/player-data' of ssh://184.154.0.242:25565/min/mineplex into feature/player-data 
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
 2015-12-17 21:44:31 +00:00
William Burns 5c045bfce4 Changes to core client manager, and finishing custom data! 2015-12-17 21:27:44 +00:00
libraryaddict 7f188072ad Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into develop 2015-12-18 10:03:41 +13:00
libraryaddict 66372c397b First version of ResourcePackManager that handles all resource packs globally 2015-12-18 10:03:03 +13:00
William Burns 7d9b97180d Testing ArcadePlayer implementation 2015-12-17 01:48:55 +00:00
Mysticate d28c2be1c3 Epic chnage that saved the day omg 2015-12-16 20:26:04 -05:00
NewGarbo b4c3ce9fba a couple more prettificatons to pvp timer messages. 2015-12-16 23:19:04 +00:00
NewGarbo eb9ba92fb1 one more quick message change/fix 2015-12-16 22:53:24 +00:00
NewGarbo 2ee1ccbcf9 qa changes to pvp safety 2015-12-16 22:48:55 +00:00
William Burns ee202bc7f5 Add MineplexPlayer -> ArcadePlayer 2015-12-16 22:32:34 +00:00
William Burns 4077aa808f Add to Arcade and Hub 2015-12-16 22:01:51 +00:00
William Burns 370c59ce75 Added custom data 2015-12-16 21:52:41 +00:00
NewGarbo d619a9644b few changes to pvp timer, and fixed bugs etc 2015-12-16 18:25:30 +00: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
William Burns baf0f254bb Custom data, waiting for JLO 2015-12-16 14:41:57 +00:00
Mysticate d16dd4a9d2 Merge remote-tracking branch 'origin/master' into update-paintball 2015-12-15 19:35:55 -05:00
Mysticate 4566577c68 Die player cache 2015-12-15 19:26:09 -05:00
Mysticate b36bf37197 Merge remote-tracking branch 'origin/master' into update-paintball 2015-12-15 19:22:38 -05:00
NewGarbo 7ac1fd86b4 made pvp timer players immune to skills 2015-12-15 21:12:49 +00:00
NewGarbo baef84f4d9 fixed pvp timer subtitles bugged out 2015-12-15 20:09:54 +00:00
Shaun Bennett 63635e7cf8 Merge pull request #99 in MIN/mineplex from develop to master 
* commit '211e440e67d6e81cc67c974f8b6886306600de23':
  Slight winter reward rarity changes
  Fix shard values
  More Fixes
  Don't give Winter Holiday Chests to offline players
  Update monthly bonuses
  Fix mounts owned count
  Fix Grinch Hat
  Dont disable new gadgets in games
  disable tutorial
  test push (change version to 0.17d)
  Spawn nametags far far away from players
  loads of changes (pvp timer, unsafe stuff)
  fixed unsafe timer
 2015-12-15 14:00:17 -06:00
Shaun Bennett 211e440e67 Merge remote-tracking branch 'remotes/origin/master' into develop 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java
 2015-12-15 15:00:14 -05:00
Shaun Bennett aef704d972 Slight winter reward rarity changes 2015-12-15 14:58:09 -05:00
Shaun Bennett 5f14d6675f Fix shard values 2015-12-15 14:56:19 -05:00
Shaun Bennett 07f610d4bd More Fixes 2015-12-15 14:45:12 -05:00