Commit Graph

5162 Commits

Author SHA1 Message Date
titiger 04c590ce7e new maps 2015-01-04 01:04:58 +01:00
titiger 4e0c96adae no need to render dead units when selecting 2015-01-03 22:24:21 +01:00
titiger 109a5b9985 sort map lists non case sensitive in menu 2015-01-03 02:03:31 +01:00
titison ce23353138 Fix
this was really dump. i edited some if-statements and didn't recognize that
building didn't work.
2015-01-02 16:26:24 +01:00
titison 00d367b725 Resource Storage calculated on team basis
fixing a debt-bug with sharedResources:
https://forum.megaglest.org/index.php?topic=9616.0
2015-01-02 02:45:44 +01:00
titiger f4529566fa bugfix for version checking
We can  have versions with only one dot.
2015-01-02 01:24:45 +01:00
titiger 7680372c89 new maps 2015-01-01 17:17:31 +01:00
titiger 4a292ed1d1 don't mix functionality
Not a bug fix, just trying to keep things more clean.
2015-01-01 17:16:24 +01:00
SoftCoder 51c67cc7ff - make app update work in windows 2014-12-30 22:09:53 -08:00
SoftCoder f76fe55153 - more updates for updating version on windows 2014-12-30 21:40:51 -08:00
SoftCoder d13118ecf8 - attempt to make updates work for windows 2014-12-30 15:05:24 -08:00
SoftCoder efa7cb0346 - bugfix for shared team resources
- added some new internal feature code to test auto updates for a future release
2014-12-30 12:16:35 -08:00
titiger bcd6c7b310 the headless server has no need to handle unit boost particles 2014-12-30 20:34:05 +01:00
SoftCoder 172dfe3411 - update a few scripts to exclude cegui data 2014-12-29 17:23:20 -08:00
titiger 74e522b2f8 "v" was too much in the version string 2014-12-26 21:58:07 +01:00
titiger 11b766b5bc v3.11-beta2.0 2014-12-26 21:33:54 +01:00
titiger 00ac0219e0 Added more changes to CHANGELOG.txt 2014-12-26 21:22:34 +01:00
titiger 46f4f0fac5 some data changes 2014-12-26 21:08:12 +01:00
titiger acd0904ba2 Merge pull request #43 from titison/meshBoundParticleFix
Fix for meshBound Particles

Coop work from me and my son fixing meshBound Particles
2014-12-26 21:03:19 +01:00
titison 7cd1cb242f Fix for meshBound Particles
There was a bug if you used multiple units of the same type with mesh bound
particles. The given model was the same for all units with the same 
unitType/skill.
2014-12-26 20:51:37 +01:00
SoftCoder 0fdfc56b96 - small vc++ compile warning cleanup 2014-12-25 14:45:08 -08:00
titiger 2263e89da7 timed particles are meant to be bound to the animation progress
timed particles are meant to be bound to the animation progress and not to 
the skill progress like it was before.
2014-12-25 03:38:07 +01:00
titiger 33dd93fc8b Handle timed particles in a correct way
Before there were many iming issues because the timed particle system 
where not queued often enough.  Now all timed particle systems are 
queued each time a new SkillCycle starts.
2014-12-24 15:45:38 +01:00
SoftCoder 2ec8dd9cf3 Merge branch 'develop' of github-softcoder-megaglest:MegaGlest/megaglest-source into develop 2014-12-23 20:40:12 -08:00
SoftCoder b1455c0e33 - properly cleanup models in g3dviewer to fix shutdown bug 2014-12-23 20:39:03 -08:00
titiger 358cb3fb2c a new tileset 2014-12-23 19:49:30 +01:00
SoftCoder 7f0b199929 - disable use of streflop in x64 windows build 2014-12-22 16:30:49 -08:00
Mark Vejvoda 67cc640807 Merge pull request #42 from goetzk/fix-mac-packaging-using-bundle-generator
Fix mac packaging using bundle generator
2014-12-22 12:27:21 -08:00
Karl Goetz c4b6fbba26 Change coment on Apple test
This is just a niceity ; the comment no longer accurately captured what the
code was doing.
2014-12-23 07:18:17 +11:00
Karl Goetz f95dbab580 Split up CPack generator configuration
I've taken the liberty of splitting up the CPACK_GENERATOR test so shared
configuration and win32 configuration are outside that test. The existing
grouping forced duplication of variables in the mac config file and required
the cpack generator to be unset, then set to deb, then set to nsis on win32.

These changes should help make things much more understandable.
2014-12-23 07:17:57 +11:00
Karl Goetz 70e10c610e Change Mac specific CMakeLists for CPack
This commit includes several fixes and some shuffling of entries to improve
readability. The major changes are Removing MG_VERSION_H_CONTENTS which
*includes* the file with the version in it in favour of VER_* variables and
removing the CPack include at the end of the file.

CPack has to be included after all variables are set and this file is sourced
before all the common options are configured.

One more fixme is added - this and other runtime issues will have to be dealt
with when i test the packaging, so far I've only got it to build.
2014-12-23 07:17:48 +11:00
Karl Goetz 1d591d4a8c Fix some erors in Info.plist
This fixes a couple of issues, none too major:
- The MegaGlest executable is `megaglest` so that string was updated
- MG_VERSION_H_CONTENTS *includes* the file with the version in it (which I
  didn't realise when I changed it last time as I couldn't get things building
  still). This changes to using VER_* variables
- Update copyright to 2015 (I'm gambling on the project lasting another 2 weeks)
- Change CFBundleSignature to MGGL; a four letter contraction of MeGaGLest
2014-12-23 07:17:34 +11:00
titiger 8925a8997c fix for boosting sight 2014-12-22 21:11:58 +01:00
SoftCoder dc143f8819 - few more tiny fixes for msvc compiler warnings 2014-12-21 23:45:16 -08:00
SoftCoder 56214c6228 - small cleanup in vc++ compile 2014-12-21 22:20:19 -08:00
SoftCoder f97f0ef852 - more general bugfixes (not all upgrade values were being used in the code) 2014-12-21 21:07:24 -08:00
SoftCoder 3705d56057 Merge branch 'develop' of github-softcoder-megaglest:MegaGlest/megaglest-source into develop 2014-12-21 20:27:48 -08:00
SoftCoder 92a113ddfa - missed a few places where we should use total upgrade sight 2014-12-21 20:27:21 -08:00
titiger f62efc64bf fix for uneditable closed slots
https://forum.megaglest.org/index.php?topic=9620.0
2014-12-22 03:08:19 +01:00
titiger 48db19c34b Merge branch 'develop' of github.com:MegaGlest/megaglest-source into develop 2014-12-22 03:05:33 +01:00
SoftCoder e65ad1b69c - added more error checking in case segfault reproduced from: https://forum.megaglest.org/index.php?topic=9612.0;topicseen 2014-12-21 17:32:04 -08:00
SoftCoder b0f7b078f6 - apply sight upgrades when units sight is involved in cacls 2014-12-21 17:23:20 -08:00
titiger 6ef709e888 Merge branch 'develop' of github.com:MegaGlest/megaglest-source into develop 2014-12-22 00:12:22 +01:00
titiger 799cc0f12b some new entries in CHANGELOG.txt 2014-12-22 00:11:57 +01:00
SoftCoder 3965f72b5a - updated debug output in case there are real boost problems in future 2014-12-21 14:47:58 -08:00
SoftCoder 494061b80d Merge branch 'develop' of github-softcoder-megaglest:MegaGlest/megaglest-source into develop 2014-12-21 13:02:57 -08:00
SoftCoder 0a55746ae2 - more attempts to fix attack boost with upgrades 2014-12-21 13:02:27 -08:00
titiger 341d504cd2 this is the actual data please don't revertit again 2014-12-21 13:48:51 +01:00
titiger b50cb7770c Comparison of version numbers allows non integer characters too
This is used to check compatibility of saved games typically.
Only the leading digits are used as minor version now.
2014-12-21 13:35:42 +01:00
titiger 1a8c28cc93 Make it more obvious where to join a game in the internet menu
Buttons can be set to always lighted(flashing). This is first used in 
the internet menu.
2014-12-21 13:33:46 +01:00