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
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
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
9e929481c8
Merge branch 'develop' of github.com:MegaGlest/megaglest-source into develop
2015-01-17 00:07:32 +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
d3d0fbf9bf
lossless images compression
...
keeping file formats, comments + EXIV meta data intact
2015-01-14 23:58:30 +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
bd61e9ea37
FilterMaxAnisotropy in game graphics options
2015-01-11 19:13:06 +01:00
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
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
fa3a4439dc
return had value in function void
2015-01-10 00:51:19 +01:00
53fc464c30
Merge branch 'depthbuffer' into develop
2015-01-10 00:06:36 +01:00
9fb8cf2fd5
Merge pull request #44 from titison/sharedResourceFix2
...
Resource Storage calculated on team basis
2015-01-10 00:04:30 +01:00
70248095e6
fix
2015-01-09 23:31:30 +01:00
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
4e0c96adae
no need to render dead units when selecting
2015-01-03 22:24:21 +01:00
109a5b9985
sort map lists non case sensitive in menu
2015-01-03 02:03:31 +01:00
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
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
f4529566fa
bugfix for version checking
...
We can have versions with only one dot.
2015-01-02 01:24:45 +01:00
4a292ed1d1
don't mix functionality
...
Not a bug fix, just trying to keep things more clean.
2015-01-01 17:16:24 +01:00
51c67cc7ff
- make app update work in windows
2014-12-30 22:09:53 -08:00
f76fe55153
- more updates for updating version on windows
2014-12-30 21:40:51 -08:00
d13118ecf8
- attempt to make updates work for windows
2014-12-30 15:05:24 -08:00
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
bcd6c7b310
the headless server has no need to handle unit boost particles
2014-12-30 20:34:05 +01:00
11b766b5bc
v3.11-beta2.0
2014-12-26 21:33:54 +01:00
7cd1cb242f
Fix for meshBound Particles
...
There was a bug if you used multiple units of the same type with mesh bound
particles. The given model was the same for all units with the same
unitType/skill.
2014-12-26 20:51:37 +01:00
0fdfc56b96
- small vc++ compile warning cleanup
2014-12-25 14:45:08 -08:00
2263e89da7
timed particles are meant to be bound to the animation progress
...
timed particles are meant to be bound to the animation progress and not to
the skill progress like it was before.
2014-12-25 03:38:07 +01:00
33dd93fc8b
Handle timed particles in a correct way
...
Before there were many iming issues because the timed particle system
where not queued often enough. Now all timed particle systems are
queued each time a new SkillCycle starts.
2014-12-24 15:45:38 +01:00
b1455c0e33
- properly cleanup models in g3dviewer to fix shutdown bug
2014-12-23 20:39:03 -08:00
8925a8997c
fix for boosting sight
2014-12-22 21:11:58 +01:00
dc143f8819
- few more tiny fixes for msvc compiler warnings
2014-12-21 23:45:16 -08:00
56214c6228
- small cleanup in vc++ compile
2014-12-21 22:20:19 -08:00
f97f0ef852
- more general bugfixes (not all upgrade values were being used in the code)
2014-12-21 21:07:24 -08:00
3705d56057
Merge branch 'develop' of github-softcoder-megaglest:MegaGlest/megaglest-source into develop
2014-12-21 20:27:48 -08:00
92a113ddfa
- missed a few places where we should use total upgrade sight
2014-12-21 20:27:21 -08:00
f62efc64bf
fix for uneditable closed slots
...
https://forum.megaglest.org/index.php?topic=9620.0
2014-12-22 03:08:19 +01:00
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
b0f7b078f6
- apply sight upgrades when units sight is involved in cacls
2014-12-21 17:23:20 -08:00
3965f72b5a
- updated debug output in case there are real boost problems in future
2014-12-21 14:47:58 -08:00
494061b80d
Merge branch 'develop' of github-softcoder-megaglest:MegaGlest/megaglest-source into develop
2014-12-21 13:02:57 -08:00
0a55746ae2
- more attempts to fix attack boost with upgrades
2014-12-21 13:02:27 -08:00
b50cb7770c
Comparison of version numbers allows non integer characters too
...
This is used to check compatibility of saved games typically.
Only the leading digits are used as minor version now.
2014-12-21 13:35:42 +01:00
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
b5d609586a
- small coverity fix
2014-12-20 16:31:08 -08:00
d08eacacc8
- fix the display of upgrades and boost values
2014-12-20 16:26:14 -08:00
7418fac810
- small fix for display
2014-12-20 15:32:40 -08:00
32c11f41de
- cleanup of boost apply code and fix to apply when active boosts exist in middle of a level up
2014-12-20 15:27:11 -08:00
461b16be8e
- attempt to fix attack boosts to properly apply and de-apply when upgrades are present
2014-12-20 14:25:42 -08:00
4dea67cff9
- attempt to fix thread crash when ending game for network play
2014-12-19 19:08:04 -08:00
d34e58ccb6
fix for too often applied boosts
2014-12-19 22:48:07 +01:00
e20d242e2c
its no longer compatible to beta
2014-12-19 22:47:09 +01:00
3120ab7453
boost without explicitly listed units fixed
2014-12-19 19:40:34 +01:00
5b82859e92
default GraphicMessageBox size adjusted
2014-12-18 01:11:06 +01:00
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
47c181d2ab
different rendering of resources in teammode
2014-12-18 00:32:44 +01:00
5099f19709
- update miniz code to 1.15
2014-12-17 07:28:06 -08:00
c945a5721d
- more coverity based fixes
2014-12-15 21:07:13 -08:00
8210485a42
- a few bugfixes related to coverity scan
2014-12-15 19:44:26 -08:00
9392aa0fca
fixed missing cast found by Coverity CID 1232664
2014-12-16 02:08:29 +01:00
2d4c4ece8a
fixed missing cast found by Coverity CID 1232665
2014-12-16 01:50:12 +01:00
c51817d8d5
fixed missing cast found by Coverity CID 1232666
2014-12-16 01:49:26 +01:00
c3cd1cfc17
return value was not used
...
Coverity CID 1232671
2014-12-16 01:15:56 +01:00
a11855e220
fixed Division by float zero
...
Coverity scan CID 1197074 and more numbers
2014-12-16 00:56:26 +01:00
db0007d277
fixed missing initialisations found by coverity scan
...
Coverity CID 1197086
2014-12-16 00:53:33 +01:00
b407e0090d
same button layout for custom game menu and connected game menu
2014-12-15 21:39:11 +01:00
fd765da5e8
Advanced transifex options in menu are back in place
2014-12-15 02:05:47 +01:00
2c15c89571
render server lines with background to make them more readable.
2014-12-15 01:07:25 +01:00
e1d85f145c
bigger message box to explain wrong router setup
2014-12-09 02:36:30 +01:00
8cd7a9580f
- disable in game screen res change for osx (prompt user to restart game)
2014-12-06 18:45:26 -08:00
3e3fef88f5
render a team color in game setup menues
2014-12-06 00:54:00 +01:00
7554d57142
Tell new players what to do when connected to a headless client
2014-12-05 21:43:34 +01:00
974e04ef1f
v3.10.0-beta1
2014-12-02 23:37:48 +01:00
40df13461e
Merge pull request #13 from alketii/master
...
Disabled button in lobby which holds players name.
2014-12-02 10:59:03 -08:00
5e292e931c
- memory leak and a few other minor bug fixes as discovered by coverity scan.
2014-11-30 15:30:02 -08:00
c21317a5f4
- attempt to further stabilize g3d viewer end map editor
2014-11-29 17:44:22 -08:00
956671f018
bugfix: new attributes must not exist in older savegames
2014-11-29 19:25:33 +01:00
6faa3dc725
- see if this improves stability of the map editor in newer wxwidgets
2014-11-28 23:49:16 -08:00
ad0b652727
- bugfix for g3d viewer and updated wxwidgets
2014-11-28 23:35:35 -08:00
126ed18589
- bugfix selection circle and healthbar rendering
2014-11-28 20:49:04 -08:00
8e7dfbd43a
Merge branch 'develop' of github-softcoder-megaglest:MegaGlest/megaglest-source into develop
2014-11-28 20:45:40 -08:00
e27c44bb8f
- bugfix of selection circle and healthbar ratio value
2014-11-28 20:45:07 -08:00
645778a490
- added new files to vc2012 project
2014-11-28 20:05:33 -08:00
ceca2fc5aa
- more fixes from cppcheck
2014-11-28 18:19:40 -08:00
a656a64830
- corrected some uninitialized vars identified by cppcheck
2014-11-28 16:53:30 -08:00
titiger