Commit Graph

4315 Commits

Author SHA1 Message Date
SoftCoder b1455c0e33 - properly cleanup models in g3dviewer to fix shutdown bug 2014-12-23 20:39:03 -08:00
titiger 8925a8997c fix for boosting sight 2014-12-22 21:11:58 +01:00
SoftCoder dc143f8819 - few more tiny fixes for msvc compiler warnings 2014-12-21 23:45:16 -08:00
SoftCoder 56214c6228 - small cleanup in vc++ compile 2014-12-21 22:20:19 -08:00
SoftCoder f97f0ef852 - more general bugfixes (not all upgrade values were being used in the code) 2014-12-21 21:07:24 -08:00
SoftCoder 3705d56057 Merge branch 'develop' of github-softcoder-megaglest:MegaGlest/megaglest-source into develop 2014-12-21 20:27:48 -08:00
SoftCoder 92a113ddfa - missed a few places where we should use total upgrade sight 2014-12-21 20:27:21 -08:00
titiger f62efc64bf fix for uneditable closed slots
https://forum.megaglest.org/index.php?topic=9620.0
2014-12-22 03:08:19 +01:00
SoftCoder e65ad1b69c - added more error checking in case segfault reproduced from: https://forum.megaglest.org/index.php?topic=9612.0;topicseen 2014-12-21 17:32:04 -08:00
SoftCoder b0f7b078f6 - apply sight upgrades when units sight is involved in cacls 2014-12-21 17:23:20 -08:00
SoftCoder 3965f72b5a - updated debug output in case there are real boost problems in future 2014-12-21 14:47:58 -08:00
SoftCoder 494061b80d Merge branch 'develop' of github-softcoder-megaglest:MegaGlest/megaglest-source into develop 2014-12-21 13:02:57 -08:00
SoftCoder 0a55746ae2 - more attempts to fix attack boost with upgrades 2014-12-21 13:02:27 -08:00
titiger b50cb7770c Comparison of version numbers allows non integer characters too
This is used to check compatibility of saved games typically.
Only the leading digits are used as minor version now.
2014-12-21 13:35:42 +01:00
titiger 1a8c28cc93 Make it more obvious where to join a game in the internet menu
Buttons can be set to always lighted(flashing). This is first used in 
the internet menu.
2014-12-21 13:33:46 +01:00
SoftCoder b5d609586a - small coverity fix 2014-12-20 16:31:08 -08:00
SoftCoder d08eacacc8 - fix the display of upgrades and boost values 2014-12-20 16:26:14 -08:00
SoftCoder 7418fac810 - small fix for display 2014-12-20 15:32:40 -08:00
SoftCoder 32c11f41de - cleanup of boost apply code and fix to apply when active boosts exist in middle of a level up 2014-12-20 15:27:11 -08:00
SoftCoder 461b16be8e - attempt to fix attack boosts to properly apply and de-apply when upgrades are present 2014-12-20 14:25:42 -08:00
SoftCoder 4dea67cff9 - attempt to fix thread crash when ending game for network play 2014-12-19 19:08:04 -08:00
titiger d34e58ccb6 fix for too often applied boosts 2014-12-19 22:48:07 +01:00
titiger e20d242e2c its no longer compatible to beta 2014-12-19 22:47:09 +01:00
titiger 3120ab7453 boost without explicitly listed units fixed 2014-12-19 19:40:34 +01:00
titiger 5b82859e92 default GraphicMessageBox size adjusted 2014-12-18 01:11:06 +01:00
titiger a9cac6a3c1 render messagebox in a way that allows more text.
And default message box height is raised a bit to avoid trouble with 
long messages in scenarios.
2014-12-18 01:04:37 +01:00
titiger 47c181d2ab different rendering of resources in teammode 2014-12-18 00:32:44 +01:00
SoftCoder 5099f19709 - update miniz code to 1.15 2014-12-17 07:28:06 -08:00
SoftCoder c945a5721d - more coverity based fixes 2014-12-15 21:07:13 -08:00
SoftCoder 8210485a42 - a few bugfixes related to coverity scan 2014-12-15 19:44:26 -08:00
titiger 9392aa0fca fixed missing cast found by Coverity CID 1232664 2014-12-16 02:08:29 +01:00
titiger 2d4c4ece8a fixed missing cast found by Coverity CID 1232665 2014-12-16 01:50:12 +01:00
titiger c51817d8d5 fixed missing cast found by Coverity CID 1232666 2014-12-16 01:49:26 +01:00
titiger c3cd1cfc17 return value was not used
Coverity CID 1232671
2014-12-16 01:15:56 +01:00
titiger a11855e220 fixed Division by float zero
Coverity scan CID 1197074 and more numbers
2014-12-16 00:56:26 +01:00
titiger db0007d277 fixed missing initialisations found by coverity scan
Coverity CID 1197086
2014-12-16 00:53:33 +01:00
titiger b407e0090d same button layout for custom game menu and connected game menu 2014-12-15 21:39:11 +01:00
titiger fd765da5e8 Advanced transifex options in menu are back in place 2014-12-15 02:05:47 +01:00
titiger 2c15c89571 render server lines with background to make them more readable. 2014-12-15 01:07:25 +01:00
titiger e1d85f145c bigger message box to explain wrong router setup 2014-12-09 02:36:30 +01:00
SoftCoder 8cd7a9580f - disable in game screen res change for osx (prompt user to restart game) 2014-12-06 18:45:26 -08:00
titiger 3e3fef88f5 render a team color in game setup menues 2014-12-06 00:54:00 +01:00
titiger 7554d57142 Tell new players what to do when connected to a headless client 2014-12-05 21:43:34 +01:00
titiger 974e04ef1f v3.10.0-beta1 2014-12-02 23:37:48 +01:00
Mark Vejvoda 40df13461e Merge pull request #13 from alketii/master
Disabled button in lobby which holds players name.
2014-12-02 10:59:03 -08:00
SoftCoder 5e292e931c - memory leak and a few other minor bug fixes as discovered by coverity scan. 2014-11-30 15:30:02 -08:00
SoftCoder c21317a5f4 - attempt to further stabilize g3d viewer end map editor 2014-11-29 17:44:22 -08:00
titiger 956671f018 bugfix: new attributes must not exist in older savegames 2014-11-29 19:25:33 +01:00
SoftCoder 6faa3dc725 - see if this improves stability of the map editor in newer wxwidgets 2014-11-28 23:49:16 -08:00
SoftCoder ad0b652727 - bugfix for g3d viewer and updated wxwidgets 2014-11-28 23:35:35 -08:00
SoftCoder 126ed18589 - bugfix selection circle and healthbar rendering 2014-11-28 20:49:04 -08:00
SoftCoder 8e7dfbd43a Merge branch 'develop' of github-softcoder-megaglest:MegaGlest/megaglest-source into develop 2014-11-28 20:45:40 -08:00
SoftCoder e27c44bb8f - bugfix of selection circle and healthbar ratio value 2014-11-28 20:45:07 -08:00
SoftCoder 645778a490 - added new files to vc2012 project 2014-11-28 20:05:33 -08:00
SoftCoder ceca2fc5aa - more fixes from cppcheck 2014-11-28 18:19:40 -08:00
SoftCoder a656a64830 - corrected some uninitialized vars identified by cppcheck 2014-11-28 16:53:30 -08:00
SoftCoder d0cdea1a6d Merge branch 'develop' of github-softcoder-megaglest:MegaGlest/megaglest-source into develop 2014-11-28 16:23:14 -08:00
SoftCoder ec0d9a7cd5 - bugfix to properly set defaults for particles 2014-11-28 16:22:29 -08:00
titiger bb62a998cd render healthbars after particles to make them more visible 2014-11-28 23:52:56 +01:00
titiger a37e7b398e blend mode set to normal after particle rendering 2014-11-28 23:52:13 +01:00
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