Commit Graph

4769 Commits

Author SHA1 Message Date
titiger 082f3472ee Looting 2014-07-22 23:53:45 +02:00
titiger af634f24e8 Merge remote-tracking branch 'origin/pr/17' into pullrequest17 2014-07-22 23:24:49 +02:00
Mike Hoffert fbde1e69a3 Fixed bad names 2014-07-22 15:23:05 -06:00
titiger a510150ef5 Merge remote-tracking branch 'origin/pr/17' into pullrequest17 2014-07-22 23:08:52 +02:00
Mike Hoffert 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
titiger 62b147b2ee Merge remote-tracking branch 'origin/pr/17' into pullrequest17 2014-07-22 21:28:10 +02:00
titiger 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
titiger 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
Mike Hoffert b9eb74d916 Percentages were wrong way around 2014-07-19 19:12:34 -06:00
Mike Hoffert 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
Mike Hoffert 9883bf7656 Merge branch 'feature-starting-vals' into feature-looting 2014-07-19 19:00:08 -06:00
Mike Hoffert 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
Mike Hoffert 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
Mike Hoffert cedb20646e Fixed compilation error
Failed to override ==
2014-07-19 17:43:27 -06:00
Mike Hoffert 75eb5c8ddf Lootable resources now checks for dups 2014-07-19 16:52:53 -06:00
Mike Hoffert 3cae2559c7 No looting if you attack units in same faction 2014-07-19 16:44:11 -06:00
Mike Hoffert 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
Mike Hoffert df0d7aaac9 Implemented rest of resource amount/loss attrs 2014-07-19 16:13:09 -06:00
Mike Hoffert 23deb957a7 First, basic looting implementation
Only absolute values are obtained for now, no loss.
2014-07-19 15:37:59 -06:00
titiger 26bab8548c Splash was broken and destructor needs to cleanup more 2014-07-19 20:26:45 +02:00
titiger 666333b4a1 new style projectiles must have a particle system 2014-07-19 19:29:41 +02:00
Mike Hoffert 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
titiger 762f09ab43 multishot with multi sounds and possible camerashake on projectile impact.
Still work in progress!
2014-07-19 18:50:47 +02:00
Mike Hoffert 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
Mike Hoffert 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
Mike Hoffert 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
titiger b72f4857d7 multi projectiles with different timings and particle systems 2014-07-18 01:04:36 +02:00
titiger c081862070 use a bool instead of a (unused) pointer. 2014-07-11 00:26:16 +02:00
titiger dff810a5b1 multishot with more than one attack particle system 2014-07-10 23:34:39 +02:00
FreshDumbledore a5e8e6df02 testing version of multiple projectiles 2014-07-09 19:59:09 +02:00
titiger 31def0dc1a Merge pull request #14 from FreshDumbledore/develop
Start EP can be set
2014-06-18 23:43:26 +02:00
FreshDumbledore 202fcd7cad fixed an unimported copy&paste tag :) had no influence afaik but still
better like this
2014-06-18 22:50:07 +02:00
FreshDumbledore 04d2664b06 optional start-ep tag implemented 2014-06-18 22:00:50 +02:00
Mark Vejvoda 0f3d6c084f Merge pull request #9 from pabs3/develop
Also support -DCMAKE_BUILD_TYPE=None which is used by Debian
2014-03-26 21:09:59 -07:00
Paul Wise c190c2eabb Also support -DCMAKE_BUILD_TYPE=None which is used by Debian
Fixes: https://bugs.debian.org/739068
2014-03-27 10:35:22 +08:00
Tom Reynolds fa0a8ac9e7 No prompt for file removal 2014-03-16 06:16:24 +01:00
Tom Reynolds cf53540438 Windows: delete Release\*.tlog before building 2014-03-16 06:13:31 +01:00
Tom Reynolds 31a6a84c93 travis: don't apt-get upgrade build node 2014-02-27 03:22:36 +01:00
Tom Reynolds d348edc634 build-mg.sh: no more warning when clang is not installed [ci skip] 2014-02-15 02:38:42 +01:00
Tom Reynolds 7ce5476669 hopefully this gives us just two travis builds (not 4) 2014-02-12 22:39:55 +01:00
Tom Reynolds 32d68d6642 travis: for now, clang build result should not impact overall build result 2014-02-12 08:45:01 +01:00
Tom Reynolds cc64e6cc8e fix detection for CXX=clang 2014-02-12 00:55:29 +01:00
SoftCoder a737bcde3c - fixed hard coded paths to use derived data fodler 2014-02-07 16:37:55 -08:00
SoftCoder 3c6bac9435 - removed unused compiler setting from vc++ 2012 projects 2014-02-07 15:48:44 -08:00
SoftCoder 63863bac89 - updated unit test to compile on windows
- updated vc++ 2012 compile flags and changed asm to use unsigned
2014-02-07 15:42:00 -08:00
SoftCoder 6c7e0cdbce - added more streflop unit tests 2014-02-07 15:09:50 -08:00
SoftCoder 7ccc0f143f - added more streflop tests to check xplatform compat 2014-02-07 14:32:58 -08:00
SoftCoder 754bfcf2a0 - try updated micro test 2014-02-07 14:15:55 -08:00
SoftCoder f2396dfa4d Merge branch 'master' of github-softcoder-megaglest:MegaGlest/megaglest-source 2014-02-07 13:55:52 -08:00
SoftCoder c691bcb9ed - check to see if this new unit test passes on windows? 2014-02-07 13:55:26 -08:00