filux
9988ea9cbf
resolved conflicts to upstream/develop
2014-09-27 11:19:29 +00:00
titiger
1f5b571c9d
bugfix for bad {SCENARIODIR} replacement
...
Done by softcoder in branch ce-gui, manually merged by me :)
https://forum.megaglest.org/index.php?topic=9553.0
2014-09-24 01:16:28 +02:00
titiger
5f9816eaab
multiplier are displayed in debug
...
Multipliers are now shown for CPU-Players in the debug info too
2014-09-23 01:14:20 +02:00
titiger
af46a8497e
Disabled teamchat is reported to the user.
...
If teamchat is disbaled to prevent cheating the user gets a message everytime
he tries to get into team chat mode.
2014-09-22 03:31:35 +02:00
titiger
2f00143782
cleanup all particle systems when morphing
...
https://forum.megaglest.org/index.php?topic=9561.0
2014-09-22 02:58:47 +02:00
titiger
4fc4359d99
we don't want fancy commands from irc
...
https://forum.megaglest.org/index.php?topic=7756.0
2014-09-22 00:36:49 +02:00
titiger
a084686ce9
fixed a merge conflict
2014-08-10 00:15:23 +02:00
titiger
cf5da4d2b3
fixed lua function getUnitName; added new lua function getUnitDisplayName
2014-08-09 00:48:04 +02:00
titiger
e5d2bbbf9e
Merge pull request #23 from titison/feature/unit_control
...
non commandable units
2014-08-08 01:22:51 +02:00
titiger
ad5e978be9
Merge pull request #20 from MikeHoffert/documentation
...
Documentation is always a good thing
2014-08-08 01:20:47 +02:00
titison
850a9a7dc0
-AI can't command non-commandable units anymore
...
-Removed non-selectable
2014-08-07 21:00:27 +02:00
titiger
bf5125f1c6
Merge pull request #24 from titison/feature/particle-speedUp
...
Feature/particle speed up
2014-08-06 22:21:02 +02:00
titiger
791f42874a
Bugfix for spawn attack. Too many checks were removed with last checkin.
2014-08-02 23:27:45 +02:00
titiger
c2dcda0969
Merge pull request #22 from titison/feature/spawnattack_at_enemy
...
Feature/spawnattack at enemy
2014-07-28 23:20:58 +02:00
titiger
f66fd92a64
hitsound was accidently mandatory, but it is not.
2014-07-28 23:18:52 +02:00
titison
72828c39a3
Added to booleans
...
1. selectable | if this is false, you cant select the unit.
2. commandable | if this is false, you cant give the units commands.
I advise to set a non-selectable unit to non-commandable too if you want to make a normal unit morph into it.
2014-07-28 17:03:36 +02:00
titison
51c1afe4e4
Added the ability for SpawnAttacks to let the units spawn when the projectile arrives at the targetpos.
...
Unit will always try to attack if it has an attack command.
Unit attacks the target POS and not the target UNIT of the attacker.
2014-07-27 21:41:40 +02:00
titison
6086a33baf
Added a bool spawnAtTarget to spawn attack in which you can define whether the unit spawns at the target or at the attacker.
...
In Addition i changed the command which is given to the spawned unit to an attack command on the target cell.
( I think this makes way more sense than giving a move command to the meeting point)
( This also works if the spawned does not have a attack command. It will move to the enemy then)
2014-07-27 12:54:25 +02:00
titison
4c51677a9d
Accidently doubled the gravity ^^
2014-07-26 14:03:54 +02:00
titison
38ca1fd3f9
Unit and Splash particles can be speeded up.
...
You can set a constant value and a relative value.
2014-07-26 13:56:29 +02:00
titison
731597ff4e
Fix animationbound-particles
2014-07-23 21:24:43 +02:00
titiger
a51ae28018
windows does not know uint out of the box
2014-07-23 02:33:10 +02:00
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
Mike Hoffert
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
Mike Hoffert
d6668b7e85
No more warnings for undocumented code
2014-07-21 21:01:15 -06:00
Mike Hoffert
d2ad51613e
Documented most of upgrade.h
2014-07-20 23:03:36 -06:00
Mike Hoffert
bcc75b16d3
Doxygen now outputs private, static, etc
2014-07-20 23:02:56 -06: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
Mike Hoffert
5243a30b8b
Documented most of upgrade_type
2014-07-20 12:32:18 -06:00
Mike Hoffert
69e95eef7f
Added Doxygen support
...
Output folder is ignored by Git
2014-07-20 11:07:51 -06: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