Commit Graph

3269 Commits

Author SHA1 Message Date
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
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
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
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
SoftCoder a737bcde3c - fixed hard coded paths to use derived data fodler 2014-02-07 16:37:55 -08:00
SoftCoder c691bcb9ed - check to see if this new unit test passes on windows? 2014-02-07 13:55:26 -08:00
SoftCoder b1cafabb01 - added cmake compile warning when users uses clang as clang currently does NOT support some critical GCC settings we require. 2014-02-06 19:14:14 -08:00
titiger 70e01d5e0b lua commands to shake the cam
-- camera-distance-affected=false
shakeCamera(int shakeIntensity, int shakeDuration) 

-- camera-distance-affected=true
shakeCameraOnUnit(int shakeIntensity, int shakeDuration , int UnitId)
2014-02-04 21:21:06 +01:00
titiger 341c7ce46f Shake without effecting the real camera pos
The camera shake effect does not manipulate the real camera pos anymore, 
just the Opengl campos is effected by it. By this all camera pos related caches 
don't need to refresh just beause the camera shakes.
2014-02-04 21:14:52 +01:00
SoftCoder 50bdd2039e - changed command speed change to only change speed min every 160 frames or more as required. 2014-02-01 22:33:59 -08:00
titiger 98234228d9 shake it baby ( camera shake effects )
Camera shake effects can be added via xml skill definitions.
2014-02-01 23:15:44 +01:00
SoftCoder c7a2040fdc - added more verbose info when tracking network CRC 2014-02-01 10:27:11 -08:00
SoftCoder c5a938e31b - modify about screen to show copyright for Glest Team till 2010 2014-01-30 17:45:24 -08:00
SoftCoder b4807ed169 - in team mode always render two set of resources:
- First set of resources is the team of selected units
  - SEcond set of resources is the team total
2014-01-29 22:47:55 -08:00
SoftCoder ce375073c1 - show team color asterisk in front of resources when displaying resources for an individual team member 2014-01-29 21:13:39 -08:00
SoftCoder 4ba68576aa - bugfix for loading textures for gpl and startup model pics 2014-01-29 20:42:59 -08:00
SoftCoder 02fa995ce3 - bugfix when loading last game settings to retain player name 2014-01-29 20:26:25 -08:00
SoftCoder 7cae2b53f1 - bugfix for windows processing var tags in ini files (was crashing on windows when using the new glest-dev.ini) 2014-01-27 20:12:14 -08:00
SoftCoder cce3beb939 - cleanup code from cppcheck report 2014-01-27 19:03:52 -08:00
SoftCoder 39696b6a65 - added ability to share resources across same teams 2014-01-27 18:55:08 -08:00
SoftCoder e33024c102 - For team shared unit mode, player does not lose unless all team members have no castle 2014-01-27 14:58:52 -08:00
SoftCoder e63b3d7499 - added support for team unit sharing 2014-01-27 14:15:05 -08:00
SoftCoder 338f156a95 - changing version to v3.10.0-dev for new development 2014-01-27 11:21:22 -08:00
titiger d56069488f Let's see how good Mega-AI plays with real random when trying to find the enemy.
( the server must use this version to see an effect )
2014-01-27 19:23:31 +01:00
SoftCoder 33bb424802 - ensure we get a newline after doing a version check when streflop disabled 2014-01-26 19:39:50 -08:00
SoftCoder dfb6c130ca - additional bugfix when restoring last game settings 2014-01-26 19:22:27 -08:00
SoftCoder d1d6fb2eb1 - added validation for platform for internet games 2014-01-26 18:12:19 -08:00
titiger ef8776efbb Only platform is displayed in server table 2014-01-26 21:29:35 +01:00
SoftCoder d7f5164fd1 - missed a few other refs to xerces in cmake scripts 2014-01-25 18:27:08 -08:00
SoftCoder 952004151c - removed d3d files which were deprecated long ago
- removed freetype-gl (the embedded library from code.google.com)
2014-01-25 17:54:46 -08:00
SoftCoder 08af18429d - stubbed out use of xerces as no code was using it any longer. Xerces is no longer a requirement to build, we have been using rapidxml for a long time now. For now the MACRO: WANT_XERCES will build Xerces support into th egame, but it is still not used. We will likely deprecate xerces from megaglest soon. 2014-01-25 17:09:52 -08:00
SoftCoder bbfbc6af0e - Fix reload game to not replace human players 2014-01-25 10:07:15 -08:00
SoftCoder 32f0e2cbea - attempt to fix reload game to not replace playernames 2014-01-24 23:50:32 -08:00
SoftCoder 0d8b3d6c63 - updated so masterserver url does not require trailing / in ini 2014-01-24 18:20:01 -08:00
SoftCoder fe808556bd - added more fields for dev path support.. onlu ico files for linxu left to fix 2014-01-24 17:51:06 -08:00
SoftCoder 581a975209 - added support for dev mode paths and removed linux symlinks for game data
- bugfix for segfault on headless when client disconnects
2014-01-24 13:44:21 -08:00
SoftCoder 1cacb0df27 - missed some updates 2014-01-24 09:50:17 -08:00
SoftCoder 92daccf963 - cleanup of cmake scripts and proper organizing of files 2014-01-21 23:21:56 -08:00
SoftCoder 9170d9c400 - added clang detection in binary version output 2014-01-21 17:06:10 -08:00
SoftCoder d2284bbd36 - bug fix when changing language and showing hint button on game load 2014-01-18 16:31:01 -08:00
SoftCoder 4bada8fc5a - updating game version to 3.9.1 in preparation for release 2014-01-17 19:37:25 -08:00
SoftCoder 6439d98146 - do NOT pause for lagging clients if game network setting set to false 2014-01-17 11:32:21 -08:00
SoftCoder b0fc9597e3 - fixed some bugs reported by coverity 2014-01-17 09:53:19 -08:00
SoftCoder 728dd3aea7 - added mutex guards in client connected menu to try to fix thread race bugs 2014-01-17 07:56:14 -08:00
SoftCoder 3425d4c248 - changed code to cleanup pixbuf allocation earlier to not confuse gDEbugger about an openGL memory leak. 2014-01-11 23:28:33 -08:00
titiger 9ea0debc51 CameraMoveSpeed can be modified 2014-01-11 15:53:53 +01:00
SoftCoder 0bf6d94d3e Merge branch 'master' of github-softcoder-megaglest:MegaGlest/megaglest-source 2014-01-08 12:49:25 -08:00
SoftCoder 7d8af94a44 - attempt to fix null pointer segfault on masterserver found by tomreyn 2014-01-08 12:48:56 -08:00
titiger 2cb45f876f no click on buttons while preview map is in zoomed state 2014-01-05 23:56:45 +01:00
titiger ba1d03118e unit particles can be bound to first vertice of meshes ( <meshName value="part1.001" /> ) 2014-01-04 18:40:00 +01:00
SoftCoder 37494a9c37 - added new LUA method getFactionPlayerType 2014-01-04 09:34:49 -08:00
SoftCoder 2badd13fd3 Merge branch 'master' of github-softcoder-megaglest:MegaGlest/megaglest-source 2014-01-03 15:10:59 -08:00
SoftCoder 9026ce161d - bugfixes when user has no internet and published not turned on, do not try to do UPNP. 2014-01-03 15:10:30 -08:00
titiger 29f5881ded Just render zoomed map preview and nothing else. 2014-01-03 19:19:10 +01:00
SoftCoder 58faecb5d5 - bugfix for datapath 2014-01-03 10:15:30 -08:00
SoftCoder 85319b30fc - fixup use of --data-path param 2014-01-03 08:01:33 -08:00
SoftCoder 2b9326197a - added verbose debug info for data paths scanning 2014-01-03 07:28:31 -08:00
SoftCoder ecdb229bdf - attempt to do better lag handling (pause game up to 3 times for lagging clients then disconnect) 2014-01-02 13:56:37 -08:00
SoftCoder 6f4c3ed033 - added reg file for windows users to manually disable packet throttling
- added console warning for windows users that have this setting enabled.
2014-01-01 13:24:24 -08:00
SoftCoder 676a6071fa - attempt to disable packet throttling on windows
- added some network packet debug code
2014-01-01 10:59:55 -08:00
SoftCoder 21a12a6c72 - added ability to render map preview full screen when user clicks on the map preview. Click anywhere on the fullscreen map to restore. 2013-12-30 23:32:06 -08:00
SoftCoder 5613b0739e - added more lua debug info 2013-12-30 14:00:04 -08:00
SoftCoder 853d531d11 - added two new lua methods basxto:
storeSaveGameData(name, value)
string loadSaveGameData(name)
2013-12-30 12:55:59 -08:00
SoftCoder 2c788e074a - fix auto loading scenario from commandline 2013-12-30 12:19:10 -08:00