6fc59dc5f2
Merge branch 'develop' of github-tomreyn-megaglest:MegaGlest/megaglest-source into develop
2014-07-24 22:16:13 +02:00
7c73b47a13
buildDeps: Fix openSUSE + add current Ubuntu/Mint
2014-07-24 22:14:36 +02:00
d5a408df7f
Merge branch 'develop' of github.com:MegaGlest/megaglest-source into develop
2014-07-24 22:04:33 +02:00
7e6069d159
Merge remote-tracking branch 'origin/pr/21' into develop
2014-07-24 22:02:21 +02:00
a4c7652db5
SuSE is now OpenSuse is now openSUSE
2014-07-24 21:59:15 +02:00
49fc7d4bce
Suse 13.x is supported too now
2014-07-23 23:24:47 +02:00
731597ff4e
Fix animationbound-particles
2014-07-23 21:24:43 +02:00
a51ae28018
windows does not know uint out of the box
2014-07-23 02:33:10 +02:00
082f3472ee
Looting
2014-07-22 23:53:45 +02:00
af634f24e8
Merge remote-tracking branch 'origin/pr/17' into pullrequest17
2014-07-22 23:24:49 +02:00
fbde1e69a3
Fixed bad names
2014-07-22 15:23:05 -06:00
a510150ef5
Merge remote-tracking branch 'origin/pr/17' into pullrequest17
2014-07-22 23:08:52 +02:00
86954aed47
Renamed loss-percentage to faction-loss-percentage
...
Also renamed loss-value accordingly. As discussed with Titi in IRC.
2014-07-22 14:58:41 -06:00
62b147b2ee
Merge remote-tracking branch 'origin/pr/17' into pullrequest17
2014-07-22 21:28:10 +02:00
488ff4f462
Added namespace and file comments
...
Namespaces Glest and Game are now commented. To avoid unnecessary
duplication, they're only commented in one place (main.cpp).
2014-07-21 21:02:31 -06:00
d6668b7e85
No more warnings for undocumented code
2014-07-21 21:01:15 -06:00
d2ad51613e
Documented most of upgrade.h
2014-07-20 23:03:36 -06:00
bcc75b16d3
Doxygen now outputs private, static, etc
2014-07-20 23:02:56 -06:00
7e81728fe8
damagePercent for projectiles
...
all given damage percents from the projectiles must sum up to exactly 100%
2014-07-20 22:47:07 +02:00
5243a30b8b
Documented most of upgrade_type
2014-07-20 12:32:18 -06:00
69e95eef7f
Added Doxygen support
...
Output folder is ignored by Git
2014-07-20 11:07:51 -06:00
a829fe580a
Animation speed now properly scales
...
That is, the increase in attack speed is the same as the increase in
animation speed. Previously, this was only the case for absolute
increases. Now percentage increases do so, as well.
2014-07-19 22:24:23 -06:00
3165e41014
Attack speed is now upgradable
...
Syntax is the same as all other upgrade stats. This also allows attack
boosts to upgrade the attack speed (since they use the same code).
2014-07-19 22:05:59 -06:00
da23e4c048
multi sounds
...
multiple sounds timed sounds for all skills.
By this you can now play a sound for shooting every single shot too.
2014-07-20 03:28:03 +02:00
b9eb74d916
Percentages were wrong way around
2014-07-19 19:12:34 -06:00
f0801b3c33
Converted floats to ints
...
As discussed with Titi, this may prevent some issues with multiplayer
getting out of sync due to different floating point calculations.
2014-07-19 19:03:33 -06:00
9883bf7656
Merge branch 'feature-starting-vals' into feature-looting
2014-07-19 19:00:08 -06:00
ef0cf706b3
Converted percentages to use int instead of float
...
May help prevent floating point calculation errors in multiplayer.
2014-07-19 18:59:11 -06:00
191c353491
Fixing platform inconsistency
...
It appears that the issue is a Windows problem, with Windows providing
macros for min and max that interfere with using the proper ones defined
in the algorithm header file.
2014-07-19 18:07:24 -06:00
cedb20646e
Fixed compilation error
...
Failed to override ==
2014-07-19 17:43:27 -06:00
75eb5c8ddf
Lootable resources now checks for dups
2014-07-19 16:52:53 -06:00
3cae2559c7
No looting if you attack units in same faction
2014-07-19 16:44:11 -06:00
68455a819f
Added setting to disable going into negatives
...
After all, how does one loot what the other faction does not have? Still,
could be useful for some places, by forcing the opponent to go into
"debt".
2014-07-19 16:38:33 -06:00
df0d7aaac9
Implemented rest of resource amount/loss attrs
2014-07-19 16:13:09 -06:00
23deb957a7
First, basic looting implementation
...
Only absolute values are obtained for now, no loss.
2014-07-19 15:37:59 -06:00
26bab8548c
Splash was broken and destructor needs to cleanup more
2014-07-19 20:26:45 +02:00
666333b4a1
new style projectiles must have a particle system
2014-07-19 19:29:41 +02:00
0a68e3a6a4
Implemented starting value for HP
...
Same syntax as for EP:
<max-hp value="1000" regeneration="1" start-percentage="1.0" />
Where `start-percentage` can be replaced by `start-value` to use an
absolute number. Note that unlike EP, HP defaults to the max-hp value
*before* upgrades are applied. This behavior is not changed. To make units
spawn with their fully upgraded HP, set their start-percentage to 1.0.
2014-07-19 10:57:34 -06:00
762f09ab43
multishot with multi sounds and possible camerashake on projectile impact.
...
Still work in progress!
2014-07-19 18:50:47 +02:00
94667b9ab9
Error checking now active for start-ep
...
You can no longer have both start-value and start-percentage.
2014-07-19 10:31:57 -06:00
a65898571d
Implemented start percentage for EP
...
Note that start-value and start-percentage (both are attributes of the
max-ep tag) are mutually exclusive. If they both exist, then
start-percentage is used.
2014-07-19 09:53:38 -06:00
f22c96e503
Start ep now an argument of max-ep
...
Syntax is `<max-ep value="500" start-value="250" />`
2014-07-19 09:15:53 -06:00
b72f4857d7
multi projectiles with different timings and particle systems
2014-07-18 01:04:36 +02:00
c081862070
use a bool instead of a (unused) pointer.
2014-07-11 00:26:16 +02:00
dff810a5b1
multishot with more than one attack particle system
2014-07-10 23:34:39 +02:00
a5e8e6df02
testing version of multiple projectiles
2014-07-09 19:59:09 +02:00
31def0dc1a
Merge pull request #14 from FreshDumbledore/develop
...
Start EP can be set
2014-06-18 23:43:26 +02:00
202fcd7cad
fixed an unimported copy&paste tag :) had no influence afaik but still
...
better like this
2014-06-18 22:50:07 +02:00
04d2664b06
optional start-ep tag implemented
2014-06-18 22:00:50 +02:00
cac1cc3e6e
Disabled button in lobby which holds players name.
2014-05-23 22:43:36 +02:00
Tom Reynolds