Rampoina/MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4,964 Commits 1 Branch 0 Tags 27 MiB
3965f72b5a
Commit Graph

4255 Commits

Author SHA1 Message Date
SoftCoder
65a3ce6e86 - fix loading of deferred system particles 2014-11-27 15:28:49 -08: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
titiger
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
titiger
88de5a7050 Upgrades must be taken into account for healthbars too 2014-11-24 01:39:29 +01:00
titiger
30506edebd fixed some more problems with console messages 2014-11-24 01:10:10 +01:00
titiger
6b35fa1918 its "Healthbar" in translation, not "HealthBar" 2014-11-23 01:52:38 +01:00
titiger
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
titison
345c88d320 Work on Healthbars 
production bars;
options;
many more...;
 2014-11-22 23:15:19 +01:00
SoftCoder
3647a610cc - attempt to improve mutex locking in irc client code to avoid dead locks 2014-11-20 17:51:24 -08:00
titiger
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
titiger
5791f64829 Scenarios that pause the game in the beginning get no more black screen 2014-11-19 23:29:51 +01:00
titiger
25a8f44ee1 This fixes black background for loaded games which are paused 2014-11-19 22:43:45 +01:00
SoftCoder
5676a055ba Merge branch 'develop' of github-softcoder-megaglest:MegaGlest/megaglest-source into develop 2014-11-18 21:40:12 -08:00
SoftCoder
3b3132ccce - unit particles now support minHp / mapHp tags 2014-11-18 21:38:46 -08:00
titiger
b4e9f787bd several changes for loading saved games 
allow to load older compatible save game
introduced a "last backward compatible version" for loading games
fixed a bug allowing to load older games
 2014-11-18 18:59:45 +01:00
titiger
0ac48846cb faction_type has no save game, was just confusing to have this dead code 2014-11-17 00:14:52 +01:00
titison
7eb04e1583 setLockedUnitsForFaction 
*save locked Units in savegames ( and load them when savegame is loaded )
 2014-11-16 18:32:13 +01:00
titison
5de94dccc9 setLockedUnitForFaction 
*removed debug (printf's)
 2014-11-15 18:45:46 +01:00
titison
ea04a2bb58 setLockedUnitForFaction 
*Showing an info in the info string ( above the requirements of the unit ) if locked
 2014-11-15 18:30:48 +01:00
titison
bcb3288d74 setLockedUnitForFaction 
*the actual lua function "setLockedUnitForFaction"
 2014-11-15 18:30:48 +01:00
titiger
71bdb1cba7 Player names of Scenarios were displayed in wrong slot. 
The player names were set with wrong index and CPU players had wrong names.
 2014-11-14 22:25:56 +01:00
titiger
b85f9794e0 allow all kind of gfx formats for healthbar textures 2014-11-10 21:55:30 +01:00
titiger
d21f7bd976 problems found by coverity 2014-11-10 21:53:10 +01:00
titiger
49e55209da Healthbars in ingame options 2014-11-08 01:30:43 +01:00
titiger
26db981702 Merge pull request #27 from titison/feature/hp-bars 
Feature/hp bars
 2014-11-07 01:33:30 +01:00
titiger
85c79be337 Game name is now part of the game settings. 
This fixes the ugly "S Game" on the stats.
 2014-11-07 01:26:23 +01:00
titison
2f60d179e9 Healthbars 
* Hotkey now toggles between Default/Off/Always/Damaged/Selected
* Code clean up
 2014-11-06 21:12:47 +01:00
titison
791e1edec6 Healthbars 
Textures (border and background)
Faction.xml can specify more healthbars details
 2014-11-05 02:05:47 +01:00
titison
d1597334bf *Adjusted Healthbar color 
*Hotkey for Healthbars (ToggleHealthbars)
*Background and Border Texture in core data
 2014-11-02 18:18:20 +01:00
titiger
c32e828625 buxfix for too many rendered slot lines ( in some cases ). 2014-11-02 18:09:33 +01:00
titiger
534c94ec98 fix for duplicated console messages in connected game menu 2014-10-31 02:34:59 +01:00
titiger
dbddadc74b Fix to see normal consoleMessages in many menus again 
(+ consolemessages to show that the headless server did 
not had the selected map )
 2014-10-31 01:08:12 +01:00
titison
fe936f5c8c Adjusting healthbar related things 
*unit height=healthbar height per default
*no hpbars in photomode
*renamed function
 2014-10-30 00:55:18 +01:00
titiger
e322b5ccb6 Merge branch 'develop' of github.com:MegaGlest/megaglest-source into develop 2014-10-30 00:08:28 +01:00
titiger
49eec16401 disable factioncontrol selection where it is not possible 2014-10-30 00:02:23 +01:00
titison
08806c5416 *Finised Hp Bars 
*Added general settings in faction.xml
 2014-10-29 22:23:46 +01:00
titison
de5135bfaf *added split(s,d) function for strings 
*reading unit xml healthbar node
*adjusted hpbars
 2014-10-29 00:50:45 +01:00
titison
034b6066be Merge branch 'develop' of github.com:MegaGlest/megaglest-source into feature/hp-bars 2014-10-28 22:05:04 +01:00
titiger
6507e27fda hopefully smoth switching when connected to headless servers. 2014-10-28 21:52:10 +01:00
titison
2bfe4a0b0f Merge branch 'develop' of github.com:MegaGlest/megaglest-source into feature/hp-bars 2014-10-27 23:24:20 +01:00
titison
a2790bd9cb Make them actually usable. 
added ep bars.
Of course its not finished yet
 2014-10-27 16:16:50 +01:00
titison
20a8011a46 first hp-bars 2014-10-26 21:34:14 +01:00
titiger
8892a2533c no more trouble when switching maps in headless mode. 
If a button was pressed in the last 4 seconds we ignore settings distributed by the
headless server.
 2014-10-05 01:38:18 +02:00
titiger
ea1be62242 fix for a VERY old bug related to wrong display of attack range 
see https://forum.megaglest.org/index.php?topic=9567.0
this is a bug found  in glest 2.0 !!!
 2014-10-01 00:33:47 +02:00
titiger
e39fb8e8e4 trying to fix windows build 2014-09-29 02:55:15 +02:00
titiger
feb31e27d9 tags feature 
Tags feature ( manually merged ) from Omegas pullrequest 25
https://github.com/MegaGlest/megaglest-source/pull/25/
see forum discussion:
https://forum.megaglest.org/index.php?topic=9543.0
 2014-09-29 02:23:36 +02:00
titiger
6ebe0a197c whatever caused this code duplication .... 2014-09-29 01:47:00 +02:00
titiger
c6993ed7dd Merge pull request #19 from MikeHoffert/feature-attack-boost 
Attack boosts and upgrades now support upgrading attack speed
 2014-09-29 01:24:52 +02:00
titiger
ea2b4bcc7f Headless servers should not precalculate CRCs. 
This creates too much load when more than one server is running on 
the same machine.
 2014-09-25 23:50:37 +02: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
Mike Hoffert
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
Mike Hoffert
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
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