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
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
Thanos paravantis
bee431dbdd
Merge branch 'thanos-mineware' into MortensRawBugFixes
...
Conflicts:
.gitignore
2015-12-18 22:04:49 +02:00
Thanos paravantis
07afab4bac
Merge branch 'MortensRawBugFixes' of http://184.154.0.242:7990/scm/min/mineplex into MortensRawBugFixes
2015-12-18 22:01:59 +02:00
Thanos paravantis
246b67f5a0
Commit before updating morten's branch
2015-12-18 22:01:21 +02:00
Thanos paravantis
3128e9766f
Remove arrow trail from arrow rampage challenge.
2015-12-18 21:55:44 +02: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
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
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
Thanos paravantis
9a1a652e85
Merge branch 'master' into thanos-mineware
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerTypePage.java
Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.core.prefs
2015-12-17 20:54:28 +02:00
Thanos paravantis
51c572bf44
Prevent game countdown if there is only one player, fix typo on Dog vs Cat challenge.
2015-12-17 20:48:55 +02:00
Thanos paravantis
d38276d23d
MineWare updates and several changes on challenges.
2015-12-17 17:57:33 +02: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
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
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
Thanos paravantis
81f03e4b68
Update anti-hack jump fix for Bouncing Block and Arrow Rampage.
2015-12-16 17:18:19 +02:00
