Rampoina/MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
5,485 Commits 1 Branch 0 Tags 27 MiB
6d7bb258a9
Commit Graph

4588 Commits

Author SHA1 Message Date
filux
c84e7f5443 probably fixed situation for GCC older than 4.7 2015-09-18 20:10:02 +02:00
filux
6ac255095a implemented basic support for SDL2 in cmake files (only); changed a general idea of how and where are showed deprecation warnings 2015-09-18 19:17:52 +02:00
titiger
c3e2305e41 fixed a null pointer problem in gui 2015-09-05 22:46:15 +02:00
titiger
fd8e29c901 Merge branch 'develop' of github.com:MegaGlest/megaglest-source into develop 2015-08-26 22:45:56 +02:00
filux
5afa6c68ba added missing option for lua 5.3 2015-08-20 16:52:27 +02:00
filux
617bc9a89e extended support for lua to v5.3; removed some duplicate messages showing up during 'cmake configuration' time 2015-08-20 16:43:14 +02:00
filux
455b4731e2 even mode fixed dialog code 2015-06-28 19:43:10 +02:00
titiger
68ef7471d5 reload defaults in headless mode if last player disconnects 
If last player disconnects form a headless server the headless loads his defaults
for network games.
 2015-06-24 12:38:05 +02:00
filux
68cfb32e96 fixed configuration for kdialog, added support for yad 2015-06-23 22:08:42 +02:00
filux
803526d866 blind try to fix libvorbis problems 2015-06-23 07:04:05 +02:00
titiger
edf9922dca holding down return crashed the chat-function 
https://forum.megaglest.org/index.php?topic=9702.0
 2015-06-14 21:00:05 +02:00
filux
74cbbba6ba improvements for static build and a bit of cleaning 2015-06-14 19:24:08 +02:00
filux
72539021f9 in default OpenSSL is not required, closed #67 2015-06-13 00:09:56 +02:00
Rémi Verschelde
56ac448177 Ensure libcurl also links against libssl and libcrypto 
ssl and crypto seem to be lacking in ${CURL_LIBRARIES} at least on my distro,
and that causes underlinking issues.
 2015-06-12 21:42:50 +02:00
Tom Reynolds
fecf89f295 Cosmetics 
[CI skip]
 2015-06-10 12:02:45 +02:00
Tom Reynolds
22e02cbf95 Improve output for missing mesh warning 2015-06-10 11:09:40 +02:00
titiger
4ab574150a group selections can be recalled with shift down. 
Group selections can be recalled with shift down and the 
group is added to the current selection.
 2015-06-10 00:42:03 +02:00
filux
e26ea22378 more universal and matched entry, fixed #65 2015-06-05 01:54:05 +02:00
Michael Palimaka
fc07d9caf2 Fix build with >=cmake-3.2. 
The FindOpenGL module no longer pulls in X11 libraries.
 2015-06-05 00:47:52 +02:00
filux
f926285bf6 since now required dynamic libs from non standard locations will be added to the mac packages, #63 2015-06-04 23:26:50 +02:00
Tom Reynolds
729c99c5fe Change techtree doc image refs (http -> https) 
[skip ci]
 2015-05-17 18:08:00 +02:00
Tom Reynolds
f6a00c2be6 New HTML title for techtree docs 2015-05-17 18:02:03 +02:00
filux
245fb6923c since now you can write also port number in the 'LAN menu' 2015-04-29 20:26:00 +02:00
filux
34d52e40d7 updated support for new versions of ubuntu 2015-04-29 20:23:03 +02:00
filux
f9be94d686 status messages in the lobby should look somehow different than messages written by human 2015-04-07 23:30:40 +02:00
filux
f0d705ba17 lower waiting time for the multi-player game 2015-04-05 08:35:34 +02:00
filux
b398186d13 no more confusing underscores in generated source language files, also improved separators & descriptions a bit 2015-03-28 15:51:49 +01:00
filux
b6f305e5ba checked and updated tool, added new useful script 2015-03-20 18:33:47 +01:00
filux
cbb2cb9360 added masterserver submodule 2015-03-19 21:26:40 +01:00
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
titiger
b3cf4bf1fd meshes can glow 2015-03-18 20:21:59 +01:00
titiger
14f04c5c35 fix for mesh bound particles 2015-03-15 01:46:49 +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
titison
12102f8791 Specific Tileset on map-preview option 
Tell the game a specific tileset to use together with the --preview-map
option. The Tileset is optional. Default is forest.
! EVEN IF FOREST DOES NOT EXIST ! (like before)
./start_megaglest --preview-map=Map,Tileset
 2015-03-08 01:36:16 +01:00
filux
2eb3f7f6d3 Merge remote-tracking branch 'upstream/develop' into develop 2015-02-27 21:02:51 +01:00
filux
966da32472 better support for macos, this also closes #36 2015-02-24 09:45:17 +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
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
c4d2368468 nicer chat on OSes with toolbar on the left like e.g. in "unity" 2015-02-07 02:24:30 +01:00
filux
a2ab462236 better alignment 2015-02-07 01:45:10 +01:00
filux
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
filux
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
filux
e139f1c9a9 a bit more readable mods menu 2015-02-06 01:22:12 +01:00
filux
e3d968257d keysetup menu more readable and better fit to other options tabs 2015-02-06 01:20:00 +01:00
filux
aca1f1f918 'lan menu' more friendly for other than english languages 2015-02-06 01:17:07 +01:00
filux
13f6661641 root menu screen more friendly for other than english languages 2015-02-06 01:14:17 +01:00
filux
f6e1383f56 masterserver screen more friendly for other than english languages 2015-02-06 01:12:21 +01:00
filux
1db511c345 more text on the info screen 2015-02-06 01:09:25 +01:00
filux
d76fa2efa5 few more chars before wrap in message boxes 2015-02-06 01:07:34 +01:00
filux
a61cd90556 nicer in-game menu 2015-02-06 01:05:40 +01:00
filux
a19abc5591 chat supports longer messages 2015-02-06 01:02:34 +01:00
filux
3a1f295e4e no more long nicknames which overlaps other text 2015-02-06 00:58:02 +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
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
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
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
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
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
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
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
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
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
titiger
11b766b5bc v3.11-beta2.0 2014-12-26 21:33:54 +01:00
titison
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
SoftCoder
0fdfc56b96 - small vc++ compile warning cleanup 2014-12-25 14:45:08 -08:00
titiger
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
titiger
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
SoftCoder
b1455c0e33 - properly cleanup models in g3dviewer to fix shutdown bug 2014-12-23 20:39:03 -08:00
titiger
8925a8997c fix for boosting sight 2014-12-22 21:11:58 +01:00
SoftCoder
dc143f8819 - few more tiny fixes for msvc compiler warnings 2014-12-21 23:45:16 -08:00
SoftCoder
56214c6228 - small cleanup in vc++ compile 2014-12-21 22:20:19 -08:00
SoftCoder
f97f0ef852 - more general bugfixes (not all upgrade values were being used in the code) 2014-12-21 21:07:24 -08:00
SoftCoder
3705d56057 Merge branch 'develop' of github-softcoder-megaglest:MegaGlest/megaglest-source into develop 2014-12-21 20:27:48 -08:00
SoftCoder
92a113ddfa - missed a few places where we should use total upgrade sight 2014-12-21 20:27:21 -08:00
titiger
f62efc64bf fix for uneditable closed slots 
https://forum.megaglest.org/index.php?topic=9620.0
 2014-12-22 03:08:19 +01:00
SoftCoder
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
SoftCoder
b0f7b078f6 - apply sight upgrades when units sight is involved in cacls 2014-12-21 17:23:20 -08:00
SoftCoder
3965f72b5a - updated debug output in case there are real boost problems in future 2014-12-21 14:47:58 -08:00
SoftCoder
494061b80d Merge branch 'develop' of github-softcoder-megaglest:MegaGlest/megaglest-source into develop 2014-12-21 13:02:57 -08:00
SoftCoder
0a55746ae2 - more attempts to fix attack boost with upgrades 2014-12-21 13:02:27 -08:00
titiger
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
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
SoftCoder
b5d609586a - small coverity fix 2014-12-20 16:31:08 -08:00
SoftCoder
d08eacacc8 - fix the display of upgrades and boost values 2014-12-20 16:26:14 -08:00
SoftCoder
7418fac810 - small fix for display 2014-12-20 15:32:40 -08:00
SoftCoder
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
SoftCoder
461b16be8e - attempt to fix attack boosts to properly apply and de-apply when upgrades are present 2014-12-20 14:25:42 -08:00
SoftCoder
4dea67cff9 - attempt to fix thread crash when ending game for network play 2014-12-19 19:08:04 -08:00
titiger
d34e58ccb6 fix for too often applied boosts 2014-12-19 22:48:07 +01:00
titiger
e20d242e2c its no longer compatible to beta 2014-12-19 22:47:09 +01:00
titiger
3120ab7453 boost without explicitly listed units fixed 2014-12-19 19:40:34 +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
titiger
47c181d2ab different rendering of resources in teammode 2014-12-18 00:32:44 +01:00
SoftCoder
5099f19709 - update miniz code to 1.15 2014-12-17 07:28:06 -08:00
SoftCoder
c945a5721d - more coverity based fixes 2014-12-15 21:07:13 -08:00
SoftCoder
8210485a42 - a few bugfixes related to coverity scan 2014-12-15 19:44:26 -08:00
titiger
9392aa0fca fixed missing cast found by Coverity CID 1232664 2014-12-16 02:08:29 +01:00
titiger
2d4c4ece8a fixed missing cast found by Coverity CID 1232665 2014-12-16 01:50:12 +01:00
titiger
c51817d8d5 fixed missing cast found by Coverity CID 1232666 2014-12-16 01:49:26 +01:00
titiger
c3cd1cfc17 return value was not used 
Coverity CID 1232671
 2014-12-16 01:15:56 +01:00
titiger
a11855e220 fixed Division by float zero 
Coverity scan CID 1197074 and more numbers
 2014-12-16 00:56:26 +01:00
titiger
db0007d277 fixed missing initialisations found by coverity scan 
Coverity CID 1197086
 2014-12-16 00:53:33 +01:00
titiger
b407e0090d same button layout for custom game menu and connected game menu 2014-12-15 21:39:11 +01:00
titiger
fd765da5e8 Advanced transifex options in menu are back in place 2014-12-15 02:05:47 +01:00
titiger
2c15c89571 render server lines with background to make them more readable. 2014-12-15 01:07:25 +01:00
titiger
e1d85f145c bigger message box to explain wrong router setup 2014-12-09 02:36:30 +01:00
SoftCoder
8cd7a9580f - disable in game screen res change for osx (prompt user to restart game) 2014-12-06 18:45:26 -08:00
titiger
3e3fef88f5 render a team color in game setup menues 2014-12-06 00:54:00 +01:00
titiger
7554d57142 Tell new players what to do when connected to a headless client 2014-12-05 21:43:34 +01:00
titiger
974e04ef1f v3.10.0-beta1 2014-12-02 23:37:48 +01:00
Mark Vejvoda
40df13461e Merge pull request #13 from alketii/master 
Disabled button in lobby which holds players name.
 2014-12-02 10:59:03 -08:00
SoftCoder
5e292e931c - memory leak and a few other minor bug fixes as discovered by coverity scan. 2014-11-30 15:30:02 -08:00
SoftCoder
c21317a5f4 - attempt to further stabilize g3d viewer end map editor 2014-11-29 17:44:22 -08:00
titiger
956671f018 bugfix: new attributes must not exist in older savegames 2014-11-29 19:25:33 +01:00
SoftCoder
6faa3dc725 - see if this improves stability of the map editor in newer wxwidgets 2014-11-28 23:49:16 -08:00
SoftCoder
ad0b652727 - bugfix for g3d viewer and updated wxwidgets 2014-11-28 23:35:35 -08:00
SoftCoder
126ed18589 - bugfix selection circle and healthbar rendering 2014-11-28 20:49:04 -08:00
SoftCoder
8e7dfbd43a Merge branch 'develop' of github-softcoder-megaglest:MegaGlest/megaglest-source into develop 2014-11-28 20:45:40 -08:00
SoftCoder
e27c44bb8f - bugfix of selection circle and healthbar ratio value 2014-11-28 20:45:07 -08:00
SoftCoder
645778a490 - added new files to vc2012 project 2014-11-28 20:05:33 -08:00
SoftCoder
ceca2fc5aa - more fixes from cppcheck 2014-11-28 18:19:40 -08:00
SoftCoder
a656a64830 - corrected some uninitialized vars identified by cppcheck 2014-11-28 16:53:30 -08:00
SoftCoder
d0cdea1a6d Merge branch 'develop' of github-softcoder-megaglest:MegaGlest/megaglest-source into develop 2014-11-28 16:23:14 -08:00
SoftCoder
ec0d9a7cd5 - bugfix to properly set defaults for particles 2014-11-28 16:22:29 -08:00
titiger
bb62a998cd render healthbars after particles to make them more visible 2014-11-28 23:52:56 +01:00
titiger
a37e7b398e blend mode set to normal after particle rendering 2014-11-28 23:52:13 +01:00
SoftCoder
65a3ce6e86 - fix loading of deferred system particles 2014-11-27 15:28:49 -08:00
SoftCoder
cbf9a305c5 - attempt to improve loading of fire particle 2014-11-26 17:19:46 -08:00
titiger
99e315b1cb healthbars: EP was not properly handled 2014-11-27 01:17:32 +01:00
titiger
eaec6e08ae and one more bugfix for particle positioning 2014-11-27 00:35:37 +01:00
titiger
6ab51749e8 bugfix for particle positioning 2014-11-26 01:51:45 +01:00
titiger
3eb9c05b4a Particlesystems can now be positioned unit height independend 
In the faction.xml you can set teh following now:
<flat-particle-positions value="true"/>
By this the positions of the particle systems ( attack and unit particles ) 
can be done based of the units centered ground position and 
by this height independend.
 2014-11-26 00:38:04 +01:00
titiger
54905c0e5c rename getCurrVector() to getCurrMidHeightVector() 2014-11-25 23:40:47 +01:00
titiger
024338429a special height for fire and hitposition can be set in a units 2014-11-25 22:36:19 +01:00
titiger
50b27db1d6 delete the projectile type if not needed 2014-11-25 22:35:07 +01:00
titiger
7bf6fe756c bugfix for a crash with projectiles without particle system 
only add a projectile if there is an enabled particlesystem
 2014-11-25 00:56:59 +01:00
SoftCoder
29ab1094ec - fixed unit particles so they worked for normal use cases 2014-11-24 14:36:12 -08:00
titiger
eae90a2198 fix for effects debug rendering 
units with size>1  showed a too big effect range circle
 2014-11-24 22:14:09 +01:00
titiger
88de5a7050 Upgrades must be taken into account for healthbars too 2014-11-24 01:39:29 +01:00
titiger
30506edebd fixed some more problems with console messages 2014-11-24 01:10:10 +01:00
titiger
6b35fa1918 its "Healthbar" in translation, not "HealthBar" 2014-11-23 01:52:38 +01:00
titiger
b20b548e76 Merge pull request #30 from titison/feature/lua_blockUnits 
Feature/lua you can disable units via lua commands so that they cannot be built
 2014-11-22 23:39:44 +01:00
titison
345c88d320 Work on Healthbars 
production bars;
options;
many more...;
 2014-11-22 23:15:19 +01:00
SoftCoder
3647a610cc - attempt to improve mutex locking in irc client code to avoid dead locks 2014-11-20 17:51:24 -08:00
titiger
55a27b4c6b every game initialized with a frame count>1 is a somehwo loaded game 
This means the Fow needs to be set like it is inside a match.
 2014-11-19 23:34:18 +01:00
titiger
5791f64829 Scenarios that pause the game in the beginning get no more black screen 2014-11-19 23:29:51 +01:00
titiger
25a8f44ee1 This fixes black background for loaded games which are paused 2014-11-19 22:43:45 +01:00
SoftCoder
5676a055ba Merge branch 'develop' of github-softcoder-megaglest:MegaGlest/megaglest-source into develop 2014-11-18 21:40:12 -08:00
SoftCoder
3b3132ccce - unit particles now support minHp / mapHp tags 2014-11-18 21:38:46 -08: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
titiger
0ac48846cb faction_type has no save game, was just confusing to have this dead code 2014-11-17 00:14:52 +01:00
titison
7eb04e1583 setLockedUnitsForFaction 
*save locked Units in savegames ( and load them when savegame is loaded )
 2014-11-16 18:32:13 +01:00
titison
5de94dccc9 setLockedUnitForFaction 
*removed debug (printf's)
 2014-11-15 18:45:46 +01:00
titison
ea04a2bb58 setLockedUnitForFaction 
*Showing an info in the info string ( above the requirements of the unit ) if locked
 2014-11-15 18:30:48 +01:00
titison
bcb3288d74 setLockedUnitForFaction 
*the actual lua function "setLockedUnitForFaction"
 2014-11-15 18:30:48 +01:00
titiger
71bdb1cba7 Player names of Scenarios were displayed in wrong slot. 
The player names were set with wrong index and CPU players had wrong names.
 2014-11-14 22:25:56 +01:00
titiger
b85f9794e0 allow all kind of gfx formats for healthbar textures 2014-11-10 21:55:30 +01:00
titiger
d21f7bd976 problems found by coverity 2014-11-10 21:53:10 +01:00
titiger
49e55209da Healthbars in ingame options 2014-11-08 01:30:43 +01:00
titiger
26db981702 Merge pull request #27 from titison/feature/hp-bars 
Feature/hp bars
 2014-11-07 01:33:30 +01:00
titiger
85c79be337 Game name is now part of the game settings. 
This fixes the ugly "S Game" on the stats.
 2014-11-07 01:26:23 +01:00
titison
2f60d179e9 Healthbars 
* Hotkey now toggles between Default/Off/Always/Damaged/Selected
* Code clean up
 2014-11-06 21:12:47 +01:00
titison
791e1edec6 Healthbars 
Textures (border and background)
Faction.xml can specify more healthbars details
 2014-11-05 02:05:47 +01:00
titison
d1597334bf *Adjusted Healthbar color 
*Hotkey for Healthbars (ToggleHealthbars)
*Background and Border Texture in core data
 2014-11-02 18:18:20 +01:00
titiger
c32e828625 buxfix for too many rendered slot lines ( in some cases ). 2014-11-02 18:09:33 +01:00
titiger
534c94ec98 fix for duplicated console messages in connected game menu 2014-10-31 02:34:59 +01:00
titiger
dbddadc74b Fix to see normal consoleMessages in many menus again 
(+ consolemessages to show that the headless server did 
not had the selected map )
 2014-10-31 01:08:12 +01:00
titison
fe936f5c8c Adjusting healthbar related things 
*unit height=healthbar height per default
*no hpbars in photomode
*renamed function
 2014-10-30 00:55:18 +01:00
titiger
e322b5ccb6 Merge branch 'develop' of github.com:MegaGlest/megaglest-source into develop 2014-10-30 00:08:28 +01:00
titiger
49eec16401 disable factioncontrol selection where it is not possible 2014-10-30 00:02:23 +01:00
titison
08806c5416 *Finised Hp Bars 
*Added general settings in faction.xml
 2014-10-29 22:23:46 +01:00
titison
de5135bfaf *added split(s,d) function for strings 
*reading unit xml healthbar node
*adjusted hpbars
 2014-10-29 00:50:45 +01:00
titison
034b6066be Merge branch 'develop' of github.com:MegaGlest/megaglest-source into feature/hp-bars 2014-10-28 22:05:04 +01:00
titiger
6507e27fda hopefully smoth switching when connected to headless servers. 2014-10-28 21:52:10 +01:00
titison
2bfe4a0b0f Merge branch 'develop' of github.com:MegaGlest/megaglest-source into feature/hp-bars 2014-10-27 23:24:20 +01:00
titison
a2790bd9cb Make them actually usable. 
added ep bars.
Of course its not finished yet
 2014-10-27 16:16:50 +01:00
titison
20a8011a46 first hp-bars 2014-10-26 21:34:14 +01:00
filux
1724fddb65 Merge remote-tracking branch 'upstream/develop' into develop 2014-10-16 21:16:49 +00:00
titiger
8892a2533c no more trouble when switching maps in headless mode. 
If a button was pressed in the last 4 seconds we ignore settings distributed by the
headless server.
 2014-10-05 01:38:18 +02:00
titiger
ea1be62242 fix for a VERY old bug related to wrong display of attack range 
see https://forum.megaglest.org/index.php?topic=9567.0
this is a bug found  in glest 2.0 !!!
 2014-10-01 00:33:47 +02:00
titiger
e39fb8e8e4 trying to fix windows build 2014-09-29 02:55:15 +02:00
titiger
feb31e27d9 tags feature 
Tags feature ( manually merged ) from Omegas pullrequest 25
https://github.com/MegaGlest/megaglest-source/pull/25/
see forum discussion:
https://forum.megaglest.org/index.php?topic=9543.0
 2014-09-29 02:23:36 +02:00
titiger
6ebe0a197c whatever caused this code duplication .... 2014-09-29 01:47:00 +02:00
titiger
c6993ed7dd Merge pull request #19 from MikeHoffert/feature-attack-boost 
Attack boosts and upgrades now support upgrading attack speed
 2014-09-29 01:24:52 +02:00
filux
9988ea9cbf resolved conflicts to upstream/develop 2014-09-27 11:19:29 +00:00
titiger
ea2b4bcc7f Headless servers should not precalculate CRCs. 
This creates too much load when more than one server is running on 
the same machine.
 2014-09-25 23:50:37 +02:00
titiger
1f5b571c9d bugfix for bad {SCENARIODIR} replacement 
Done by softcoder in branch ce-gui, manually merged by me :)
https://forum.megaglest.org/index.php?topic=9553.0
 2014-09-24 01:16:28 +02:00
titiger
5f9816eaab multiplier are displayed in debug 
Multipliers are now shown for CPU-Players in the debug info too
 2014-09-23 01:14:20 +02:00
titiger
af46a8497e Disabled teamchat is reported to the user. 
If teamchat is disbaled to prevent cheating the user gets a message everytime 
he tries to get into team chat mode.
 2014-09-22 03:31:35 +02:00
titiger
2f00143782 cleanup all particle systems when morphing 
https://forum.megaglest.org/index.php?topic=9561.0
 2014-09-22 02:58:47 +02:00
titiger
4fc4359d99 we don't want fancy commands from irc 
https://forum.megaglest.org/index.php?topic=7756.0
 2014-09-22 00:36:49 +02:00
titiger
a084686ce9 fixed a merge conflict 2014-08-10 00:15:23 +02:00
titiger
cf5da4d2b3 fixed lua function getUnitName; added new lua function getUnitDisplayName 2014-08-09 00:48:04 +02:00
titiger
e5d2bbbf9e Merge pull request #23 from titison/feature/unit_control 
non commandable units
 2014-08-08 01:22:51 +02:00
titiger
ad5e978be9 Merge pull request #20 from MikeHoffert/documentation 
Documentation is always a good thing
 2014-08-08 01:20:47 +02:00
titison
850a9a7dc0 -AI can't command non-commandable units anymore 
-Removed non-selectable
 2014-08-07 21:00:27 +02:00
titiger
bf5125f1c6 Merge pull request #24 from titison/feature/particle-speedUp 
Feature/particle speed up
 2014-08-06 22:21:02 +02:00