034b6066be
Merge branch 'develop' of github.com:MegaGlest/megaglest-source into feature/hp-bars
2014-10-28 22:05:04 +01:00
6507e27fda
hopefully smoth switching when connected to headless servers.
2014-10-28 21:52:10 +01:00
2bfe4a0b0f
Merge branch 'develop' of github.com:MegaGlest/megaglest-source into feature/hp-bars
2014-10-27 23:24:20 +01:00
a2790bd9cb
Make them actually usable.
...
added ep bars.
Of course its not finished yet
2014-10-27 16:16:50 +01:00
20a8011a46
first hp-bars
2014-10-26 21:34:14 +01:00
1724fddb65
Merge remote-tracking branch 'upstream/develop' into develop
2014-10-16 21:16:49 +00:00
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
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
e39fb8e8e4
trying to fix windows build
2014-09-29 02:55:15 +02:00
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
6ebe0a197c
whatever caused this code duplication ....
2014-09-29 01:47:00 +02:00
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
9988ea9cbf
resolved conflicts to upstream/develop
2014-09-27 11:19:29 +00:00
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
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
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
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
2f00143782
cleanup all particle systems when morphing
...
https://forum.megaglest.org/index.php?topic=9561.0
2014-09-22 02:58:47 +02:00
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
a084686ce9
fixed a merge conflict
2014-08-10 00:15:23 +02:00
cf5da4d2b3
fixed lua function getUnitName; added new lua function getUnitDisplayName
2014-08-09 00:48:04 +02:00
e5d2bbbf9e
Merge pull request #23 from titison/feature/unit_control
...
non commandable units
2014-08-08 01:22:51 +02:00
ad5e978be9
Merge pull request #20 from MikeHoffert/documentation
...
Documentation is always a good thing
2014-08-08 01:20:47 +02:00
850a9a7dc0
-AI can't command non-commandable units anymore
...
-Removed non-selectable
2014-08-07 21:00:27 +02:00
bf5125f1c6
Merge pull request #24 from titison/feature/particle-speedUp
...
Feature/particle speed up
2014-08-06 22:21:02 +02:00
791f42874a
Bugfix for spawn attack. Too many checks were removed with last checkin.
2014-08-02 23:27:45 +02:00
c2dcda0969
Merge pull request #22 from titison/feature/spawnattack_at_enemy
...
Feature/spawnattack at enemy
2014-07-28 23:20:58 +02:00
f66fd92a64
hitsound was accidently mandatory, but it is not.
2014-07-28 23:18:52 +02:00
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
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
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
4c51677a9d
Accidently doubled the gravity ^^
2014-07-26 14:03:54 +02:00
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
731597ff4e
Fix animationbound-particles
2014-07-23 21:24:43 +02:00
a51ae28018
windows does not know uint out of the box
2014-07-23 02:33:10 +02:00
082f3472ee
Looting
2014-07-22 23:53:45 +02:00
af634f24e8
Merge remote-tracking branch 'origin/pr/17' into pullrequest17
2014-07-22 23:24:49 +02:00
fbde1e69a3
Fixed bad names
2014-07-22 15:23:05 -06:00
a510150ef5
Merge remote-tracking branch 'origin/pr/17' into pullrequest17
2014-07-22 23:08:52 +02:00
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
62b147b2ee
Merge remote-tracking branch 'origin/pr/17' into pullrequest17
2014-07-22 21:28:10 +02:00
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
d6668b7e85
No more warnings for undocumented code
2014-07-21 21:01:15 -06:00
d2ad51613e
Documented most of upgrade.h
2014-07-20 23:03:36 -06:00
bcc75b16d3
Doxygen now outputs private, static, etc
2014-07-20 23:02:56 -06:00
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
5243a30b8b
Documented most of upgrade_type
2014-07-20 12:32:18 -06:00
69e95eef7f
Added Doxygen support
...
Output folder is ignored by Git
2014-07-20 11:07:51 -06:00
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
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
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
b9eb74d916
Percentages were wrong way around
2014-07-19 19:12:34 -06:00
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
9883bf7656
Merge branch 'feature-starting-vals' into feature-looting
2014-07-19 19:00:08 -06:00
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
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
cedb20646e
Fixed compilation error
...
Failed to override ==
2014-07-19 17:43:27 -06:00
75eb5c8ddf
Lootable resources now checks for dups
2014-07-19 16:52:53 -06:00
3cae2559c7
No looting if you attack units in same faction
2014-07-19 16:44:11 -06:00
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
df0d7aaac9
Implemented rest of resource amount/loss attrs
2014-07-19 16:13:09 -06:00
23deb957a7
First, basic looting implementation
...
Only absolute values are obtained for now, no loss.
2014-07-19 15:37:59 -06:00
26bab8548c
Splash was broken and destructor needs to cleanup more
2014-07-19 20:26:45 +02:00
666333b4a1
new style projectiles must have a particle system
2014-07-19 19:29:41 +02:00
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
762f09ab43
multishot with multi sounds and possible camerashake on projectile impact.
...
Still work in progress!
2014-07-19 18:50:47 +02:00
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
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
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
b72f4857d7
multi projectiles with different timings and particle systems
2014-07-18 01:04:36 +02:00
c081862070
use a bool instead of a (unused) pointer.
2014-07-11 00:26:16 +02:00
dff810a5b1
multishot with more than one attack particle system
2014-07-10 23:34:39 +02:00
a5e8e6df02
testing version of multiple projectiles
2014-07-09 19:59:09 +02:00
202fcd7cad
fixed an unimported copy&paste tag :) had no influence afaik but still
...
better like this
2014-06-18 22:50:07 +02:00
04d2664b06
optional start-ep tag implemented
2014-06-18 22:00:50 +02:00
cac1cc3e6e
Disabled button in lobby which holds players name.
2014-05-23 22:43:36 +02:00
4a3875c114
All paths to flags probably are fixed now. & Removed 2 old scripts related with svn.
2014-03-27 20:26:01 +01:00
fdd5eb52fe
Removed masterserver's code (separation from the source).
2014-03-27 20:12:04 +01:00
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
a737bcde3c
- fixed hard coded paths to use derived data fodler
2014-02-07 16:37:55 -08:00
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
6c7e0cdbce
- added more streflop unit tests
2014-02-07 15:09:50 -08:00
7ccc0f143f
- added more streflop tests to check xplatform compat
2014-02-07 14:32:58 -08:00
754bfcf2a0
- try updated micro test
2014-02-07 14:15:55 -08:00
f2396dfa4d
Merge branch 'master' of github-softcoder-megaglest:MegaGlest/megaglest-source
2014-02-07 13:55:52 -08:00
c691bcb9ed
- check to see if this new unit test passes on windows?
2014-02-07 13:55:26 -08:00
fe25767b1c
- updated asm code to only compile when x64 mode enabled
2014-02-06 21:39:54 -08:00
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
2ed1c2ae2b
- attempt to see if this win64 asm is more reliable for streflop
2014-02-06 17:03:15 -08:00
d2f321a2df
- attempt to bugfix win64 stability
2014-02-05 11:29:21 -08:00
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
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
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
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
20789087d9
- bugfix for streflop_test on windows
2014-02-01 11:25:01 -08:00
4310ebc6d4
- added missing unti testfile
2014-02-01 10:36:31 -08:00
c7a2040fdc
- added more verbose info when tracking network CRC
2014-02-01 10:27:11 -08:00
78ed6d4601
- attempt to add streflop to win64 build
...
- CRAZY attempt to add x64 (win64) support to streflop via some new asm code!
2014-02-01 01:28:30 -08:00
51f4b6d0db
Merge branch 'master' of github-softcoder-megaglest:MegaGlest/megaglest-source
2014-01-30 17:45:51 -08:00
c5a938e31b
- modify about screen to show copyright for Glest Team till 2010
2014-01-30 17:45:24 -08:00
7dd40cd1be
more git ignores for Windows
2014-01-30 23:43:26 +01:00
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
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
4ba68576aa
- bugfix for loading textures for gpl and startup model pics
2014-01-29 20:42:59 -08:00
02fa995ce3
- bugfix when loading last game settings to retain player name
2014-01-29 20:26:25 -08:00
5a48eb0b8a
- bugfix for clang
2014-01-27 20:14:06 -08:00
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
cce3beb939
- cleanup code from cppcheck report
2014-01-27 19:03:52 -08:00
39696b6a65
- added ability to share resources across same teams
2014-01-27 18:55:08 -08:00
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
e63b3d7499
- added support for team unit sharing
2014-01-27 14:15:05 -08:00
338f156a95
- changing version to v3.10.0-dev for new development
2014-01-27 11:21:22 -08:00
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
aa5403d8ef
Merge remote branch 'upstream/master'.
...
Conflicts:
mk/linux/.gitignore
mk/windoze/coverity-scan.bat
2014-01-27 08:23:42 +01:00
33bb424802
- ensure we get a newline after doing a version check when streflop disabled
2014-01-26 19:39:50 -08:00
dfb6c130ca
- additional bugfix when restoring last game settings
2014-01-26 19:22:27 -08:00
d1d6fb2eb1
- added validation for platform for internet games
2014-01-26 18:12:19 -08:00
ef8776efbb
Only platform is displayed in server table
2014-01-26 21:29:35 +01:00
8ec938a940
Merge remote branch 'upstream/master'. Resolved conflicts in: mk/windoze/coverity-scan.bat
2014-01-26 09:46:53 +01:00
d7f5164fd1
- missed a few other refs to xerces in cmake scripts
2014-01-25 18:27:08 -08:00
9cb0ba8833
- xerces included only if forced in cmake since it will be deprecated
2014-01-25 18:12:53 -08:00
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
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
ea7b088919
Conversion of files (windows OS specific) from LF to CRLF. Removed 3 ignored files.
2014-01-25 21:52:02 +01:00
3b8e350b4b
The documentation's files format will be more friendly for the average Windows OS user.
2014-01-25 20:29:49 +01:00
bbfbc6af0e
- Fix reload game to not replace human players
2014-01-25 10:07:15 -08:00
32f0e2cbea
- attempt to fix reload game to not replace playernames
2014-01-24 23:50:32 -08:00
0d8b3d6c63
- updated so masterserver url does not require trailing / in ini
2014-01-24 18:20:01 -08:00
fe808556bd
- added more fields for dev path support.. onlu ico files for linxu left to fix
2014-01-24 17:51:06 -08:00
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
1cacb0df27
- missed some updates
2014-01-24 09:50:17 -08:00
0b86e1c2d5
- fixed paths for editor and model viewer camek install
2014-01-22 10:10:31 -08:00
92daccf963
- cleanup of cmake scripts and proper organizing of files
2014-01-21 23:21:56 -08:00
9170d9c400
- added clang detection in binary version output
2014-01-21 17:06:10 -08:00
85e659219b
- small cppcheck code cleanup
2014-01-18 16:49:31 -08:00
d2284bbd36
- bug fix when changing language and showing hint button on game load
2014-01-18 16:31:01 -08:00
0807d490ad
Merge branch 'master' of https://github.com/MegaGlest/megaglest-source
2014-01-18 17:16:44 -06:00
2ebe218514
Bug fixes and updates for desktop notifications.
2014-01-18 17:15:05 -06:00
4583b8d4bc
- bugfix for windows compile error for new particle feature from titi
2014-01-17 20:10:18 -08:00
4bada8fc5a
- updating game version to 3.9.1 in preparation for release
2014-01-17 19:37:25 -08:00
6d15d66795
newest blender exporter from Yggdrasil (thanks!!) . Works with blender 2.69 and later and fixes a serious bug with normals and too many exported vertices.
2014-01-17 23:14:40 +01:00
27316e8912
- added time to error console output log items
2014-01-17 13:32:42 -08:00
6439d98146
- do NOT pause for lagging clients if game network setting set to false
2014-01-17 11:32:21 -08:00
b0fc9597e3
- fixed some bugs reported by coverity
2014-01-17 09:53:19 -08:00
0de4f33923
- error output now shows system time
2014-01-17 09:46:31 -08:00
e5c4abffa5
Merge branch 'master' of github-softcoder-megaglest:MegaGlest/megaglest-source
2014-01-17 07:56:57 -08:00
728dd3aea7
- added mutex guards in client connected menu to try to fix thread race bugs
2014-01-17 07:56:14 -08:00
d4ef639e9b
Change default MySQL database server to 'localhost' to prevent issues with Unix socket connections
2014-01-17 10:45:22 +01:00
5c484ff9d6
Script properly updates play date, not build date
...
Also fixed comments referring to build date.
2014-01-16 15:30:33 -06:00
a90ded6a00
Improved DOM handling of auto-refresher
...
Table and usage list are now identified by unique IDs, making
future modifications safer.
2014-01-16 15:20:49 -06:00
61c4d6875e
No desktop notification for empty headless servers
...
Also added fixes as suggested by JSHint (consistent indentation,
multi-line statements have the operator at the end of the line,
favouring strict comparisons).
2014-01-16 15:13:03 -06:00
5606c45821
showPlayers.php now with total time played
2014-01-16 01:40:28 +01:00
93d98e3625
first visible playerstats.
...
+ server list shows date of game instead of build date
2014-01-15 01:48:41 +01:00
fc0e479d56
* Move masterserver docs to docs/ subdirectory
...
* Update copyright period to 2014
* Remove Debian specific license hints since: <pabs> that isn't necessary in any file except the Debian copyright file
2014-01-14 16:32:38 +01:00
2c7d464abc
- remove console output for pbo's
2014-01-12 09:59:08 -08:00
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
9ea0debc51
CameraMoveSpeed can be modified
2014-01-11 15:53:53 +01:00
41553cc679
dumb bug writing mesh bound particle warnings all the time, even if not needed
2014-01-08 22:24:11 +01:00
0bf6d94d3e
Merge branch 'master' of github-softcoder-megaglest:MegaGlest/megaglest-source
2014-01-08 12:49:25 -08:00
7d8af94a44
- attempt to fix null pointer segfault on masterserver found by tomreyn
2014-01-08 12:48:56 -08:00
aee2417ce1
Additional warning for modders to find problems with mesh bound particles.
2014-01-05 23:57:29 +01:00
2cb45f876f
no click on buttons while preview map is in zoomed state
2014-01-05 23:56:45 +01:00
ba1d03118e
unit particles can be bound to first vertice of meshes ( <meshName value="part1.001" /> )
2014-01-04 18:40:00 +01:00
37494a9c37
- added new LUA method getFactionPlayerType
2014-01-04 09:34:49 -08:00
2badd13fd3
Merge branch 'master' of github-softcoder-megaglest:MegaGlest/megaglest-source
2014-01-03 15:10:59 -08:00
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
29f5881ded
Just render zoomed map preview and nothing else.
2014-01-03 19:19:10 +01:00
58faecb5d5
- bugfix for datapath
2014-01-03 10:15:30 -08:00
85319b30fc
- fixup use of --data-path param
2014-01-03 08:01:33 -08:00
2b9326197a
- added verbose debug info for data paths scanning
2014-01-03 07:28:31 -08:00
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
5f1e67ec9b
- updated network throttle check to output nothing if we cannot open the reg key (likely because it does not exist and does not apply)
...
- updated libvlc use in windows to use 2.1.2
2014-01-01 14:58:14 -08:00
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
7643c2b591
- changed registry branch to hkey local machine for packet throttle
2014-01-01 11:23:51 -08:00
02cb5c235d
- bugfix to compile in msvc
2014-01-01 11:08:51 -08:00
676a6071fa
- attempt to disable packet throttling on windows
...
- added some network packet debug code
2014-01-01 10:59:55 -08:00
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
b109b26664
- attempt to add crude thread state tracking in thread class and force thread to die if it appears to be stuck (and output to console)
2013-12-30 21:23:49 -08:00
e0aa65402d
- added ability to force the LUA version to compile with (5.1 or 5.2)
2013-12-30 18:30:23 -08:00
8742d36a06
- do not save empty lua tables
2013-12-30 17:12:49 -08:00
5613b0739e
- added more lua debug info
2013-12-30 14:00:04 -08:00
853d531d11
- added two new lua methods basxto:
...
storeSaveGameData(name, value)
string loadSaveGameData(name)
2013-12-30 12:55:59 -08:00
2c788e074a
- fix auto loading scenario from commandline
2013-12-30 12:19:10 -08:00
c7c82b56e1
- a little cleanup of building with lua and CMAKE
...
- added ability to force building without static libs in build script: -d=1
- added --lua-debug commandline option
2013-12-30 11:02:43 -08:00
5c90b9148c
- bugfix for saving / loading booleans in a lua table
2013-12-30 09:28:25 -08:00
97d11a9cfd
- script manager detected errors don't try to translate the error
2013-12-30 08:17:05 -08:00
5b445ad388
- removed stack trace from script manager methods that create known errors to make error message smaller.
2013-12-30 07:57:51 -08:00
329805ac30
Merge branch 'master' of github.com:MegaGlest/megaglest-source
2013-12-30 16:20:03 +01:00
11eeed59a1
new attribute "render-size" in unit-type
2013-12-30 16:19:08 +01:00
fda53f47d1
- bugfix for loading scenarios with their own techs
...
- all scenario errors are now caught and shown in a messagebox and game can continue.
2013-12-30 02:01:47 -08:00
b6cd751250
- bugfixes on windows platform when some folders and files are missing, do not crash hard.
2013-12-27 23:05:20 -08:00
163a5a173a
- bugfix when user has no sound device
2013-12-27 22:32:58 -08:00
c442328b58
- small bugfix for lazy loading textures
2013-12-27 22:08:51 -08:00
62821793c0
- moved core game data asset loading into lazy load methods to try to improve the startup speed of megaglest.
2013-12-27 22:00:29 -08:00
533b1f0bfe
Merge branch 'master' of github-tomreyn-megaglest:MegaGlest/megaglest-source
2013-12-26 18:29:35 +01:00
9c51bfc60c
introduce shared linux shell code / externalize distribution check
2013-12-26 18:28:21 +01:00
220a0130dd
- bugfixes for msvc compile
2013-12-25 11:48:08 -08:00
3bb9da6cdf
- removed directsound related references as it has been deprecated since 3.6.0.1
...
- coverity related fixes
2013-12-25 11:42:00 -08:00
f06d474b60
- cleanup some socket issues and also a possible int overflow
2013-12-24 22:44:46 -08:00
3111b733e2
- bugfix for chrono class calcs causing group camera recall to fail (And numerous other problems)
...
- added better tracking of mutexes by assigning them location info
2013-12-24 22:27:44 -08:00
25326c64b1
- cleanup some warnings from msvc
2013-12-23 10:34:52 -08:00
1ba098d0f0
- clang compiler warning cleanup
2013-12-23 00:05:07 -08:00
e0c2a388d4
- msvc compiler warning cleanup
2013-12-22 23:58:12 -08:00
bcaad53fbe
- cleanup some msvc++ compiler warnings
2013-12-22 23:15:31 -08:00
3a24531ba7
- more code cleanup based on cppcheck results and valgrind
...
- added -h option to build-mg.sh to show parameter usage.
2013-12-22 22:53:26 -08:00
2d3e04f413
- a few more minor code quality fixes
2013-12-22 21:03:40 -08:00
da3c55c00b
- bugfix, now support proper saving and reloading of games where attack boost is applied to units
2013-12-22 16:10:00 -08:00
6cd1d237ab
- a little more code cleanup from coverity issues
2013-12-22 13:18:40 -08:00
f8c497f6dc
- in progress work to try to get attack boosts loading from a saved game (not working yet and commented out)
2013-12-21 21:53:27 -08:00
372442d181
Render order changed to get better render results with units using
...
semi-transparent textures.
2013-12-22 01:36:54 +01:00
343a728911
- cleanup some network related code and try to remove uneeded noise
2013-12-18 23:35:27 -08:00
9249d6370c
looks like glEnable(GL_COLOR_MATERIAL); was still needed to render units properly
2013-12-18 21:35:04 +01:00
39be9372aa
Make showGameStats.php produce HTML which is suitable for embedding into an existing DOM
2013-12-18 20:40:08 +01:00
998cabafac
- a few more coverity reported fixes
2013-12-18 08:26:16 -08:00
606aa392c7
- added coverity linux script
...
- a few updates to fix coverity reported issues
2013-12-17 23:57:45 -08:00
e3996ceb92
- bugfixes for coverity reported issues
...
- new bash parameters for build-mg.sh (in prep for coverity automation)
- updated travis build to use new bash param
2013-12-17 17:35:51 -08:00
d8160c1065
- modified game time to be game duration instead as that is more useful for players who want to see in game clock info
2013-12-17 13:26:58 -08:00
a56eb83c91
- moved map path into config class
...
- proper render performance calc compare
2013-12-16 23:54:33 -08:00
ca12b7912a
- cleanup clang warning
2013-12-16 19:25:07 -08:00
b5243763a2
- added some device cleanup in case its needed
2013-12-16 19:11:17 -08:00
1463dc0fc1
- bugfix for memory leak
2013-12-16 17:48:52 -08:00
d1f9fbc4a7
- cleanup warnings from clang
2013-12-15 09:19:24 -08:00
0b73d3922a
- fixed windows build from coverity updates
2013-12-14 22:59:32 -08:00
f269273f07
- round #2 of coverity bug fixes
2013-12-14 22:37:15 -08:00
b8ab732b85
- cppcheck code cleanup
2013-12-14 18:07:22 -08:00
87f855b419
Very transparent parts of textures were cutted away while rendering. It turned out there is only a need to do this for shadows and selection rendering, not for real rendering.
2013-12-15 00:12:25 +01:00
6e061f459d
- cleanup a few newly introduced compile warnings
2013-12-14 10:49:01 -08:00
22beafe122
- fixed windows build for vc++ 2010
2013-12-14 03:09:12 -08:00
b11932b92d
- cleanup from cppcheck report
2013-12-14 03:03:19 -08:00
d69e19b87b
Merge branch 'master' of github-softcoder-megaglest:MegaGlest/megaglest-source
...
Conflicts:
source/shared_lib/include/platform/sdl/factory_repository.h
2013-12-14 02:45:25 -08:00
65e55d3796
- merged changes with windows build fixes
...
- updated svn commands to git for validation params
2013-12-14 02:44:41 -08:00
1d9f1f9432
- forgot to commit changes
2013-12-14 02:33:03 -08:00
ec13e904d3
- fixed windows build (removed gl2 references)
2013-12-14 02:29:32 -08:00
209458adee
- removed deprecated gl2 code as it was not used
2013-12-14 02:22:30 -08:00
b9d6b38e8f
- coverity based bug fixes - round #1
2013-12-13 23:04:12 -08:00
c887b0c357
- attempt to cleanup a few warnings
...
- attempt to get git rev info each compile (not just when running cmake)
2013-12-11 23:16:56 -08:00
c91b92901b
- added ignore folder
2013-12-11 19:18:33 -08:00
a567fe159d
- bugfix for headless mode segfault reported by titi
2013-12-11 19:07:24 -08:00
ad81692331
Merge branch 'master' of https://github.com/williame/megaglest-source
2013-12-09 18:07:42 -08:00
3bc5901a01
From Bugreport: cannot delete characters after clicking on player name in lobby
...
https://forum.megaglest.org/index.php?topic=9302.0
2013-12-10 01:52:08 +01:00
dcada00514
as there are already several changes to originla 3.9.0 we better set a new version number
2013-12-09 23:14:33 +01:00
e718f78931
- corrected compile warnings for unit test
2013-12-08 20:08:44 -08:00
2d6da27807
Merge branch 'master' of github.com:MegaGlest/megaglest-source
2013-12-07 20:41:44 +01:00
02d41bd5f7
fixed windows build
2013-12-06 09:08:47 -08:00
46a0dab916
moved model constructor always behind factory
2013-12-05 21:28:20 +01:00
6afadafa1e
Start to abstract model
2013-12-05 16:17:41 +01:00
6ae1d179bb
- updated for proper build on Mac
2013-12-04 14:54:02 -08:00
03c0197437
merge from upstream
2013-12-04 23:37:04 +01:00
e71e7104dc
Trying to build on OSX
2013-12-04 22:38:06 +01:00
f9e217df94
- bugfix so Mac builds
2013-12-04 13:34:00 -08:00
titison