245fb6923c
since now you can write also port number in the 'LAN menu'
2015-04-29 20:26:00 +02:00
b398186d13
no more confusing underscores in generated source language files, also improved separators & descriptions a bit
2015-03-28 15:51:49 +01:00
397be04584
Merge pull request #10 from filux/develop
...
Masterserver's code in the separate repository 2/2.
almost year since pr :)
2015-03-19 20:56:40 +01:00
e94ddee69c
Merge pull request #55 from filux/feature/nicer-appearance-after-translations
...
game more friendly for other than english languages 2/2
2015-03-19 20:34:28 +01:00
14f04c5c35
fix for mesh bound particles
2015-03-15 01:46:49 +01:00
b50efbb75e
updated version number for development
2015-03-09 01:05:24 +01:00
90c307182e
updated version number for release
2015-03-09 00:34:59 +01:00
2eb3f7f6d3
Merge remote-tracking branch 'upstream/develop' into develop
2015-02-27 21:02:51 +01:00
966da32472
better support for macos, this also closes #36
2015-02-24 09:45:17 +01:00
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
c4d2368468
nicer chat on OSes with toolbar on the left like e.g. in "unity"
2015-02-07 02:24:30 +01:00
a2ab462236
better alignment
2015-02-07 01:45:10 +01:00
f749576f6c
support for long transifex language codes (like xx_XX) and a bit more friendly options for other than english languages
2015-02-06 01:29:13 +01:00
3728fff67b
battle configuration screen with more synchronized look (host/admin<>client) and more friendly for other than english languages
2015-02-06 01:26:16 +01:00
e139f1c9a9
a bit more readable mods menu
2015-02-06 01:22:12 +01:00
e3d968257d
keysetup menu more readable and better fit to other options tabs
2015-02-06 01:20:00 +01:00
aca1f1f918
'lan menu' more friendly for other than english languages
2015-02-06 01:17:07 +01:00
13f6661641
root menu screen more friendly for other than english languages
2015-02-06 01:14:17 +01:00
f6e1383f56
masterserver screen more friendly for other than english languages
2015-02-06 01:12:21 +01:00
1db511c345
more text on the info screen
2015-02-06 01:09:25 +01:00
d76fa2efa5
few more chars before wrap in message boxes
2015-02-06 01:07:34 +01:00
a61cd90556
nicer in-game menu
2015-02-06 01:05:40 +01:00
a19abc5591
chat supports longer messages
2015-02-06 01:02:34 +01:00
3a1f295e4e
no more long nicknames which overlaps other text
2015-02-06 00:58:02 +01:00
f5d4fe37da
'git version' is more important than compiler version
2015-02-06 00:54:18 +01:00
edc9973725
centered buttons
2015-02-06 00:51:59 +01:00
e324a8f75c
updated version numbers
2015-02-02 22:23:22 +01:00
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
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
9aff9842a4
camera start position shows main building in center.
2015-01-29 17:05:07 +01:00
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
4d7e0c1f4d
modcenter download should be available again in menu state connected.
2015-01-28 01:59:17 +01:00
3433eb5835
healthbar default set to "if needed"
2015-01-26 22:32:08 +01:00
791dd96f97
bad translation key for "Healthbar" fixed in options menu.
2015-01-25 20:01:29 +01:00
509266e9a9
Merge remote-tracking branch 'upstream/develop' into develop
...
Conflicts:
source/masterserver/flags/ad.png
source/masterserver/flags/af.png
source/masterserver/flags/ag.png
source/masterserver/flags/ai.png
source/masterserver/flags/al.png
source/masterserver/flags/am.png
source/masterserver/flags/ar.png
source/masterserver/flags/as.png
source/masterserver/flags/at.png
source/masterserver/flags/au.png
source/masterserver/flags/aw.png
source/masterserver/flags/ax.png
source/masterserver/flags/az.png
source/masterserver/flags/ba.png
source/masterserver/flags/bb.png
source/masterserver/flags/bd.png
source/masterserver/flags/be.png
source/masterserver/flags/bf.png
source/masterserver/flags/bg.png
source/masterserver/flags/bi.png
source/masterserver/flags/bj.png
source/masterserver/flags/bm.png
source/masterserver/flags/bn.png
source/masterserver/flags/bo.png
source/masterserver/flags/br.png
source/masterserver/flags/bs.png
source/masterserver/flags/bt.png
source/masterserver/flags/bv.png
source/masterserver/flags/bw.png
source/masterserver/flags/by.png
source/masterserver/flags/bz.png
source/masterserver/flags/ca.png
source/masterserver/flags/cc.png
source/masterserver/flags/cf.png
source/masterserver/flags/cg.png
source/masterserver/flags/ci.png
source/masterserver/flags/ck.png
source/masterserver/flags/cl.png
source/masterserver/flags/cm.png
source/masterserver/flags/cn.png
source/masterserver/flags/co.png
source/masterserver/flags/cr.png
source/masterserver/flags/cs.png
source/masterserver/flags/cu.png
source/masterserver/flags/cv.png
source/masterserver/flags/cx.png
source/masterserver/flags/cz.png
source/masterserver/flags/de.png
source/masterserver/flags/dj.png
source/masterserver/flags/dk.png
source/masterserver/flags/dm.png
source/masterserver/flags/do.png
source/masterserver/flags/dz.png
source/masterserver/flags/ec.png
source/masterserver/flags/eg.png
source/masterserver/flags/eh.png
source/masterserver/flags/er.png
source/masterserver/flags/es.png
source/masterserver/flags/et.png
source/masterserver/flags/fi.png
source/masterserver/flags/fj.png
source/masterserver/flags/fk.png
source/masterserver/flags/fm.png
source/masterserver/flags/fr.png
source/masterserver/flags/ga.png
source/masterserver/flags/gb.png
source/masterserver/flags/gd.png
source/masterserver/flags/ge.png
source/masterserver/flags/gf.png
source/masterserver/flags/gh.png
source/masterserver/flags/gl.png
source/masterserver/flags/gm.png
source/masterserver/flags/gn.png
source/masterserver/flags/gp.png
source/masterserver/flags/gq.png
source/masterserver/flags/gr.png
source/masterserver/flags/gs.png
source/masterserver/flags/gt.png
source/masterserver/flags/gu.png
source/masterserver/flags/gw.png
source/masterserver/flags/gy.png
source/masterserver/flags/hk.png
source/masterserver/flags/hm.png
source/masterserver/flags/hn.png
source/masterserver/flags/hr.png
source/masterserver/flags/ht.png
source/masterserver/flags/hu.png
source/masterserver/flags/ie.png
source/masterserver/flags/in.png
source/masterserver/flags/io.png
source/masterserver/flags/iq.png
source/masterserver/flags/ir.png
source/masterserver/flags/is.png
source/masterserver/flags/jm.png
source/masterserver/flags/jo.png
source/masterserver/flags/ke.png
source/masterserver/flags/kg.png
source/masterserver/flags/kh.png
source/masterserver/flags/ki.png
source/masterserver/flags/km.png
source/masterserver/flags/kn.png
source/masterserver/flags/kp.png
source/masterserver/flags/kr.png
source/masterserver/flags/kw.png
source/masterserver/flags/ky.png
source/masterserver/flags/kz.png
source/masterserver/flags/la.png
source/masterserver/flags/lb.png
source/masterserver/flags/lc.png
source/masterserver/flags/li.png
source/masterserver/flags/lk.png
source/masterserver/flags/ls.png
source/masterserver/flags/lt.png
source/masterserver/flags/lu.png
source/masterserver/flags/lv.png
source/masterserver/flags/ly.png
source/masterserver/flags/ma.png
source/masterserver/flags/md.png
source/masterserver/flags/me.png
source/masterserver/flags/mg.png
source/masterserver/flags/mh.png
source/masterserver/flags/mk.png
source/masterserver/flags/ml.png
source/masterserver/flags/mm.png
source/masterserver/flags/mn.png
source/masterserver/flags/mo.png
source/masterserver/flags/mp.png
source/masterserver/flags/mq.png
source/masterserver/flags/mr.png
source/masterserver/flags/ms.png
source/masterserver/flags/mu.png
source/masterserver/flags/mv.png
source/masterserver/flags/mw.png
source/masterserver/flags/mx.png
source/masterserver/flags/my.png
source/masterserver/flags/mz.png
source/masterserver/flags/na.png
source/masterserver/flags/nc.png
source/masterserver/flags/ne.png
source/masterserver/flags/nf.png
source/masterserver/flags/ng.png
source/masterserver/flags/ni.png
source/masterserver/flags/nl.png
source/masterserver/flags/no.png
source/masterserver/flags/np.png
source/masterserver/flags/nr.png
source/masterserver/flags/nu.png
source/masterserver/flags/nz.png
source/masterserver/flags/om.png
source/masterserver/flags/pa.png
source/masterserver/flags/pf.png
source/masterserver/flags/pg.png
source/masterserver/flags/ph.png
source/masterserver/flags/pk.png
source/masterserver/flags/pm.png
source/masterserver/flags/pn.png
source/masterserver/flags/pr.png
source/masterserver/flags/pt.png
source/masterserver/flags/pw.png
source/masterserver/flags/py.png
source/masterserver/flags/re.png
source/masterserver/flags/ro.png
source/masterserver/flags/rs.png
source/masterserver/flags/ru.png
source/masterserver/flags/rw.png
source/masterserver/flags/sa.png
source/masterserver/flags/sb.png
source/masterserver/flags/sc.png
source/masterserver/flags/sd.png
source/masterserver/flags/se.png
source/masterserver/flags/sg.png
source/masterserver/flags/sh.png
source/masterserver/flags/si.png
source/masterserver/flags/sj.png
source/masterserver/flags/sk.png
source/masterserver/flags/sl.png
source/masterserver/flags/sm.png
source/masterserver/flags/sn.png
source/masterserver/flags/so.png
source/masterserver/flags/sr.png
source/masterserver/flags/st.png
source/masterserver/flags/sv.png
source/masterserver/flags/sz.png
source/masterserver/flags/tc.png
source/masterserver/flags/td.png
source/masterserver/flags/tf.png
source/masterserver/flags/tg.png
source/masterserver/flags/th.png
source/masterserver/flags/tk.png
source/masterserver/flags/tl.png
source/masterserver/flags/tm.png
source/masterserver/flags/tn.png
source/masterserver/flags/tr.png
source/masterserver/flags/tt.png
source/masterserver/flags/tv.png
source/masterserver/flags/tw.png
source/masterserver/flags/tz.png
source/masterserver/flags/ua.png
source/masterserver/flags/ug.png
source/masterserver/flags/um.png
source/masterserver/flags/us.png
source/masterserver/flags/uy.png
source/masterserver/flags/uz.png
source/masterserver/flags/va.png
source/masterserver/flags/vc.png
source/masterserver/flags/ve.png
source/masterserver/flags/vg.png
source/masterserver/flags/vi.png
source/masterserver/flags/vn.png
source/masterserver/flags/vu.png
source/masterserver/flags/wf.png
source/masterserver/flags/ws.png
source/masterserver/flags/ye.png
source/masterserver/flags/yt.png
source/masterserver/flags/za.png
source/masterserver/flags/zm.png
source/masterserver/flags/zw.png
source/masterserver/images/game_icon.png
2015-01-23 21:52:03 +01:00
ae5668ab52
version set to 3.12-dev
2015-01-23 21:18:57 +01:00
30a8667307
version set to 3.11.0
2015-01-20 23:10:36 +01:00
44783a4108
shared Team Units and Resources
...
set the checkBoxes to editable when scenarioCheckBox is disabled
2015-01-18 19:40:30 +01:00
c5c177a82c
shared Team Units and Resources
...
set the checkBoxes to non-editable when scenarioCheckBox is enabled
2015-01-18 19:40:30 +01:00
b3449e59be
shared Team Options in scenarios
...
little fix with printf which weren't used anyway
2015-01-18 19:40:30 +01:00
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
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
7006c26707
morph takes cellmaps into account ( needed for prax next )
2015-01-14 22:58:19 +01:00
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
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
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
a7b376a700
ensure error message box is completly visible on screen
2015-01-12 21:21:42 +01:00
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
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
fdc71786b2
fixed highlight rendering on minimap
2015-01-11 21:46:37 +01:00
filux