filux
|
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 |
|
filux
|
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 |
|
filux
|
b50efbb75e
|
updated version number for development
|
2015-03-09 01:05:24 +01:00 |
|
filux
|
90c307182e
|
updated version number for release
|
2015-03-09 00:34:59 +01:00 |
|
filux
|
2eb3f7f6d3
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2015-02-27 21:02:51 +01:00 |
|
filux
|
f5d4fe37da
|
'git version' is more important than compiler version
|
2015-02-06 00:54:18 +01:00 |
|
filux
|
edc9973725
|
centered buttons
|
2015-02-06 00:51:59 +01:00 |
|
filux
|
e324a8f75c
|
updated version numbers
|
2015-02-02 22:23:22 +01:00 |
|
filux
|
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 |
|
titiger
|
ae5668ab52
|
version set to 3.12-dev
|
2015-01-23 21:18:57 +01:00 |
|
titiger
|
30a8667307
|
version set to 3.11.0
|
2015-01-20 23:10:36 +01: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
|
11b766b5bc
|
v3.11-beta2.0
|
2014-12-26 21:33:54 +01:00 |
|
titiger
|
1a8c28cc93
|
Make it more obvious where to join a game in the internet menu
Buttons can be set to always lighted(flashing). This is first used in
the internet menu.
|
2014-12-21 13:33:46 +01:00 |
|
titiger
|
e20d242e2c
|
its no longer compatible to beta
|
2014-12-19 22:47:09 +01:00 |
|
titiger
|
5b82859e92
|
default GraphicMessageBox size adjusted
|
2014-12-18 01:11:06 +01:00 |
|
titiger
|
a9cac6a3c1
|
render messagebox in a way that allows more text.
And default message box height is raised a bit to avoid trouble with
long messages in scenarios.
|
2014-12-18 01:04:37 +01:00 |
|
SoftCoder
|
8210485a42
|
- a few bugfixes related to coverity scan
|
2014-12-15 19:44:26 -08:00 |
|
titiger
|
a11855e220
|
fixed Division by float zero
Coverity scan CID 1197074 and more numbers
|
2014-12-16 00:56:26 +01:00 |
|
titiger
|
2c15c89571
|
render server lines with background to make them more readable.
|
2014-12-15 01:07:25 +01:00 |
|
titiger
|
974e04ef1f
|
v3.10.0-beta1
|
2014-12-02 23:37:48 +01:00 |
|
titiger
|
b4e9f787bd
|
several changes for loading saved games
allow to load older compatible save game
introduced a "last backward compatible version" for loading games
fixed a bug allowing to load older games
|
2014-11-18 18:59:45 +01:00 |
|
filux
|
fdd5eb52fe
|
Removed masterserver's code (separation from the source).
|
2014-03-27 20:12:04 +01:00 |
|
SoftCoder
|
c5a938e31b
|
- modify about screen to show copyright for Glest Team till 2010
|
2014-01-30 17:45:24 -08:00 |
|
SoftCoder
|
338f156a95
|
- changing version to v3.10.0-dev for new development
|
2014-01-27 11:21:22 -08:00 |
|
SoftCoder
|
1cacb0df27
|
- missed some updates
|
2014-01-24 09:50:17 -08:00 |
|
SoftCoder
|
9170d9c400
|
- added clang detection in binary version output
|
2014-01-21 17:06:10 -08:00 |
|
SoftCoder
|
d2284bbd36
|
- bug fix when changing language and showing hint button on game load
|
2014-01-18 16:31:01 -08:00 |
|
SoftCoder
|
4bada8fc5a
|
- updating game version to 3.9.1 in preparation for release
|
2014-01-17 19:37:25 -08:00 |
|
SoftCoder
|
2b9326197a
|
- added verbose debug info for data paths scanning
|
2014-01-03 07:28:31 -08:00 |
|
SoftCoder
|
f269273f07
|
- round #2 of coverity bug fixes
|
2013-12-14 22:37:15 -08:00 |
|
SoftCoder
|
ad81692331
|
Merge branch 'master' of https://github.com/williame/megaglest-source
|
2013-12-09 18:07:42 -08:00 |
|
titiger
|
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 |
|
Will
|
03c0197437
|
merge from upstream
|
2013-12-04 23:37:04 +01:00 |
|
William Edwards
|
e71e7104dc
|
Trying to build on OSX
|
2013-12-04 22:38:06 +01:00 |
|
SoftCoder
|
2ff75c54e2
|
merged updates
|
2013-11-30 14:29:02 -08:00 |
|
SoftCoder
|
f217db38f1
|
- changed to git version stamp
|
2013-11-29 13:13:30 -08:00 |
|
Mark Vejvoda
|
9268aaf279
|
- a few minor bug fixes related to code warnings
- code cleanup based on additional gcc warnings
- enabled additional gcc compiler warnings
|
2013-11-19 06:14:06 +00:00 |
|
Mark Vejvoda
|
145b90d341
|
- updating version to 3.9.0 for release
- increase installer size on linux for more accurate progrerss bar
|
2013-11-17 18:27:41 +00:00 |
|
Titus Tscharntke
|
d2cb21d818
|
version is set to 3.9-dev until versioning system is discussed
|
2013-11-17 10:41:09 +00:00 |
|
Mark Vejvoda
|
e89210cf6c
|
- updating version # to v3.9 in preparation for release
|
2013-11-16 21:50:54 +00:00 |
|
Mark Vejvoda
|
b3a9ad5411
|
fixed some vc++ compiler warnings
|
2013-11-14 13:56:05 +00:00 |
|
Mark Vejvoda
|
597feb452f
|
fix warnings from vc++
|
2013-11-10 05:27:59 +00:00 |
|
Mark Vejvoda
|
345907fc18
|
attempt to make win64 faster by using avx (as opposed to sse2)
|
2013-11-05 06:31:48 +00:00 |
|
Mark Vejvoda
|
1d3859ff32
|
- windows x64 updates to get things compiling on vc2012 x64
|
2013-11-02 11:04:52 +00:00 |
|
Titus Tscharntke
|
dea351095c
|
no more crashes for hotkey based selections in listboxes without translation.
|
2013-10-29 19:11:36 +00:00 |
|
Mark Vejvoda
|
d2ba7b163b
|
a little refactoring of function names in language class
|
2013-10-29 06:13:38 +00:00 |
|
Titus Tscharntke
|
35b8251bef
|
changed version number to avoid beta1 people joining svn test games
|
2013-10-27 16:17:20 +00:00 |