Commit Graph

3767 Commits

Author SHA1 Message Date
titiger d420c7e681 forgot to remove a printf 2016-10-30 22:30:51 +01:00
titiger 8dbee3c7c5 Merge branch 'develop' of github.com:MegaGlest/megaglest-source into develop
menu_state_custom game had conflicts
2016-10-30 20:19:22 +01:00
titiger c9b92ea97d map filter for headless servers 2016-10-30 20:19:07 +01:00
SoftCoder b180da5e3d - fixed issue #122 2016-10-30 09:21:34 -07:00
SoftCoder 57c53b9175 - add more details in font error message 2016-10-30 08:41:31 -07:00
titiger 990df3b49b Fix for uniform-selection 2016-10-17 03:00:37 +02:00
titiger 4d99f5900d fix for #133
crash during using "Esc" button in options screen
2016-10-17 00:19:41 +02:00
filux f40ac1d89f corrected math logic 2016-09-13 21:08:02 +02:00
titison 74ed3d73be Uniformselection
Added uniform selection of units.
Uniform means you can select multiple units, but only of the same type.
To make a unit uniform-selectable you need to add
```<uniform-selection value="true"/>```
to the ```<parameters>``` tag of a unit.
2016-08-24 00:53:56 +02:00
filux 3639e111ef fixed some typos, fixes and enlargement for required dependencies 2016-08-09 21:25:41 +02:00
filux 9f301daa1c travis' configuration test; fixed #123 2016-07-17 17:06:01 +02:00
SoftCoder 1621e563da - fix build 2016-06-02 14:01:39 -07:00
SoftCoder f1c372c7b5 - try to fix the build 2016-06-02 13:41:59 -07:00
SoftCoder 798777f313 - fix the build 2016-06-02 12:30:38 -07:00
SoftCoder 05a5ff02d1 - another attempt to fix issue# 111 2016-06-02 12:07:01 -07:00
SoftCoder c3db863434 - attempt to see if this fixes issue# 111 2016-06-01 20:31:46 -07:00
SoftCoder ad4314fb29 - move linux network interface names into ini file for easier management in the future 2016-06-01 20:16:34 -07:00
SoftCoder c5aff25a94 - comment one thread safety check as it was not required 2016-05-27 21:31:39 -07:00
SoftCoder 56494f3cd2 - finally fixing issue #102 (bad cell visible handling when fog of war turned off) 2016-05-27 16:15:27 -07:00
SoftCoder 8a88c4f11e - bugfix for xenial network ip address discovery for LAN games + float truncate 2016-05-23 17:02:44 -07:00
SoftCoder ed6f169d97 - attempt to see if this helps deal with oos when fog of war off 2016-05-23 09:51:50 -07:00
filux bcb8d197d3 fixed some typos [ci skip]
https://lintian.debian.org/full/pkg-games-devel@lists.alioth.debian.org.html#megaglest
2016-02-19 21:17:31 +01:00
titiger c41db9cd16 remove some printf 2016-02-09 02:02:59 +01:00
titiger eb8187fd81 no more error when blocker scenario does not exist 2016-02-09 01:12:24 +01:00
titiger b809ea2233 Proof that you are ready for internet games 2016-02-09 00:48:35 +01:00
filux 064566085e get rid of '$Rev$' 2016-02-04 19:29:25 +01:00
titiger 3de7c586c2 no more black triangles when rendering cliffs
render cliffs made problems sometimes because not 
the whole visible surface was rendered if top left map cell point 
was not in camera view.
2016-01-29 18:36:48 +01:00
filux 570a49164e version number returns to 'dev' 2016-01-24 15:46:49 +01:00
filux aa2d9f7de4 version number for release 2016-01-24 12:00:38 +01:00
SoftCoder d6dbb187cc - fixed some bugs discovered by coverity scan 2016-01-20 21:34:23 -08:00
SoftCoder 1f8096ff81 - finally foudn and fixed color picking crash! 2016-01-18 23:25:31 -08:00
SoftCoder 0d8377d6b4 - try to fix mac build 2016-01-18 15:29:16 -08:00
SoftCoder 86a59859b9 - atempt to cleanup use fo auto_ptr 2016-01-18 13:20:49 -08:00
filux 1125a2b405 added switch for compilation [W]ithout wxWidgets; updated list of deps related with curl 2016-01-18 20:59:21 +01:00
titiger f0f76949df rain is back
It looks bad with so little arin drops.
2016-01-16 18:18:04 +01:00
SoftCoder e7a9c01bf6 - try to add more verbose output on app shutdown 2016-01-14 19:18:03 -08:00
filux 94fdb6f385 less intensive rain in the menu 2016-01-10 16:18:56 +01:00
titiger 8dd7cb21e8 Merge pull request #60 from titison/feature/mapPreviewWithSpecificTileset
Specific Tileset with preview-map option
2016-01-09 19:28:21 +01:00
SoftCoder 35f3b2fa1a code cleanup from clang warnings 2016-01-07 08:48:35 -08:00
SoftCoder fcdc29cc85 - fix issue #91 2016-01-06 22:43:40 -08:00
titiger b36c6cd75c no need for sound initialisation in non audio menus 2016-01-07 01:33:48 +01:00
titiger 6f51e91266 Parameter ServerTitle done the ususal way 2016-01-07 00:51:23 +01:00
SoftCoder d0df67fa7f - fixed issue #95 2016-01-05 21:56:01 -08:00
SoftCoder c25867b5d8 - try to fix mouse pointer for issue #94 2016-01-04 20:56:48 -08:00
titiger f3e96a64c1 new parameter --server-title
see issue #95
2016-01-03 16:31:05 +01:00
filux 92f97c13bd updated year [ci skip] 2016-01-03 10:52:16 +01:00
SoftCoder 01eb7b70d6 - move join game in progress menu option below publish so its not overlapping 2016-01-01 10:50:59 -08:00
SoftCoder 71d8eb2e67 - added more perf logging 2015-12-31 19:21:35 -08:00
SoftCoder 3002baf657 - added more perf logging 2015-12-31 18:58:04 -08:00
SoftCoder 61f77a88f5 - more network speed improvements for one packet netwrok comamndlist 2015-12-31 18:10:21 -08:00
SoftCoder a399f8d1a5 - try to improve launch packet speed and add performance logging for client network code 2015-12-31 16:02:09 -08:00
SoftCoder b54b295ac8 - memory cleanup and fixed from cpcpheck 2015-12-31 14:22:25 -08:00
SoftCoder eb15f8d701 - add compressed network messages for nmtLaunch and nmtBroadCastSetup (not backward compatible) 2015-12-31 13:12:26 -08:00
SoftCoder 888254400e - attempt to speed up sending net comamdns over sockets 2015-12-30 19:58:09 -08:00
SoftCoder 27ed0b88fe - beter checking for dsiconnected socket for sensitive winsock 2015-12-30 18:29:27 -08:00
SoftCoder 3814b9317f - attempt another network speed improvement 2015-12-30 03:07:37 -08:00
SoftCoder 99289e8fe5 - reset bad merge for network ready timeout 2015-12-29 08:08:46 -08:00
SoftCoder ecaf376cb1 - attempt to rollback alst push causing hangs 2015-12-28 19:59:45 -08:00
SoftCoder 196660742a - attempt to fix lagging in lobby and for windows clients 2015-12-28 17:59:26 -08:00
SoftCoder b348a727a5 Merge branch 'develop' of github-softcoder-megaglest:MegaGlest/megaglest-source into develop 2015-12-28 12:55:18 -08:00
SoftCoder c873e72a4f - attempt to see if thsi helsp network play to be more smooth 2015-12-28 12:54:44 -08:00
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 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 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 492a7e4c53 dark background for chat input 2015-12-13 22:56:47 +01: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 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
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 63bf258705 - remove all unused variables as reported by clang (and issue #35) 2015-11-29 16:00:03 -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
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
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
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 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
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 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
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
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 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 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 2d4c4ece8a fixed missing cast found by Coverity CID 1232665 2014-12-16 01:50:12 +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