a15f6f8473
Working on the new MineWare theme.
2015-12-26 22:33:54 +02:00
d5dd342af3
Start changing MineWare theme.
2015-12-26 14:45:54 +02:00
317f5799fe
Fix classpath on mineplex core.
2015-12-26 12:54:47 +02:00
499ad655c9
Merge branch 'MortensRawBugFixes' into thanos-mineware
...
Conflicts:
Plugins/Mineplex.Core/.classpath
2015-12-26 12:29:26 +02:00
fcc1cd46a5
Make bouncing block red wool traps less strict when player walks on them.
2015-12-26 12:28:07 +02:00
dcff689faf
Merge branch 'master' into thanos-mineware
...
Conflicts:
Plugins/Mineplex.Core/.classpath
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2015-12-26 11:55:57 +02:00
14fd00a368
Bug fixes
2015-12-22 16:02:45 +01:00
2ccd7a5de0
Fix Type Wars stat icon
2015-12-21 13:20:04 -05:00
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
7a72762c78
Update MOTD
2015-12-21 12:56:37 -05:00
c63014b51f
Type-Wars merge
2015-12-21 12:49:10 -05:00
a5436d63c0
Updating Holiday Achievements
2015-12-21 18:45:26 +01:00
7c66bdbbde
Updating Stats GUI
2015-12-21 18:25:44 +01:00
010b1b0a5d
Achievements....
2015-12-21 18:08:11 +01:00
6e3274ff2f
changing Category
2015-12-21 18:06:00 +01:00
f15c318e5c
adding PM message.
2015-12-21 18:02:25 +01:00
082b5e156c
fixing Kit NPEs
2015-12-21 17:48:17 +01:00
ff5761cc1d
Fixing ending Stats.
2015-12-21 17:44:15 +01:00
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
5469289d82
Wrong iterator!
2015-12-21 06:57:56 -05:00
fae2a5d2bf
Update game display
2015-12-21 04:40:30 -05:00
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
f4050fb1ff
Adjust GUI, fix beta button
2015-12-21 04:35:57 -05:00
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
0f5be6444b
Yo shaun debug this m8 ty
2015-12-21 02:23:59 -05:00
c683ce5f0a
Improved minors bugs and implemented a more efficient Challenge rotation system
2015-12-20 21:08:32 +01:00
816da0f633
Fixing Gems
2015-12-20 12:00:32 +01:00
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
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
c56cd0d56e
adjusting some timings
2015-12-19 13:08:53 +01:00
35966d88cf
Fixing Tutorial Minion
2015-12-19 13:05:39 +01:00
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
8a54388480
fixing last commit
2015-12-19 13:00:12 +01:00
32a0dd6668
adding Tutorial notification
2015-12-19 12:59:37 +01:00
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
7cb002ca86
Adding Tutorial notification
2015-12-19 12:55:28 +01:00
f8bffc9f88
nuke delay and Stats
2015-12-19 12:45:06 +01:00
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
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
6c5e3d7509
Fixing visibility.
2015-12-19 00:48:42 +01:00
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
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
bee431dbdd
Merge branch 'thanos-mineware' into MortensRawBugFixes
...
Conflicts:
.gitignore
2015-12-18 22:04:49 +02:00
07afab4bac
Merge branch 'MortensRawBugFixes' of http://184.154.0.242:7990/scm/min/mineplex into MortensRawBugFixes
2015-12-18 22:01:59 +02:00
246b67f5a0
Commit before updating morten's branch
2015-12-18 22:01:21 +02:00
3128e9766f
Remove arrow trail from arrow rampage challenge.
2015-12-18 21:55:44 +02:00
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
13cfc0e12a
Updated to a better check
2015-12-18 18:16:20 +00:00
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
f80648bfbc
Update DBPool to load from file
2015-12-18 00:32:07 -05:00
Thanos paravantis
Morten
Shaun Bennett
Sarah
William Burns