AlexTheCoder
|
8b480cc32b
|
Merge branch 'alex-ctf' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
|
2015-11-20 18:40:42 -05:00 |
|
AlexTheCoder
|
1274dc860d
|
- Stuff for chiss
|
2015-11-20 18:40:20 -05:00 |
|
Cheese
|
2f91ca5a8a
|
fixed errors
|
2015-11-21 10:35:17 +11:00 |
|
Cheese
|
4a70e4da90
|
more fixies
|
2015-11-21 10:34:08 +11:00 |
|
Cheese
|
4d128d9c7a
|
fixed some skills and wierd hitbox error
|
2015-11-21 10:29:48 +11:00 |
|
Keir
|
5bbf5bcce5
|
Only log to the database when the report has been closed.
|
2015-11-20 23:05:42 +00:00 |
|
Cheese
|
c7297a7a38
|
fixed invalid proxies exploding
|
2015-11-21 09:45:01 +11:00 |
|
Cheese
|
d5076b1c47
|
CTF fix
|
2015-11-21 09:41:02 +11:00 |
|
Cheese
|
e0885feea6
|
Merge branch 'master' into alex-ctf
|
2015-11-21 09:40:07 +11:00 |
|
Cheese
|
04be896ff6
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-11-21 09:39:50 +11:00 |
|
Sarah
|
97471b0d9c
|
Finalizing Game Tutorials.
|
2015-11-20 23:38:02 +01:00 |
|
Keir
|
07b6c7cde7
|
Display message informing a report handler on how to close a report, when clicked this message will also fill out as much of the command as it can on the clients side.
|
2015-11-20 22:38:00 +00:00 |
|
Cheese
|
0bc64fec16
|
Proxy limit fixes
|
2015-11-21 09:28:15 +11:00 |
|
Keir
|
435f2b643d
|
Fix fetching player report stats.
|
2015-11-20 22:20:56 +00:00 |
|
Keir
|
ad16c59ab7
|
Forgot to commit this crucial part...
|
2015-11-20 22:05:10 +00:00 |
|
Keir
|
470ff67f86
|
Replace ReportProfile by using statistics to track total reports and accepted, denied & abusive reports. 1 or more abusive reports results in being banned from the report system.
|
2015-11-20 22:03:57 +00:00 |
|
Cheese
|
cfc0aa7d05
|
reverted to size 2 ball
|
2015-11-21 08:20:02 +11:00 |
|
Keir
|
fc6e1fe003
|
Notify the handler of a report (if any) when the report they are handling is purged.
|
2015-11-20 21:10:03 +00:00 |
|
NewGarbo
|
17e62f1f5a
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
|
2015-11-20 18:31:37 +00:00 |
|
NewGarbo
|
fb04fac0f6
|
removed debug message
|
2015-11-20 18:31:14 +00:00 |
|
Sarah
|
6f7d49b71b
|
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
|
2015-11-20 19:04:51 +01:00 |
|
Sarah
|
2a4d20650a
|
Saving for branch switching.
|
2015-11-20 19:04:11 +01:00 |
|
AlexTheCoder
|
386032a4f5
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
|
2015-11-20 06:03:30 -05:00 |
|
AlexTheCoder
|
f51358552a
|
-B
|
2015-11-20 05:57:29 -05:00 |
|
NewGarbo
|
521aa8d965
|
fixed furnaces in undead camp
|
2015-11-20 09:14:57 +00:00 |
|
NewGarbo
|
08f683aa98
|
gave Archers in undead camps the barbed arrows effect
|
2015-11-20 07:49:28 +00:00 |
|
Cheese
|
3067d9f281
|
final push for the day
|
2015-11-20 15:22:43 +11:00 |
|
Jonathan Williams
|
700e4c9a1f
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-11-19 22:12:08 -06:00 |
|
Jonathan Williams
|
411d6fdb22
|
Made PlayerTracker use existing code for determining region.
|
2015-11-19 22:11:45 -06:00 |
|
Cheese
|
ed2f3a064c
|
MORE ML!
|
2015-11-20 14:31:01 +11:00 |
|
Mysticate
|
3f37b893d3
|
Worked on double.
|
2015-11-19 20:29:20 -05:00 |
|
Keir
|
80c87fa1fc
|
Make reports timeout after 15 minutes of inactivity.
|
2015-11-20 00:51:21 +00:00 |
|
Cheese
|
3a5ab3f17c
|
Merge branch 'master' into monster-league
|
2015-11-20 11:51:07 +11:00 |
|
Cheese
|
1cc92cea1b
|
and the files
|
2015-11-20 11:50:33 +11:00 |
|
Cheese
|
c4745c18b6
|
ML update
|
2015-11-20 11:50:20 +11:00 |
|
Mysticate
|
f7011032bc
|
Switching branches
|
2015-11-19 19:49:46 -05:00 |
|
Keir
|
bceb69bc12
|
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
# Conflicts:
# Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
|
2015-11-19 23:52:02 +00:00 |
|
Mysticate
|
f02e2b2e72
|
Formatting
|
2015-11-19 18:02:07 -05:00 |
|
Mysticate
|
e816a79f37
|
Reformatted
|
2015-11-19 17:51:25 -05:00 |
|
Mysticate
|
502f12f00f
|
Fixed paintball to the max. :>>
|
2015-11-19 17:46:07 -05:00 |
|
Cheese
|
e14f5a36bd
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-11-20 08:34:19 +11:00 |
|
Cheese
|
f33eedf36d
|
text fix
|
2015-11-20 08:33:51 +11:00 |
|
Sarah
|
0fedb99660
|
Changing the tutorial visuals and texts.
|
2015-11-19 21:04:50 +01:00 |
|
Shaun Bennett
|
c29fd242ca
|
Forgot to remove the unnecessary check
|
2015-11-19 14:46:01 -05:00 |
|
Shaun Bennett
|
f47a61e38e
|
Use bounds for energy tracker messages aren't displayed multiple times
|
2015-11-19 14:44:03 -05:00 |
|
Shaun Bennett
|
63e580404c
|
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanEnergyTracker.java
|
2015-11-19 14:36:08 -05:00 |
|
Shaun Bennett
|
3820035762
|
Cleaning up duplicate code/small optimizations (untested)
|
2015-11-19 14:35:59 -05:00 |
|
NewGarbo
|
b0c60fd1f4
|
sparkly rare items! woo. and fixed gold dropping waaayyy too much
|
2015-11-19 19:03:51 +00:00 |
|
NewGarbo
|
7d8e1b517d
|
Fixed dropped gold stacking...
|
2015-11-19 08:56:07 +00:00 |
|
NewGarbo
|
f262a22913
|
Fixed loot dropping in King of the Hill not dropping correct items/
|
2015-11-19 08:54:59 +00:00 |
|