Keir
bd887e1eef
Make search box functional.
2015-12-18 15:52: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
Keir
2e02b9c8ea
Hide WIP rank label.
...
Fix spelling issue.
2015-12-17 17:43:36 +00: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
Keir
ad9620bb3d
Fix formatting.
2015-12-16 16:02:45 +00:00
Keir
3ecb4c7fb8
Report handlers are now parsed and displayed correctly.
2015-12-16 16:01:19 +00:00
Keir
db5327d2e4
Online reports can now be updated without re-sending all the data (ie we don't want to update all the chat messages when a member of staff handles a report).
...
Misc. changes and fixes.
2015-12-16 15:51:01 +00:00
Keir
cd18d2a94f
ReportServer fixes and improvements.
2015-12-16 15:05:00 +00:00
William Burns
baf0f254bb
Custom data, waiting for JLO
2015-12-16 14:41:57 +00:00
Keir
6f82f8349d
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
...
# Conflicts:
# Plugins/.idea/modules.xml
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
2015-12-16 14:07:56 +00:00
Keir
9c7c6fdb37
Don't treat these ints as strings (quicker comparison).
2015-12-16 13:58:05 +00:00
Keir
56d606adf0
Constants cannot hold arrays.
2015-12-16 13:38:48 +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
Keir
b5149d2da7
Implemented williams frontend design.
2015-12-16 00:22:55 +00:00
Mysticate
b36bf37197
Merge remote-tracking branch 'origin/master' into update-paintball
2015-12-15 19:22:38 -05:00
William Burns
958399be59
Merge branch 'feature/report' of ssh://184.154.0.242:25565/min/mineplex into feature/report
2015-12-15 22:17:15 +00:00
William Burns
bc88a35cea
Add my first design!
2015-12-15 22:17:05 +00:00
Keir
398fcfdcba
Update php code to parse new report data.
...
Main class is now view.php.
2015-12-15 22:13:23 +00:00
Keir
5528c7c885
Push iml file.
2015-12-15 21:55:42 +00:00
Keir
1042032836
Update the web side to handle to handle the new changes.
2015-12-15 21:36:54 +00:00
Keir
6d9bcb8e66
Reworked serialization and store more data in json files for later parsing.
...
Internally store UUIDs for reports and convert them as needed for display to user.
Many other misc. changes and refactorings.
2015-12-15 21:30:45 +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
Shaun Bennett
607c164753
Merge remote-tracking branch 'remotes/origin/clans/alpha' into develop
2015-12-15 13:55:01 -05:00
Shaun Bennett
92b82d786b
Don't give Winter Holiday Chests to offline players
2015-12-15 13:34:47 -05:00
Shaun Bennett
b9a688c4e7
Update monthly bonuses
2015-12-15 13:07:49 -05:00
