Commit Graph

5123 Commits

Author SHA1 Message Date
titiger
fd765da5e8 Advanced transifex options in menu are back in place 2014-12-15 02:05:47 +01:00
titiger
2c15c89571 render server lines with background to make them more readable. 2014-12-15 01:07:25 +01:00
titiger
080189811f More detailed error message for wrong router setup 2014-12-09 02:39:53 +01:00
titiger
e1d85f145c bigger message box to explain wrong router setup 2014-12-09 02:36:30 +01:00
Mark Vejvoda
3ecc553ba9 Merge pull request #33 from goetzk/git-version-cmd-fix
Remove special casing on GIT_VERSION_CMD
2014-12-06 21:15:23 -08:00
Karl Goetz
4919307d8f Reintroduce ELSE clause
Had a chat with softcoder who explained what was going on. We should now be
almost identical to the original but the compiler specific test has been
removed.
2014-12-07 16:06:13 +11:00
Karl Goetz
35347ed36b Re-add IF check around GIT_VERSION_CMD
Previous removal included a APPLE check which I'm told needs to remain.
2014-12-07 15:43:04 +11:00
Mark Vejvoda
83470d8592 Merge pull request #32 from goetzk/custom-data-install-path-fix
Remove special CUSTOM_DATA_INSTALL_PATH for OSX
2014-12-06 19:31:31 -08:00
Karl Goetz
e920cba84b Remove special casing on GIT_VERSION_CMD
This special casing has been causing cmake -GXcode to fail.
2014-12-07 14:27:32 +11:00
Karl Goetz
81c94a5772 Remove special CUSTOM_DATA_INSTALL_PATH for OSX
The special codepath for CUSTOM_DATA_INSTALL_PATH on OSX means the path is
generated multiple backslashes which cause problems later on in the compile.
Having the same codepath as everything else appears to resolve this problem.
2014-12-07 14:25:23 +11:00
SoftCoder
8cd7a9580f - disable in game screen res change for osx (prompt user to restart game) 2014-12-06 18:45:26 -08:00
titiger
3e3fef88f5 render a team color in game setup menues 2014-12-06 00:54:00 +01:00
titiger
d053e54760 Tell new players what to do when connected to a headless client 2014-12-05 21:44:43 +01:00
titiger
7554d57142 Tell new players what to do when connected to a headless client 2014-12-05 21:43:34 +01:00
titiger
58cba20cf4 update version in script 2014-12-03 01:30:03 +01:00
titiger
974e04ef1f v3.10.0-beta1 2014-12-02 23:37:48 +01:00
Mark Vejvoda
40df13461e Merge pull request #13 from alketii/master
Disabled button in lobby which holds players name.
2014-12-02 10:59:03 -08:00
SoftCoder
5e292e931c - memory leak and a few other minor bug fixes as discovered by coverity scan. 2014-11-30 15:30:02 -08:00
SoftCoder
829f23db4e - updated deps for ubuntu 14.04 and higher 2014-11-29 22:45:31 -08:00
SoftCoder
c21317a5f4 - attempt to further stabilize g3d viewer end map editor 2014-11-29 17:44:22 -08:00
titiger
956671f018 bugfix: new attributes must not exist in older savegames 2014-11-29 19:25:33 +01:00
titiger
9e676a6e0e Merge branch 'develop' of github.com:MegaGlest/megaglest-source into develop 2014-11-29 19:09:37 +01:00
titiger
f0b8d399a3 new data 2014-11-29 19:07:53 +01:00
SoftCoder
6faa3dc725 - see if this improves stability of the map editor in newer wxwidgets 2014-11-28 23:49:16 -08:00
SoftCoder
ad0b652727 - bugfix for g3d viewer and updated wxwidgets 2014-11-28 23:35:35 -08:00
SoftCoder
126ed18589 - bugfix selection circle and healthbar rendering 2014-11-28 20:49:04 -08:00
SoftCoder
8e7dfbd43a Merge branch 'develop' of github-softcoder-megaglest:MegaGlest/megaglest-source into develop 2014-11-28 20:45:40 -08:00
SoftCoder
e27c44bb8f - bugfix of selection circle and healthbar ratio value 2014-11-28 20:45:07 -08:00
SoftCoder
645778a490 - added new files to vc2012 project 2014-11-28 20:05:33 -08:00
SoftCoder
ceca2fc5aa - more fixes from cppcheck 2014-11-28 18:19:40 -08:00
SoftCoder
a656a64830 - corrected some uninitialized vars identified by cppcheck 2014-11-28 16:53:30 -08:00
SoftCoder
d0cdea1a6d Merge branch 'develop' of github-softcoder-megaglest:MegaGlest/megaglest-source into develop 2014-11-28 16:23:14 -08:00
SoftCoder
ec0d9a7cd5 - bugfix to properly set defaults for particles 2014-11-28 16:22:29 -08:00
titiger
bb62a998cd render healthbars after particles to make them more visible 2014-11-28 23:52:56 +01:00
titiger
a37e7b398e blend mode set to normal after particle rendering 2014-11-28 23:52:13 +01:00
titiger
f475b2e3a7 updated data 2014-11-28 02:57:06 +01:00
titiger
588811783f Merge branch 'develop' of github.com:MegaGlest/megaglest-source into develop 2014-11-28 00:33:55 +01:00
SoftCoder
65a3ce6e86 - fix loading of deferred system particles 2014-11-27 15:28:49 -08:00
titiger
8090161fff Merge branch 'develop' of github.com:MegaGlest/megaglest-source into develop 2014-11-27 23:05:49 +01:00
titiger
5f0714bb25 updated data 2014-11-27 02:23:25 +01:00
SoftCoder
cbf9a305c5 - attempt to improve loading of fire particle 2014-11-26 17:19:46 -08:00
titiger
99e315b1cb healthbars: EP was not properly handled 2014-11-27 01:17:32 +01:00
titiger
eaec6e08ae and one more bugfix for particle positioning 2014-11-27 00:35:37 +01:00
titiger
6ab51749e8 bugfix for particle positioning 2014-11-26 01:51:45 +01:00
titiger
3eb9c05b4a Particlesystems can now be positioned unit height independend
In the faction.xml you can set teh following now:
<flat-particle-positions value="true"/>
By this the positions of the particle systems ( attack and unit particles ) 
can be done based of the units centered ground position and 
by this height independend.
2014-11-26 00:38:04 +01:00
titiger
54905c0e5c rename getCurrVector() to getCurrMidHeightVector() 2014-11-25 23:40:47 +01:00
titiger
024338429a special height for fire and hitposition can be set in a units 2014-11-25 22:36:19 +01:00
titiger
50b27db1d6 delete the projectile type if not needed 2014-11-25 22:35:07 +01:00
titiger
7bf6fe756c bugfix for a crash with projectiles without particle system
only add a projectile if there is an enabled particlesystem
2014-11-25 00:56:59 +01:00
SoftCoder
29ab1094ec - fixed unit particles so they worked for normal use cases 2014-11-24 14:36:12 -08:00