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
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
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
58cba20cf4
update version in script
2014-12-03 01:30:03 +01:00
974e04ef1f
v3.10.0-beta1
2014-12-02 23:37:48 +01:00
40df13461e
Merge pull request #13 from alketii/master
...
Disabled button in lobby which holds players name.
2014-12-02 10:59:03 -08:00
5e292e931c
- memory leak and a few other minor bug fixes as discovered by coverity scan.
2014-11-30 15:30:02 -08:00
829f23db4e
- updated deps for ubuntu 14.04 and higher
2014-11-29 22:45:31 -08:00
c21317a5f4
- attempt to further stabilize g3d viewer end map editor
2014-11-29 17:44:22 -08:00
956671f018
bugfix: new attributes must not exist in older savegames
2014-11-29 19:25:33 +01:00
9e676a6e0e
Merge branch 'develop' of github.com:MegaGlest/megaglest-source into develop
2014-11-29 19:09:37 +01:00
f0b8d399a3
new data
2014-11-29 19:07:53 +01:00
6faa3dc725
- see if this improves stability of the map editor in newer wxwidgets
2014-11-28 23:49:16 -08:00
ad0b652727
- bugfix for g3d viewer and updated wxwidgets
2014-11-28 23:35:35 -08:00
126ed18589
- bugfix selection circle and healthbar rendering
2014-11-28 20:49:04 -08:00
8e7dfbd43a
Merge branch 'develop' of github-softcoder-megaglest:MegaGlest/megaglest-source into develop
2014-11-28 20:45:40 -08:00
e27c44bb8f
- bugfix of selection circle and healthbar ratio value
2014-11-28 20:45:07 -08:00
645778a490
- added new files to vc2012 project
2014-11-28 20:05:33 -08:00
ceca2fc5aa
- more fixes from cppcheck
2014-11-28 18:19:40 -08:00
a656a64830
- corrected some uninitialized vars identified by cppcheck
2014-11-28 16:53:30 -08:00
d0cdea1a6d
Merge branch 'develop' of github-softcoder-megaglest:MegaGlest/megaglest-source into develop
2014-11-28 16:23:14 -08:00
ec0d9a7cd5
- bugfix to properly set defaults for particles
2014-11-28 16:22:29 -08:00
bb62a998cd
render healthbars after particles to make them more visible
2014-11-28 23:52:56 +01:00
a37e7b398e
blend mode set to normal after particle rendering
2014-11-28 23:52:13 +01:00
f475b2e3a7
updated data
2014-11-28 02:57:06 +01:00
588811783f
Merge branch 'develop' of github.com:MegaGlest/megaglest-source into develop
2014-11-28 00:33:55 +01:00
65a3ce6e86
- fix loading of deferred system particles
2014-11-27 15:28:49 -08:00
8090161fff
Merge branch 'develop' of github.com:MegaGlest/megaglest-source into develop
2014-11-27 23:05:49 +01:00
5f0714bb25
updated data
2014-11-27 02:23:25 +01:00
cbf9a305c5
- attempt to improve loading of fire particle
2014-11-26 17:19:46 -08:00
99e315b1cb
healthbars: EP was not properly handled
2014-11-27 01:17:32 +01:00
eaec6e08ae
and one more bugfix for particle positioning
2014-11-27 00:35:37 +01:00
6ab51749e8
bugfix for particle positioning
2014-11-26 01:51:45 +01:00
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
54905c0e5c
rename getCurrVector() to getCurrMidHeightVector()
2014-11-25 23:40:47 +01:00
024338429a
special height for fire and hitposition can be set in a units
2014-11-25 22:36:19 +01:00
50b27db1d6
delete the projectile type if not needed
2014-11-25 22:35:07 +01:00
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
29ab1094ec
- fixed unit particles so they worked for normal use cases
2014-11-24 14:36:12 -08:00
eae90a2198
fix for effects debug rendering
...
units with size>1 showed a too big effect range circle
2014-11-24 22:14:09 +01:00
88de5a7050
Upgrades must be taken into account for healthbars too
2014-11-24 01:39:29 +01:00
30506edebd
fixed some more problems with console messages
2014-11-24 01:10:10 +01:00
6b35fa1918
its "Healthbar" in translation, not "HealthBar"
2014-11-23 01:52:38 +01:00
c798f87504
data is updated
2014-11-23 01:04:13 +01:00
b20b548e76
Merge pull request #30 from titison/feature/lua_blockUnits
...
Feature/lua you can disable units via lua commands so that they cannot be built
2014-11-22 23:39:44 +01:00
f095a96be3
Merge pull request #31 from titison/feature/hp-bars
...
Work on Healthbars
Coop work of titi and son
2014-11-22 23:38:26 +01:00
345c88d320
Work on Healthbars
...
production bars;
options;
many more...;
2014-11-22 23:15:19 +01:00
3647a610cc
- attempt to improve mutex locking in irc client code to avoid dead locks
2014-11-20 17:51:24 -08:00
55a27b4c6b
every game initialized with a frame count>1 is a somehwo loaded game
...
This means the Fow needs to be set like it is inside a match.
2014-11-19 23:34:18 +01:00
5791f64829
Scenarios that pause the game in the beginning get no more black screen
2014-11-19 23:29:51 +01:00
Karl Goetz