Commit graph

5467 commits

Author SHA1 Message Date
kervala
46ce493ccb Fixed: Replaced Mage and Magene (???) by Magicien and Magicienne
--HG--
branch : compatibility-develop
2015-12-30 10:12:27 +01:00
kervala
9bc9c8585b Merge with develop
--HG--
branch : compatibility-develop
2015-12-30 00:46:50 +01:00
kervala
ef6b8fb501 Fixed: Compilation
--HG--
branch : develop
2015-12-30 00:46:22 +01:00
kervala
df308276ed Merge with develop
--HG--
branch : compatibility-develop
2015-12-30 00:14:27 +01:00
kervala
17090524b1 Fixed: Compilation
--HG--
branch : develop
2015-12-30 00:13:58 +01:00
kervala
7247cba9eb Merge with develop
--HG--
branch : compatibility-develop
2015-12-30 00:10:51 +01:00
kervala
424e9ba99f Fixed: Compilation
--HG--
branch : develop
2015-12-30 00:10:08 +01:00
kervala
2f45ff1ebe Merge with develop
--HG--
branch : compatibility-develop
2015-12-29 22:36:04 +01:00
kervala
c032446549 Changed: Use WITH_UNIX_STRUCTURE for client icons
--HG--
branch : develop
2015-12-29 22:07:30 +01:00
kervala
130ca08bc7 Changed: Minor change
--HG--
branch : develop
2015-12-29 22:07:10 +01:00
kervala
ab4dc8ec01 Changed: Merge code from private repository
--HG--
branch : develop
2015-12-29 22:06:49 +01:00
kervala
98c485bd94 Merge with develop
--HG--
branch : compatibility-develop
2015-12-29 18:03:21 +01:00
kervala
d5e74ca5c8 Fixed: Wrong check (if c is NULL, nothing is happening)
--HG--
branch : develop
2015-12-29 17:59:18 +01:00
kervala
c6927af7c0 Changed: Minor changes
--HG--
branch : develop
2015-12-29 16:39:37 +01:00
kervala
ef16bab62e Changed: Merge code from private repository
--HG--
branch : develop
2015-12-29 16:35:47 +01:00
kervala
88042cc28d Changed: Minor changes
--HG--
branch : develop
2015-12-29 16:19:46 +01:00
kervala
8b770d41ac Fixed: Wrong bitmap size
--HG--
branch : develop
2015-12-29 16:15:07 +01:00
Nimetu
da34e717af Merge with develop
--HG--
branch : compatibility-develop
2015-12-29 15:03:12 +02:00
Nimetu
82afdecc72 Changed: Save screenshots with year-month-day info in filename
--HG--
branch : develop
2015-12-29 14:34:24 +02:00
kervala
aee315bda9 Merge with develop
--HG--
branch : compatibility-develop
2015-12-28 18:21:56 +01:00
kervala
9b9ee4e492 Fixed: Install readme.txt in same directory if not using WITH_UNIX_STRUCTURE
--HG--
branch : develop
2015-12-28 18:16:07 +01:00
kervala
91f2913026 Changed: Don't need to use std::stringstream
--HG--
branch : develop
2015-12-28 18:15:28 +01:00
kervala
4c0fc6074f Fixed: Set process name (fixes the <Unknown> under Linux and OS X)
--HG--
branch : develop
2015-12-28 18:13:37 +01:00
kervala
19cbbb2bec Changed: Don't create log.log anymore
--HG--
branch : develop
2015-12-28 18:12:45 +01:00
kervala
6710268d0a Merge with develop
--HG--
branch : compatibility-develop
2015-12-28 16:44:35 +01:00
kervala
77352d5759 Changed: Minor change
--HG--
branch : develop
2015-12-28 16:43:20 +01:00
kervala
b93414cd27 Fixed: Warning when DDS_HEADER is not initialized
--HG--
branch : develop
2015-12-28 16:41:26 +01:00
kervala
5ccf0df1ab Changed: Allow panoply_maker to optimize textures and masks (remove alpha channel if useless)
--HG--
branch : develop
2015-12-28 16:37:32 +01:00
kervala
12ae39eb53 Changed: Updated translations
--HG--
branch : compatibility-develop
2015-12-28 10:32:15 +01:00
kervala
83f43657ad Merge with develop
--HG--
branch : compatibility-develop
2015-12-27 16:07:11 +01:00
kervala
d8bc7384ae Fixed: Don't crash if GL_VERSION returns NULL (it should never happen)
--HG--
branch : develop
2015-12-27 16:06:35 +01:00
kervala
545569d049 Merge with develop
--HG--
branch : compatibility-develop
2015-12-26 18:00:04 +01:00
kervala
ba7c4ae4d4 Changed: Support for GLX_MESA_query_renderer to detect video memory
--HG--
branch : develop
2015-12-26 17:51:36 +01:00
kervala
57859636cd Changed: Minor changes
--HG--
branch : develop
2015-12-26 17:49:54 +01:00
kervala
1928f6229c Fixed: Universe channel tab close
--HG--
branch : develop
2015-12-26 17:49:06 +01:00
kervala
7a0c06a845 Merge with develop
--HG--
branch : compatibility-develop
2015-12-26 15:13:08 +01:00
kervala
478a2102b8 Fixed: GCC warnings
--HG--
branch : develop
2015-12-26 15:12:41 +01:00
kervala
28df949870 Fixed: Forgot to link to PlatformSupport under other platforms
--HG--
branch : develop
2015-12-26 15:12:29 +01:00
kervala
4806693f49 Merge with develop
--HG--
branch : compatibility-develop
2015-12-26 14:38:37 +01:00
kervala
a8383e8f0f Changed: Use entity textures cache size depending on video memory
--HG--
branch : develop
2015-12-26 14:37:53 +01:00
kervala
ba6f66d310 Fixed: GCC warnings
--HG--
branch : develop
2015-12-26 14:10:27 +01:00
kervala
af0eabbdea Fixed: GCC warnings
--HG--
branch : develop
2015-12-26 14:09:15 +01:00
kervala
83ef24dab7 Changed: Renamed screenH and screenW to _ScreenH and _ScreenW
--HG--
branch : develop
2015-12-26 14:02:01 +01:00
kervala
d7255a63d8 Changed: Minor changes
--HG--
branch : develop
2015-12-26 14:00:39 +01:00
kervala
ec86bdcf96 Changed: Force 32 bits depth with XRandr
--HG--
branch : develop
2015-12-26 13:38:09 +01:00
kervala
cbea85c105 Changed: Implement CSystemUtils::getTotalVideoMemory() under Linux (Xorg log and lspci parsing)
--HG--
branch : develop
2015-12-26 13:28:09 +01:00
kervala
2006f1a866 Fixed: GCC warnings
--HG--
branch : develop
2015-12-26 13:26:51 +01:00
kervala
9b5c426c19 Merged with develop
--HG--
branch : compatibility-develop
2015-12-25 20:52:18 +01:00
kervala
2d0d87a05e Fixed: Warnings with GCC
--HG--
branch : develop
2015-12-25 20:49:59 +01:00
kervala
d999e4a3bd Merge with develop
--HG--
branch : compatibility-develop
2015-12-25 18:02:13 +01:00