titiger
b8fa39f311
Merge branch 'develop' of github.com:MegaGlest/megaglest-source into develop
2015-11-21 20:23:02 +01:00
titiger
62e70debe9
fixed "Reload Last Settings" on the headless server #84
...
Relaod still does not always work if some people are already connected.
This makes trouble with network slots and slots in settings.
In general #84 should be fixed with this.
2015-11-21 20:22:23 +01:00
filux
fcbf254a05
linux's installer based on binary and data files (no parallel configuration anymore)
2015-11-20 20:09:39 +01:00
titiger
405f327836
"upgrade finished" message only for own faction.
2015-11-18 21:23:27 +01:00
titison
3385220430
Chat/Console message appears when an upgrade finishes.
2015-11-16 20:19:56 +01:00
filux
3ef7a6c1bc
let's do some tests without time stamp, #83
2015-11-15 10:23:17 +01:00
filux
2b06670b10
linux: improved script for headless servers; other scripts more friendly for mods
2015-11-14 00:13:45 +01:00
SoftCoder
f97e8d5fc3
- clipboard working now for utf8
2015-11-11 21:52:22 -08:00
titiger
0bbb65fdda
max textlength in chat is calculated on number of character not bytes
2015-11-12 00:03:17 +01:00
titiger
14877da772
Only send the allowed max size of characters(bytes)
2015-11-11 02:19:54 +01:00
titiger
713dbd3003
problems with groups and non multiselect units fixed. ( issue #80 )
...
Now issue #80 should be completly fixed.
2015-11-11 01:25:28 +01:00
SoftCoder
02772e9498
- fixed paste behaviour
2015-11-09 16:55:52 -08:00
SoftCoder
93e1d9adcd
- try this if its better for special chars
2015-11-09 15:25:12 -08:00
SoftCoder
8c6050ec6f
- fixed backspace and paste with special characters
2015-11-09 14:55:13 -08:00
SoftCoder
312a4e8a64
- try to fix backspace after doing a paste
2015-11-09 13:22:50 -08:00
titiger
07f46f3f7b
bugfix for ctrl-v
2015-11-09 01:48:26 +01:00
titiger
2b1518103a
Merge branch 'develop' of github.com:MegaGlest/megaglest-source into develop
2015-11-09 01:32:20 +01:00
titiger
8d315ba744
first steps for ctrl-v for input
...
Problems remaining:
paste probably iss too long for ( problem for text input labels )
paste is countet as one single input which deletes the whole pasted string
on pressing backspace.
2015-11-09 01:31:24 +01:00
filux
05ca47574d
fix related with 'single install directory' [ci skip]
2015-11-08 22:44:32 +01:00
filux
8a4ee15e59
Merge branch 'develop' into feature/sdl2
2015-11-05 20:45:53 +01:00
titiger
fff2de8bd6
Merge branch 'feature/sdl2' of github.com:MegaGlest/megaglest-source into feature/sdl2
2015-11-03 01:59:16 +01:00
titiger
8686d93b94
fixed additional group assign
...
Still missing is handling of units which are not multiselectable.
2015-11-03 01:58:19 +01:00
filux
00eb81a08b
compilation on mac is again possible; this closes #81 [ci skip]
2015-11-02 19:24:46 +01:00
titiger
dbee447a9a
eventSdlKeyDown
...
Give the real SDL_KEYDOWN to the Window/Program states.
This fixes issues with group keys and SDL2.
2015-10-30 01:04:01 +01:00
SoftCoder
d5edf6f973
- trying to fix issue #71 alt-enter toggle
2015-10-28 16:07:15 -07:00
SoftCoder
cb456840cd
- added null checks for group selection
2015-10-25 09:14:28 -07:00
SoftCoder
897f2b6dd8
- code cleanup, property return value and printf
2015-10-24 18:45:10 -07:00
titiger
3dedf9e8b9
chat with utf8 works ingame too
2015-10-25 02:10:14 +01:00
titiger
b5acf03122
some code cleanup
...
commented code removed
2015-10-25 02:45:13 +02:00
titiger
f6fa7202d5
text input for labels should work in menus
2015-10-25 02:27:19 +02:00
titiger
f632e7c9d7
input for text labels
2015-10-25 00:53:41 +02:00
titiger
30d72c7b3c
backspace, tab extension and length calc should work now in chat manager
2015-10-25 00:06:29 +02:00
titiger
964c776dcd
input of utf8 characters should work in irc chat now
...
backspace does not work yet and all other places with textinput
are still unchanged
2015-10-24 21:33:41 +02:00
SoftCoder
76d41dfc09
- attempt to see if IRC chat works better with sdl2 textinput
2015-10-24 09:02:23 -07:00
SoftCoder
6d0592d4ab
- attempt to fix bugs related to sdl2 key handling
2015-10-17 22:46:42 -07:00
SoftCoder
92aa2a7e04
- updated windows build for sdl2
2015-10-17 17:58:25 -07:00
SoftCoder
45598620fa
- additional bugfixes for keyboard entry in sdl2
2015-10-08 18:25:28 -07:00
SoftCoder
6707343ac4
- fix special keys in sld2 (like arrow key)
2015-10-08 17:04:43 -07:00
titiger
8991507526
Mouse pointer works a bit better
...
SDL2 showed native and MG mouse pointer at the same time. Attempt to fix it.
2015-10-07 02:14:07 +02:00
filux
563837ba7a
new dependency related with curl in the deb family; fixed bug related with unrecognized translated option
2015-10-06 19:31:10 +02:00
SoftCoder
d80ca9e0b2
- for now make fullscreen mode ONLY use desktop resolution, all other tries seem buggy in SDL2
2015-10-04 20:34:54 -07:00
titiger
43e1786613
Window Title can be set in ini file
...
" WindowTitle" is an option in ini file now. Default window name is MegaGlest
2015-10-01 01:26:18 +02:00
SoftCoder
95e5d2782c
- bugfix to get proper typed character in sdl2
2015-09-29 06:22:54 -07:00
SoftCoder
8e439a2325
- got sdl2 branch compiling and game loads
2015-09-28 23:28:11 -07:00
titiger
23ea9f6201
first steps for sdl2 ( still many compile errors )
2015-09-29 01:30:28 +02:00
filux
4bef525bf3
removed not required CURL module, renamed several cmake-build options for be more easy sortable by name
2015-09-27 19:46:35 +02:00
filux
4ad684deaf
updated modules: LUA, GLEW
2015-09-22 01:04:22 +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
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
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
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
filux
245fb6923c
since now you can write also port number in the 'LAN menu'
2015-04-29 20:26:00 +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
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
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
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
filux
e324a8f75c
updated version numbers
2015-02-02 22:23:22 +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
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