Merge branch 'master' of git://de.git.xonotic.org/xonotic/netradiant

diff --combined tools/quake3/q3map2/q3map2.h
index 4b020fdd26641812414edbf297a91138b1bbd2e0,ce6367f29f88fca3d8485199d8f40a583098778e..64494462e356e9dbfc3f175b2447730f2a52ee76
--- 1/tools/quake3/q3map2/q3map2.h
--- 2/tools/quake3/q3map2/q3map2.h
+++ b/tools/quake3/q3map2/q3map2.h
@@@ -317,8 -317,8 +317,8 @@@ abstracted bsp fil
  #define MAX_LIGHTMAP_SHADERS  256
  
  /* ok to increase these at the expense of more memory */
 -#define       MAX_MAP_ENTITIES                0x1000          //%     0x800   /* ydnar */
 -#define       MAX_MAP_ENTSTRING               0x80000         //%     0x40000 /* ydnar */
 +#define       MAX_MAP_ENTITIES                0x8000          //%     0x800   /* ydnar */
 +#define       MAX_MAP_ENTSTRING               0x400000        //%     0x40000 /* ydnar */
  
  #define       MAX_MAP_AREAS                   0x100           /* MAX_MAP_AREA_BYTES in q_shared must match! */
  #define       MAX_MAP_FOGS                    30                      //& 0x100       /* RBSP (32 - world fog - goggles) */
@@@ -2034,6 -2034,9 +2034,9 @@@ Q_EXTERN qboolean                       debugPortals Q_ASSI
  Q_EXTERN qboolean           lightmapTriangleCheck Q_ASSIGN(qfalse);
  Q_EXTERN qboolean           lightmapExtraVisClusterNudge Q_ASSIGN(qfalse);
  Q_EXTERN qboolean           lightmapFill Q_ASSIGN(qfalse);
+ Q_EXTERN int                          metaAdequateScore Q_ASSIGN( -1 );
+ Q_EXTERN int                          metaGoodScore Q_ASSIGN( -1 );
+ Q_EXTERN float                                metaMaxBBoxDistance Q_ASSIGN( -1 );
  
  #if Q3MAP2_EXPERIMENTAL_SNAP_NORMAL_FIX
  // Increasing the normalEpsilon to compensate for new logic in SnapNormal(), where