666 Commits

Author SHA1 Message Date
mathusummut
284ee73af4 Fixed some coverity warnings 2018-09-05 15:31:59 +02:00
mathusummut
abe59d0d72 Merge branch 'develop' of https://github.com/ZetaGlest/zetaglest-source into develop 2018-09-03 12:50:04 +02:00
mathusummut
bbc97d02bb Buildings now can still be built if there are people in the way 2018-09-03 12:49:23 +02:00
andy5995
6e57f775aa fix more switch warnings 2018-09-02 21:11:55 -05:00
mathusummut
3646557a9f Fixed printf issue 2018-09-02 13:37:05 +02:00
mathusummut
886ededb3c [Test] Incorrect build command is now a warning instead of an error 2018-09-02 01:50:23 +02:00
mathusummut
913ab85c35 [Test] OOS is now a warning instead of an error 2018-09-01 16:20:21 +02:00
mathusummut
dfd4a658aa Test fix for LUA environment variables 2018-06-29 16:14:38 +02:00
mathusummut
e495bc10e0 Removed libglest warning 2018-06-22 23:34:33 +02:00
mathusummut
c15488a212 Full transparency support is now added 2018-06-21 19:57:44 +02:00
mathusummut
76d4c9e7a8 Now scenarios are customisable without breaking scripts 2018-06-11 16:06:48 +02:00
mathusummut
28636b07b9 Added getFactionName and translate LUA functions 2018-06-10 16:06:12 +02:00
mathusummut
1ea031b08e Added isBuilding and setUnitProperty functions to LUA 2018-05-14 01:38:48 +02:00
mathusummut
d1acd87423 Now Lua can be used in scripts tag in faction tag in XML 2018-05-06 12:45:25 +02:00
mathusummut
35b7b1f1a6 Fixed the god-awful indentation 2018-05-06 00:01:36 +02:00
mathusummut
7ace98f8e1 Renamed CPU-Mega to CPU-Zeta 2018-04-29 15:37:44 +02:00
Jammyjamjamman
01454a32e5
Resources can now be deposited at flying units, by land or air units. This fixes issue #100 . 2018-03-30 02:42:45 +01:00
Andy Alt
73aa999de7
add new function for playing sfx (#68)
(#63)
2018-02-22 10:02:04 -06:00
Andy Alt
a8255e5c97
[closes #13] enhanced observer mode additions and cleanup (#45)
* additions and cleanup [skip ci]

* disallow observers to change their faction and team [skip ci]

* disable observer slots from admin control

* when checkboxObserversAllowed is toggled, update correctly

* Also adjusted the labels better

* when scenario is checked, observer mode is disabled and extra slots are
closed

* attempted to add a feature that would allow the admin to change to a
different slot (doesn't work yet)

* graphics still needs some adjustment

* host can not go to a slot > mapInfo.maxPlayers
2018-02-05 16:01:29 -06:00
Andy Alt
c0251145f8 when scenario xml file not present, don't err (#43)
* when scenario xml file not present, don't err

For ZetaGlest/zetaglest-data#30

* remove 'else' clause
Accepted @andy5995 's scenario browser improvement (does not throw major error if scenario is malformed).
2018-02-01 23:51:46 +00:00
Jammyjamjamman
38de15878d Added comments to buildCommand in commander.cpp . Also slightly changed a comment in unit_updater.cpp. 2018-02-01 14:52:51 +00:00
andy5995
acedc2bf3c
restyle/reformat 4 files
reformatted before I work on them
2018-02-01 01:03:00 -06:00
Jammyjamjamman
25bdead5e5 Some extra comments added to code. [skip ci] 2018-01-28 12:56:44 +00:00
Jammyjamjamman
a8fe68c7a9 Fixed the typo I created in a comment. 2018-01-27 21:52:12 +00:00
Jammyjamjamman
2e1b197c23 Unit produce/ upgrade progress is now reset when completed or cancelled instead of when it starts (which fixes issue #30). 2018-01-27 21:08:08 +00:00
andy5995
31d91e8544
observers don't use a slot on maps [wip #13]
* This reverts part of 42541caab7d457d0c73f63ec6dc1e8816ceff704
* This fixes the bug from 42541caab7d457d0c73f63ec6dc1e8816ceff704
where if there 4 slots being used on a 4 player map, the game will crash
if an observer is in the 5th slot.
* The menu needs to be altered to accomodate the extra lines of text.
* There needs to be checks put in place so people in the extra slots can
only choose "observer" mode. If they choose a different faction, the
game will crash.
2018-01-24 02:40:44 -06:00
Andy Alt
42541caab7
[wip] change how observer mode works (#13) (#14)
The positioning of the labels and text will need changing. I'm going to
ask @jammyjamjamman if he'll fix it up all nice and pretty.

* [wip] change how observer mode works (#13)

* [wip] opens 10 slots on any map [observer mode]

* [wip]set start location for observers [skip ci]

* [wip] new observer mode works with no crashing

I need to clean up the code more though. I only did the bare minimum to
change the way observer mode works.
2018-01-23 21:00:32 -06:00
SoftCoder
865a665bf0 - round 2 of cppcheck code cleanup 2017-10-09 20:21:14 -07:00
SoftCoder
26581a77d2 - first round of cleanup from cppcheck report 2017-10-09 19:09:36 -07:00
SoftCoder
b1d6c73774 - attempt to fix Issue #150 2017-02-12 16:35:29 -08:00
titiger
f3c436b67f force playing important sounds
see issue #144
2017-02-02 02:54:29 +01:00
titiger
9cc5a7566a revert some changes which were meant for debugging only 2017-02-01 23:58:00 +01:00
titiger
d038a376ae fixing a bug with spawn attack 2017-02-01 23:44:28 +01:00
titiger
28bcf81626 Error handling 2016-11-30 22:33:41 +01:00
titiger
374634b630 spawn units on death
as requested here https://forum.megaglest.org/index.php?topic=9879.0
2016-11-20 16:19:53 +01:00
SoftCoder
102ca8f651 - Fixed issue# 135 2016-10-31 13:56:33 -07:00
SoftCoder
56494f3cd2 - finally fixing issue #102 (bad cell visible handling when fog of war turned off) 2016-05-27 16:15:27 -07:00
filux
bcb8d197d3 fixed some typos [ci skip]
https://lintian.debian.org/full/pkg-games-devel@lists.alioth.debian.org.html#megaglest
2016-02-19 21:17:31 +01:00
titison
b3449e59be shared Team Options in scenarios
little fix with printf which weren't used anyway
2015-01-18 19:40:30 +01:00
titison
848b84f149 shared team options in scenarios
now you can enable sharedTeamUnits and sharedTeamResources in scenarios

to do so use this two xml tags:
	<shared-team-units value="false"/>
	<shared-team-resources value="false"/>
put them in the <scenario> node
2015-01-18 19:40:30 +01:00
titiger
7006c26707 morph takes cellmaps into account ( needed for prax next ) 2015-01-14 22:58:19 +01:00
titiger
e4c2683e1d fixed missing food for shared resource games on startup
To claculate limitResourcesToStore() we need to first load all factions. 
Else we get wrong results for  limitResourcesToStore(), and by this sometimes 
no food on startup, depending on the setup.
2015-01-12 01:46:12 +01:00
titiger
bceb4286f8 render only resources of selected faction
When playing with shared team units but not with shared resources, only  
the resources of the selected faction is shown now. With shared resources all
resources of the team are shown like before.

Rendering ressources with two lines stays like before showing all resources  in
team mode!
2015-01-10 22:49:31 +01:00
titison
00d367b725 Resource Storage calculated on team basis
fixing a debt-bug with sharedResources:
https://forum.megaglest.org/index.php?topic=9616.0
2015-01-02 02:45:44 +01:00
SoftCoder
efa7cb0346 - bugfix for shared team resources
- added some new internal feature code to test auto updates for a future release
2014-12-30 12:16:35 -08:00
SoftCoder
92a113ddfa - missed a few places where we should use total upgrade sight 2014-12-21 20:27:21 -08: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
titiger
d34e58ccb6 fix for too often applied boosts 2014-12-19 22:48:07 +01:00
SoftCoder
8210485a42 - a few bugfixes related to coverity scan 2014-12-15 19:44:26 -08:00