Commit Graph

4690 Commits

Author SHA1 Message Date
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 b45c9dcdb1 Merge pull request #6 from filux/filux-attr
Game is even more cross platform2.
2014-01-26 23:34:05 -08: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 d8c9ffa922 - updated vc++ 2012 build script to point to correct dep file 2014-01-26 22:09:59 -08:00
Tom Reynolds 57397b3f28 Update .gitignore's 2014-01-27 06:42:10 +01:00
Tom Reynolds d97ad0015c replace remaining references to .coverity-submit by .coverity-scan 2014-01-27 06:13:14 +01:00
Tom Reynolds f284bea230 update paths for coverity-scan.bat 2014-01-27 05:41:30 +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
SoftCoder cceeecb012 Merge branch 'master' of github-softcoder-megaglest:MegaGlest/megaglest-source 2014-01-26 18:08:30 -08:00
titiger ef8776efbb Only platform is displayed in server table 2014-01-26 21:29:35 +01:00
SoftCoder 0a245e76d2 Merge branch 'master' of github-softcoder-megaglest:MegaGlest/megaglest-source 2014-01-26 08:09:15 -08: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 42dae7cda6 - updated git ignore 2014-01-25 21:27:39 -08:00
SoftCoder dd0e527412 - removed including streflop in windows builds 2014-01-25 19:55:01 -08:00
Tom Reynolds 4c64df640b .coverity-submit is now .coverity-scan for windows, too 2014-01-26 04:19:07 +01:00
SoftCoder 8c2e2581f3 - turn off streflop in linux and test to see how it goes 2014-01-25 19:07:25 -08:00
SoftCoder 10204be941 - check for cmake file not only folder 2014-01-25 18:52:31 -08:00
Tom Reynolds 7b1854db6c Travis-CI doesn't need to checkout any submodules 2014-01-26 03:36:03 +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
Tom Reynolds aee48b2a5f Merge branch 'master' of github-tomreyn-megaglest:MegaGlest/megaglest-source 2014-01-26 03:04:41 +01:00
Tom Reynolds 79881019ae Another symlink bites the dust 2014-01-26 02:57:06 +01: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 a1adfb6b66 Another one converted file LF -> CRLF. 2014-01-25 22:16:20 +01: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 b91b5cffa2 Merge branch upstream/master 2014-01-25 21:13:12 +01:00
filux 399c150772 Text's conversion to version easy to read. 2014-01-25 20:32:58 +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 12422bbf53 - updated build and release documkentation 2014-01-25 10:52:22 -08:00
SoftCoder bbfbc6af0e - Fix reload game to not replace human players 2014-01-25 10:07:15 -08:00
Tom Reynolds d95a47807e Make the coverity-scan script use a configuration file name which is closer to its own name 2014-01-25 13:55:56 +01:00
SoftCoder 32f0e2cbea - attempt to fix reload game to not replace playernames 2014-01-24 23:50:32 -08:00
SoftCoder ea6d208947 - fix linux scripts 2014-01-24 18:32:42 -08:00
SoftCoder 0d8b3d6c63 - updated so masterserver url does not require trailing / in ini 2014-01-24 18:20:01 -08:00
SoftCoder c64693898f - removed uneeded softlinks 2014-01-24 17:56:02 -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 86c6c6ee17 Merge branch 'master' of https://github.com/MegaGlest/megaglest-source 2014-01-24 16:51:53 -08:00
SoftCoder 2a3ae90e61 - updated win64 projects and scripts 2014-01-24 16:50:57 -08:00
SoftCoder 816816567f - updated paths for windows installer 2014-01-24 16:33:34 -08:00
SoftCoder 988743d867 - moved all binary content for windows to mk/windoze 2014-01-24 16:05:28 -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
Tom Reynolds 50c6bba9a9 Improve Travis-CI stuff 2014-01-24 18:47:27 +01:00
SoftCoder b6a956d395 - moved duplicate files in mk/shared and adjusted various scripts and references 2014-01-24 09:44:18 -08:00