Commit Graph

3462 Commits

Author SHA1 Message Date
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 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
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