Commit Graph

5078 Commits

Author SHA1 Message Date
filux f2b9a25198 support also for macos 2015-02-23 19:10:32 +01:00
filux 92b599a291 Merge pull request #58 from goetzk/buildable-package
Changes to make package build and run on osx
2015-02-17 22:35:19 +01:00
filux cf6036e34c Merge pull request #56 from goetzk/run-dos2unix
Run dos2unix on COPYRIGHT.source_code.txt
2015-02-17 22:33:42 +01:00
titiger 9b3d241c6c Merge pull request #59 from titison/fix/AttackBoostDesc
Fix AttackBoosts: Show Ep + Hp Regeneration in Desc
2015-02-16 21:09:22 +01:00
titison 404db00701 AttackBoosts: Show Ep + Hp Regeneration in Desc
Previously the Hp and Ep  regeneration was only shown if hp and ep
were also affected by the AttackBoost.
In addition I changed the way the  regeneration is shown:
Old: ->EP +10 [10]
New: ->EP +10 (Regeneration: +10)
2015-02-16 20:28:10 +01:00
Karl Goetz c21db67721 Changes to make package build and run on osx
MegaGlest is the correct spelling, the process of building a package upper
cases the binary so I'm removing my modification via an earlier branch.

This also sets CUSTOM_DATA_INSTALL_PATH to /Applications - this is the final
step in getting MegaGlest.app to launch after building and installing.

The previously hard coded path was ok for gnumake but failed when Xcode got
involved as it has build types (release/debug/et al) which the hard coding
didn't support. I've added an if/else catch for the two build types that i've
seen while working on megaglest and it should be trivial to add any others that
may be desirable.

There is still an outstanding issue of embedding dependencies or using system
provided dependancies which I haven't sorted out.
2015-02-15 18:33:56 +11:00
Karl Goetz 06bb4104dc Run dos2unix on COPYRIGHT.source_code.txt
COPYRIGHT.source_code.txt is inlined during the package building stage on OSX
when built using Xcode. To prevent it causing Rez to fail due to CRLF line
endings we unconditionally run dos2unix against the file during build. In the
cases where this wouldn't have caused a problem there is no regression and in
the cases where its necesary the file is fixed without manual intervention
2015-02-14 10:31:24 +11:00
titiger 82bc650372 fix windows build and --help output 2015-02-11 00:26:03 +01:00
titiger 4c5440f78c map editor has much more powerful random height function
You can give parameters now, to influence the map height calculation.
2015-02-10 02:06:02 +01:00
titiger b4fabc2717 map editor: new maps set player name as default author 2015-02-09 00:41:42 +01:00
titiger 17a412aa9a MegaGlest maps end with .mgm per default now.
As they are not really compatible with .gbm files anyway ( cliffs for example ),
we call maps *.mgm now per default. Its still possible to load *.gbm files
2015-02-09 00:30:43 +01:00
titiger 3c85b0fb25 forgot one place with default cell size 2015-02-09 00:28:32 +01:00
titiger 546d0112b4 Map editor starts with 8 players per default and uses a zoom of 5.
Maps without players crash the map editor on loading and make no sense anyway.
Zoom factor is set to 5 instead of 6 now, to ensure you see the full default 
map on startup
2015-02-08 23:32:05 +01:00
filux c453aa778b eliminated ugly icons from installer in linux's menu 2015-02-07 13:11:24 +01:00
titiger 615cac7138 Merge pull request #54 from filux/feature/new-version-management
changed version number management and same versioning for game, map-editor and g3dviewer
2015-02-02 22:37:04 +01:00
filux e324a8f75c updated version numbers 2015-02-02 22:23:22 +01:00
filux 7451e49213 mapeditor and g3dviever will have always same version number as game, also game and binary packages will have always same version 2015-02-02 22:20:57 +01:00
filux da33c43230 a bit more manual but also cleaner way of updating version number 2015-02-02 22:13:17 +01:00
titiger 17cc8a1589 better help text for map editor 2015-02-02 20:49:36 +01:00
titiger adb71b4add get rid of AccessControl.dll in repository
this is now downloaded on demand.
2015-02-02 00:17:05 +01:00
filux 8596f70479 updated readme file in relation to version number management 2015-02-01 23:41:09 +01:00
filux 5192c3f87f proposition of different version number management 2015-02-01 15:45:07 +01:00
filux 69e9dff754 better support for static build on debian 2015-01-31 11:53:59 +01:00
filux 5eeac92fb4 refreshed list of dependencies 2015-01-31 11:49:07 +01:00
filux 9977fd2606 fixed 'Not a git repository' bug related with real out of source build from the git repository 2015-01-31 10:30:19 +01:00
titiger 504dc7dfd8 no more false clicks on minimap
if minimap was displayed outside of map, it was not possible to give 
mouse click commands there.
2015-01-29 21:59:05 +01:00
titiger 9aff9842a4 camera start position shows main building in center. 2015-01-29 17:05:07 +01:00
titiger 9a25ca1ba3 nicer tilesets as default 2015-01-29 17:04:15 +01:00
titiger 2efa255ca3 no more double click in minimap
Double  click is no more handled when mousepointer is over minimap.
This often resulted in unselected units when commanding via minimap.
2015-01-29 11:42:13 +01:00
titiger 4d7e0c1f4d modcenter download should be available again in menu state connected. 2015-01-28 01:59:17 +01:00
titiger 3433eb5835 healthbar default set to "if needed" 2015-01-26 22:32:08 +01:00
titiger 791dd96f97 bad translation key for "Healthbar" fixed in options menu. 2015-01-25 20:01:29 +01:00
filux 045f171b9a linux's binary without glest-dev.ini 2015-01-25 12:57:12 +01:00
filux 652f482240 fixed #48, fixed #49
Source tarball: "fatal: Not a git repository" at each compilation step; CMake gets the version wrong in 3.11.0.
2015-01-25 09:01:23 +01:00
titiger 26fad480c6 lets see if this fixes the map editor trouble with 2.8.x wxwidget in linux 2015-01-23 23:52:18 +01:00
titiger ae5668ab52 version set to 3.12-dev 2015-01-23 21:18:57 +01:00
filux 150bf34260 updated data hash 2015-01-23 17:05:01 +01:00
Tom Reynolds d7137e5c1c Merge tag '3.11.0' into develop
3.11.0
2015-01-21 22:06:22 +01:00
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