Commit Graph

4065 Commits

Author SHA1 Message Date
SoftCoder 51f4b6d0db Merge branch 'master' of github-softcoder-megaglest:MegaGlest/megaglest-source 2014-01-30 17:45:51 -08:00
SoftCoder c5a938e31b - modify about screen to show copyright for Glest Team till 2010 2014-01-30 17:45:24 -08:00
Tom Reynolds 7dd40cd1be more git ignores for Windows 2014-01-30 23:43:26 +01:00
SoftCoder b4807ed169 - in team mode always render two set of resources:
- First set of resources is the team of selected units
  - SEcond set of resources is the team total
2014-01-29 22:47:55 -08:00
SoftCoder ce375073c1 - show team color asterisk in front of resources when displaying resources for an individual team member 2014-01-29 21:13:39 -08:00
SoftCoder 4ba68576aa - bugfix for loading textures for gpl and startup model pics 2014-01-29 20:42:59 -08:00
SoftCoder 02fa995ce3 - bugfix when loading last game settings to retain player name 2014-01-29 20:26:25 -08:00
SoftCoder 5a48eb0b8a - bugfix for clang 2014-01-27 20:14:06 -08:00
SoftCoder 7cae2b53f1 - bugfix for windows processing var tags in ini files (was crashing on windows when using the new glest-dev.ini) 2014-01-27 20:12:14 -08:00
SoftCoder cce3beb939 - cleanup code from cppcheck report 2014-01-27 19:03:52 -08:00
SoftCoder 39696b6a65 - added ability to share resources across same teams 2014-01-27 18:55:08 -08:00
SoftCoder e33024c102 - For team shared unit mode, player does not lose unless all team members have no castle 2014-01-27 14:58:52 -08:00
SoftCoder e63b3d7499 - added support for team unit sharing 2014-01-27 14:15:05 -08:00
SoftCoder 338f156a95 - changing version to v3.10.0-dev for new development 2014-01-27 11:21:22 -08:00
titiger d56069488f Let's see how good Mega-AI plays with real random when trying to find the enemy.
( the server must use this version to see an effect )
2014-01-27 19:23:31 +01:00
filux aa5403d8ef Merge remote branch 'upstream/master'.
Conflicts:
	mk/linux/.gitignore
	mk/windoze/coverity-scan.bat
2014-01-27 08:23:42 +01:00
SoftCoder 33bb424802 - ensure we get a newline after doing a version check when streflop disabled 2014-01-26 19:39:50 -08:00
SoftCoder dfb6c130ca - additional bugfix when restoring last game settings 2014-01-26 19:22:27 -08:00
SoftCoder d1d6fb2eb1 - added validation for platform for internet games 2014-01-26 18:12:19 -08:00
titiger ef8776efbb Only platform is displayed in server table 2014-01-26 21:29:35 +01:00
filux 8ec938a940 Merge remote branch 'upstream/master'. Resolved conflicts in: mk/windoze/coverity-scan.bat 2014-01-26 09:46:53 +01:00
SoftCoder d7f5164fd1 - missed a few other refs to xerces in cmake scripts 2014-01-25 18:27:08 -08:00
SoftCoder 9cb0ba8833 - xerces included only if forced in cmake since it will be deprecated 2014-01-25 18:12:53 -08:00
SoftCoder 952004151c - removed d3d files which were deprecated long ago
- removed freetype-gl (the embedded library from code.google.com)
2014-01-25 17:54:46 -08:00
SoftCoder 08af18429d - stubbed out use of xerces as no code was using it any longer. Xerces is no longer a requirement to build, we have been using rapidxml for a long time now. For now the MACRO: WANT_XERCES will build Xerces support into th egame, but it is still not used. We will likely deprecate xerces from megaglest soon. 2014-01-25 17:09:52 -08:00
filux ea7b088919 Conversion of files (windows OS specific) from LF to CRLF. Removed 3 ignored files. 2014-01-25 21:52:02 +01:00
filux 3b8e350b4b The documentation's files format will be more friendly for the average Windows OS user. 2014-01-25 20:29:49 +01:00
SoftCoder bbfbc6af0e - Fix reload game to not replace human players 2014-01-25 10:07:15 -08:00
SoftCoder 32f0e2cbea - attempt to fix reload game to not replace playernames 2014-01-24 23:50:32 -08:00
SoftCoder 0d8b3d6c63 - updated so masterserver url does not require trailing / in ini 2014-01-24 18:20:01 -08:00
SoftCoder fe808556bd - added more fields for dev path support.. onlu ico files for linxu left to fix 2014-01-24 17:51:06 -08:00
SoftCoder 581a975209 - added support for dev mode paths and removed linux symlinks for game data
- bugfix for segfault on headless when client disconnects
2014-01-24 13:44:21 -08:00
SoftCoder 1cacb0df27 - missed some updates 2014-01-24 09:50:17 -08:00
SoftCoder 0b86e1c2d5 - fixed paths for editor and model viewer camek install 2014-01-22 10:10:31 -08:00
SoftCoder 92daccf963 - cleanup of cmake scripts and proper organizing of files 2014-01-21 23:21:56 -08:00
SoftCoder 9170d9c400 - added clang detection in binary version output 2014-01-21 17:06:10 -08:00
SoftCoder 85e659219b - small cppcheck code cleanup 2014-01-18 16:49:31 -08:00
SoftCoder d2284bbd36 - bug fix when changing language and showing hint button on game load 2014-01-18 16:31:01 -08:00
Mike 0807d490ad Merge branch 'master' of https://github.com/MegaGlest/megaglest-source 2014-01-18 17:16:44 -06:00
Mike 2ebe218514 Bug fixes and updates for desktop notifications. 2014-01-18 17:15:05 -06:00
SoftCoder 4583b8d4bc - bugfix for windows compile error for new particle feature from titi 2014-01-17 20:10:18 -08:00
SoftCoder 4bada8fc5a - updating game version to 3.9.1 in preparation for release 2014-01-17 19:37:25 -08:00
titiger 6d15d66795 newest blender exporter from Yggdrasil (thanks!!) . Works with blender 2.69 and later and fixes a serious bug with normals and too many exported vertices. 2014-01-17 23:14:40 +01:00
SoftCoder 27316e8912 - added time to error console output log items 2014-01-17 13:32:42 -08:00
SoftCoder 6439d98146 - do NOT pause for lagging clients if game network setting set to false 2014-01-17 11:32:21 -08:00
SoftCoder b0fc9597e3 - fixed some bugs reported by coverity 2014-01-17 09:53:19 -08:00
SoftCoder 0de4f33923 - error output now shows system time 2014-01-17 09:46:31 -08:00
SoftCoder e5c4abffa5 Merge branch 'master' of github-softcoder-megaglest:MegaGlest/megaglest-source 2014-01-17 07:56:57 -08:00
SoftCoder 728dd3aea7 - added mutex guards in client connected menu to try to fix thread race bugs 2014-01-17 07:56:14 -08:00
Tom Reynolds d4ef639e9b Change default MySQL database server to 'localhost' to prevent issues with Unix socket connections 2014-01-17 10:45:22 +01:00