Commit Graph

5040 Commits

Author SHA1 Message Date
Tom Reynolds
e2b6ec5797 Merge branch 'release/3.11.0' 2015-01-21 22:05:48 +01:00
titiger
624c9af7f8 updated configuration for nko language 2015-01-21 20:28:42 +01:00
titiger
ff77ae6491 updated language files 2015-01-21 00:12:02 +01:00
titiger
30a8667307 version set to 3.11.0 2015-01-20 23:10:36 +01:00
titiger
49bde874fc linux installer tests 2015-01-20 00:51:57 +01:00
titiger
7a34b3ea20 linux script to build windows installer 2015-01-20 00:51:31 +01:00
titiger
1a9c48fd3c windows installer without ebanner
ebanner has unclear license and you always had to install it. 
The AccessControl pugin is now added, so it gets much more easy to
create windows installers on linux.
2015-01-20 00:24:07 +01:00
titiger
4c7192e9ff Merge pull request #47 from titison/feature/sharedTeamOptionsInScenarios
Feature/shared team options in scenarios
2015-01-18 21:03:24 +01:00
titison
44783a4108 shared Team Units and Resources
set the checkBoxes to editable when scenarioCheckBox is disabled
2015-01-18 19:40:30 +01:00
titison
c5c177a82c shared Team Units and Resources
set the checkBoxes to non-editable when scenarioCheckBox is enabled
2015-01-18 19:40:30 +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
0616483452 faster Particlesystem
removed a useless validation call which was pretty expensive for many 
particle systems alive
It checked for existance of particle system in the vector we were curretnly 
cycling through.
2015-01-17 15:14:38 +01:00
titiger
9e929481c8 Merge branch 'develop' of github.com:MegaGlest/megaglest-source into develop 2015-01-17 00:07:32 +01:00
titiger
667b043393 Replace resource storage when morphing a unit instead of adding it.
"replace-storage" switch from morph command is removed too,
as it was not used and is quite useless now.
https://forum.megaglest.org/index.php?topic=9244.0
2015-01-17 00:06:17 +01:00
Tom Reynolds
d3d0fbf9bf lossless images compression
keeping file formats, comments + EXIV meta data intact
2015-01-14 23:58:30 +01:00
titiger
7006c26707 morph takes cellmaps into account ( needed for prax next ) 2015-01-14 22:58:19 +01:00
titiger
8284b3ecde Fix for launching network Scenarios
The client had to complete some game settings locally like path and so on.
2015-01-13 21:36:24 +01:00
titiger
3f96679535 Merge pull request #45 from titison/fix/resourcesNotDisplayed
Fix: No Resources in Gui when loading savegame with  shared team resources
2015-01-13 20:36:57 +01:00
titison
3875b80334 Fix: No Resources in Gui when loading savegame with shared team resources
See: https://forum.megaglest.org/index.php?topic=9641.0
2015-01-13 18:51:32 +01:00
titiger
a7b376a700 ensure error message box is completly visible on screen 2015-01-12 21:21:42 +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
cd7c367827 units which hide behind buildings can be selected again
Thats for color picking. I clear depth buffer after rendering buildings.
2015-01-12 00:23:08 +01:00
titiger
fdc71786b2 fixed highlight rendering on minimap 2015-01-11 21:46:37 +01:00
titiger
bd61e9ea37 FilterMaxAnisotropy in game graphics options 2015-01-11 19:13:06 +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
titiger
73063ac494 In GUI only render one resource set in team mode
This behaviour can be switched using the "TwoLineTeamResourceRendering"
in glest.ini ( or glestuser.ini ).

Reasons for the change:
- For team playing only one resource set really matters in the GUI.
- Two lines break many HUDs too. 
- The gui itself is too crowded with two sets of resources.


Triangle in teamcolor  is always shown now in front of resources.
2015-01-10 04:03:58 +01:00
titiger
fa3a4439dc return had value in function void 2015-01-10 00:51:19 +01:00
titiger
53fc464c30 Merge branch 'depthbuffer' into develop 2015-01-10 00:06:36 +01:00
titiger
9fb8cf2fd5 Merge pull request #44 from titison/sharedResourceFix2
Resource Storage calculated on team basis
2015-01-10 00:04:30 +01:00
titison
70248095e6 fix 2015-01-09 23:31:30 +01:00
titiger
ab02478096 enabled depth_test for colorpicking
To do it many changes were needed, because mouse position on map was 
calculated using the depth buffer with current rendering state
2015-01-04 14:38:32 +01:00
titiger
04c590ce7e new maps 2015-01-04 01:04:58 +01:00
titiger
4e0c96adae no need to render dead units when selecting 2015-01-03 22:24:21 +01:00
titiger
109a5b9985 sort map lists non case sensitive in menu 2015-01-03 02:03:31 +01:00
titison
ce23353138 Fix
this was really dump. i edited some if-statements and didn't recognize that
building didn't work.
2015-01-02 16:26:24 +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
titiger
f4529566fa bugfix for version checking
We can  have versions with only one dot.
2015-01-02 01:24:45 +01:00
titiger
7680372c89 new maps 2015-01-01 17:17:31 +01:00
titiger
4a292ed1d1 don't mix functionality
Not a bug fix, just trying to keep things more clean.
2015-01-01 17:16:24 +01:00
SoftCoder
51c67cc7ff - make app update work in windows 2014-12-30 22:09:53 -08:00
SoftCoder
f76fe55153 - more updates for updating version on windows 2014-12-30 21:40:51 -08:00
SoftCoder
d13118ecf8 - attempt to make updates work for windows 2014-12-30 15:05:24 -08: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
titiger
bcd6c7b310 the headless server has no need to handle unit boost particles 2014-12-30 20:34:05 +01:00
SoftCoder
172dfe3411 - update a few scripts to exclude cegui data 2014-12-29 17:23:20 -08:00
titiger
74e522b2f8 "v" was too much in the version string 2014-12-26 21:58:07 +01:00
titiger
11b766b5bc v3.11-beta2.0 2014-12-26 21:33:54 +01:00
titiger
00ac0219e0 Added more changes to CHANGELOG.txt 2014-12-26 21:22:34 +01:00
titiger
46f4f0fac5 some data changes 2014-12-26 21:08:12 +01:00