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
Virizion
628ee8a137
Some small fixes.
2015-12-16 00:02:21 -05:00
Virizion
7fa1963268
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-15 23:06:13 -05: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
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
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
Shaun Bennett
e3e757da8a
Fix mounts owned count
2015-12-15 13:06:11 -05:00
Shaun Bennett
3edba0fac6
Fix Grinch Hat
2015-12-15 12:28:06 -05:00
Shaun Bennett
f2107b7b79
Merge remote-tracking branch 'origin/develop' into develop
2015-12-15 12:07:40 -05:00
Shaun Bennett
2216fdc52c
Dont disable new gadgets in games
2015-12-15 12:07:34 -05:00
Sarah
40ae7743c6
reverting last "fix"
2015-12-15 14:20:21 +01:00
NewGarbo
6a346790f7
disable tutorial
2015-12-15 12:00:56 +00:00
NewGarbo
1da04b84b5
test push (change version to 0.17d)
2015-12-15 11:57:33 +00:00
NewGarbo
c63bac6433
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-12-15 11:42:16 +00:00
libraryaddict
47ad563596
Spawn nametags far far away from players
2015-12-15 22:46:30 +13:00
Sarah
cf58fdee4a
trying to fix the spigot Chat spam thingy.
2015-12-15 05:29:59 +01:00
Cheese
871c97f7af
changed chest %'s
2015-12-15 09:25:44 +11: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
NewGarbo
9137fcfe40
loads of changes (pvp timer, unsafe stuff)
2015-12-14 12:39:00 +00:00
Cheese
0f38c7b287
increased minimum coal
2015-12-14 22:12:50 +11:00
Cheese
951cd65903
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-14 22:05:22 +11:00
Cheese
045bc760c2
increassed cooldown, people getting trapped perm
2015-12-14 22:05:08 +11:00
Cheese
809ff649be
lowered rarities a bit
2015-12-14 22:03:09 +11:00
Shaun Bennett
7181a26e58
Remove pointless equals()
2015-12-14 05:56:39 -05:00
Cheese
9e72e5adf1
nicer text
2015-12-14 21:43:11 +11:00
Cheese
daa9f165b1
removed coins from gadgets
2015-12-14 21:41:47 +11:00
