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
193609490f Merge pull request #61 from filux/lower-waiting-time 
let's try lower waiting time for the multi-player game
 2015-12-27 19:26:38 +01:00
filux
1f1156b9b6 few second less + should look better on the loading screen 2015-12-27 19:12:00 +01:00
SoftCoder
08713078b6 - fix headless network comamnd bug 2015-12-26 13:14:22 -08:00
SoftCoder
6eb7a1e625 - little code cleanup in socket code 2015-12-26 09:34:55 -08:00
SoftCoder
9792b9695b - attempt to fix socket issues causing hangs 2015-12-25 23:12:00 -08:00
SoftCoder
c9fb0160dc - attempt to fix hand in windwos network games 2015-12-25 14:08:54 -08:00
SoftCoder
ff2fb03c78 - attempt safe socket code to avoid hangs 2015-12-23 21:37:35 -08:00
SoftCoder
9f55e9235a - last try to optimize socket thread locks 2015-12-23 14:26:03 -08:00
SoftCoder
a8b735ffcc - check to see if this corrects the current windows client hang in network games 2015-12-23 12:42:39 -08:00
SoftCoder
2f52e01a76 - fixed issue #88 (numpad keys work now) 2015-12-22 23:12:33 -08:00
SoftCoder
b3c9140574 - try to fix windows client lag 2015-12-22 20:40:31 -08:00
SoftCoder
c56641e0a0 - attempt to see if this fixes issue #92 2015-12-16 16:51:14 -08:00
filux
0cad944118 implemented appdata 2/2 2015-12-14 23:57:05 +01:00
titiger
19df221af2 reintroducing mapping of numpad enter to normal one 
tomreyn convinced me that numpad-enter and normal enter should always 
be handled the same way. 
Doing this I also enabled the mapping of delete to backspace .
 2015-12-14 01:20:09 +01:00
titiger
492a7e4c53 dark background for chat input 2015-12-13 22:56:47 +01:00
SoftCoder
b83414380c - attempt to fix issue# 89 2015-12-12 22:01:48 -08:00
titiger
4f5ecb13e5 Position of scenario settings changed in custom menu 2015-12-13 03:00:35 +01:00
titiger
01673dbb39 fix for #90 2015-12-10 01:28:09 +01:00
filux
a5a1e2b717 tiny polishing related with gcc & wxWidgets 2015-12-07 17:20:58 +01:00
filux
36a88fe57c fix for bug related with customModTexture and data path (required relative path to texture file in the .ini) 2015-12-05 18:38:21 +01:00
SoftCoder
38cc0e5459 - fixed issue #87 and issue #88 2015-12-03 19:56:01 -08:00
titiger
982137afed remove remapping of keys, like numpad keys to normal and vice versa 2015-12-02 01:26:44 +01:00
filux
30a53e700c Merge pull request #62 from filux/less-conf-irc-messages 
let's try to use this
 2015-12-01 19:46:50 +01:00
titiger
c51599f4fe Coverty scan 1308703; Logically dead code 2015-11-30 20:53:04 +01:00
SoftCoder
cfa9f38155 - another bugfix from coverity 2015-11-29 17:07:49 -08:00
SoftCoder
63bf258705 - remove all unused variables as reported by clang (and issue #35) 2015-11-29 16:00:03 -08:00
SoftCoder
9fc7b9f72c - attempt streflop bugfix for win64 2015-11-28 20:38:05 -08:00
SoftCoder
7e0494bb28 - some bug fixes based on coverity scan 2015-11-25 21:16:29 -08:00
titiger
e7eddca1ee Bugfix for listBox Shortcuts 
Holding down shift+letter while selecting  jumps directly to a 
map/faction/ ... which starts with the given letter.
 2015-11-26 01:58:15 +01:00
SoftCoder
96eeb2e72e Merge branch 'develop' of github-softcoder-megaglest:MegaGlest/megaglest-source into develop 2015-11-21 11:46:28 -08:00
SoftCoder
15d5a9bbd6 - bug fixes for non C++x11 compilers for using chrono 2015-11-21 11:45:52 -08:00
titiger
84cbf1ff3c Merge branch 'develop' of github.com:MegaGlest/megaglest-source into develop 2015-11-21 20:31:24 +01:00
SoftCoder
49ae35e7cf - thread safe localtime and hopefully back to good performance 2015-11-21 11:30:23 -08:00
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
SoftCoder
9e0d227172 - attempt to see if this fixes thread locking performance issues in windows 2015-11-21 10:23:45 -08: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
filux
f594e8a037 removed one redundant message [ci skip] 2015-11-16 21:49:20 +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
492d821e0b - small code cleanup 2015-11-12 04:18:08 -08: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
09c686f82d - applied fix for issue #50 2015-10-28 20:01:21 +01:00
SoftCoder
860fd788f2 - fixed issue #75 (map editor file->new refreshes afterwards) 2015-10-28 20:01:03 +01:00
SoftCoder
8499d25bde - applied fix for issue #50 2015-10-26 20:29:27 -07:00
SoftCoder
952e0a6315 - editor and g3d viewer work in wxwidgets 3.0.2 2015-10-26 19:49:25 -07:00
SoftCoder
88c536a8c6 - fixed issue #75 (map editor file->new refreshes afterwards) 2015-10-26 17:26:42 -07:00
filux
465e718637 and one more fix for mac 2015-10-26 21:19:31 +01:00
filux
9932920712 few improvements in compilation on mac 2015-10-26 20:56:55 +01: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
75077c4a50 - added support for miniupnpc 1.9, this fixes #79 (cherry-pick to develop & RC) 2015-10-22 17:34:14 +02:00
SoftCoder
49ce8e729b - added support for miniupnpc 1.9 2015-10-21 18:11:19 -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
titiger
c402509853 no more SDL_WINDOW_RESIZABLE 
This gave strange effects with missing parts on the screen 
and bad mouse positioning. No more window resize in windowed 
mode, likein old MG
 2015-10-13 02:29:19 +02:00
filux
48d0d2afbf updated deployment target for macos; added info about used wxWidgests' libs [ci skip] 2015-10-09 18:16:12 +02: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
SoftCoder
9e6e4dd6fe - try to fix fullscreen mode a little better 2015-10-04 14:03:12 -07:00
SoftCoder
32f3729f0a - attempt to fix res changage in fullscreen 2015-10-04 13:30:17 -07:00
SoftCoder
5b9eccd10b - allow changing resolution in video settings menu 2015-10-02 17:27:55 -07:00
SoftCoder
5a29608b9c - attempt to fix keyboard inputs for sdl2 2015-10-01 03:40:19 -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
titiger
9dda6b59dc toggle fullscreen/windowed works again 2015-09-29 21:37:26 +02:00
SoftCoder
95e5d2782c - bugfix to get proper typed character in sdl2 2015-09-29 06:22:54 -07:00
SoftCoder
41ae158a9c - bugfix for sdl2 compile using wrong object 2015-09-29 02:13:49 -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
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