Commit Graph

994 Commits

Author SHA1 Message Date
Titus Tscharntke
944f6f0eee resource multiplier is not shown on client side for humans ... 2011-01-03 02:35:09 +00:00
Mark Vejvoda
87c1bc5491 - bugfix for socket issue mentioned today in the forums by PT 2011-01-03 02:16:00 +00:00
Titus Tscharntke
bcaf400689 No more MG Bot Messages; IRC chatting is disabled until really connected to irc. 2011-01-02 23:53:59 +00:00
Titus Tscharntke
472aa69c5c You see an error message now if you cannot connect to a server and irc is not quitted. 2011-01-02 18:47:43 +00:00
Mark Vejvoda
8a421ba639 - more error handling in scenarios menu 2011-01-02 17:06:07 +00:00
Mark Vejvoda
37508928f2 - added error checking in constructor of scenarios menu 2011-01-02 16:55:52 +00:00
Titus Tscharntke
d09d29f520 new default settings for ultra/easy/mega ; dansk.lng up to date ; code cleanup 2011-01-02 12:18:14 +00:00
Mark Vejvoda
fabf42c807 - bugfixes for mingw compilers 2011-01-02 10:29:13 +00:00
Mark Vejvoda
e7ee0b81fe - commented out debug printf 2011-01-02 09:34:14 +00:00
Mark Vejvoda
5f4d3e9088 - numerous thread bugfixes related to menu stability and ftp server socket usage 2011-01-02 09:33:37 +00:00
Mark Vejvoda
2b1732e27e - overhaul of thread processing, especially in the menus, things now freeze much less and should be more reliable 2011-01-02 06:46:48 +00:00
Mark Vejvoda
3fed09ab32 - removed a bad out of synch check as it was wrong
- added socket messages when out of synch detected.
2011-01-02 01:48:56 +00:00
Mark Vejvoda
97c5e48006 - more stable handling of backtrace 2011-01-02 01:20:04 +00:00
Mark Vejvoda
896b1c308c - added a backtrace for gcc compiled binary when we get a runtime error.
- added more out of synch checks and better error handling
2011-01-02 00:39:13 +00:00
Titus Tscharntke
67be9b7b40 german languagefile is now up to date; cleaned up the english one a bit ( order ) 2011-01-02 00:28:13 +00:00
Titus Tscharntke
23f9d29769 too much red in the console ;-) 2011-01-01 22:08:34 +00:00
Titus Tscharntke
13c6fb49b3 chat highlighting, and more features related to chat 2011-01-01 20:31:25 +00:00
Mark Vejvoda
f63e76df74 - updated mingw cmake files to work with new libcurl version (requires new ming deps download) 2011-01-01 11:39:04 +00:00
Mark Vejvoda
48ab8b7b32 - added more socket threaded protection and output curl version if ftp transfers fail 2011-01-01 10:16:25 +00:00
Mark Vejvoda
340c80d4c3 - added new commandline parameter: curl-info 2011-01-01 03:32:41 +00:00
Mark Vejvoda
8eeb0b550c - more ftp tileset bugfixes 2011-01-01 03:12:28 +00:00
Mark Vejvoda
2cdb8dd354 - initial work for tileset ftp transfers, needs some testing 2011-01-01 00:50:10 +00:00
Mark Vejvoda
798c88e991 - removed unreferenced variables to cleanup warnings 2010-12-31 21:11:58 +00:00
Mark Vejvoda
7e55a545c4 - added code for ftp client to handle failures and menu exit more gracefully 2010-12-31 21:02:06 +00:00
Titus Tscharntke
9b3e921888 scrollbars and other things ....; scrollbars always visible at the moment ; had some trouble with threads hopefully fixed now. 2010-12-31 17:16:49 +00:00
Mark Vejvoda
d176053da9 - plenty of code cleanup (some refactoring of socket / UPNP code)
- FTP console output now only shows when --verbose used
2010-12-31 08:21:26 +00:00
Mark Vejvoda
3e5f4ee7ab - started some code cleanup of main startup code 2010-12-30 23:18:43 +00:00
Mark Vejvoda
c59807c4cf - fixed local chat echo in clientinterface so that messages intended to be shown locally are properly displayed in the console
- added a success / failure message for downloaded map attempts
2010-12-30 20:48:39 +00:00
Mark Vejvoda
973b546b04 - more bugfixes related to ftp and firewall handling 2010-12-30 20:02:30 +00:00
Mark Vejvoda
64446194e7 - more bugfixes related to ftp and firewall handling 2010-12-30 18:51:25 +00:00
Mark Vejvoda
3f0ee7a6cb - some initial changes to try to get ftp working over the Internet with firewalls etc 2010-12-30 15:56:02 +00:00
Mark Vejvoda
2ca50ee9f9 - attempt to avoid IRC client crashes on Internet menu if user does not have an Internet connection 2010-12-29 21:03:57 +00:00
Mark Vejvoda
4fb1b1092f - added ftp port # as an ini setting and added to UPNP for router auto-config
- added new language string for message box to prompt map file downloads
2010-12-29 20:28:25 +00:00
Mark Vejvoda
be9d8859d4 - messagebox prompt for downloading maps 2010-12-29 19:31:51 +00:00
Titus Tscharntke
41899507a9 better performance for attack warnings ( old code is just commented, will be removed after testing in multiplayer ) 2010-12-29 18:23:54 +00:00
Mark Vejvoda
89a6ae3fe4 - updated win32 vc++ files to compile with new ftp server / client 2010-12-29 16:28:46 +00:00
Mark Vejvoda
d7520dc40b - added a system message when players successfully download a missing map 2010-12-29 08:16:26 +00:00
Mark Vejvoda
d067be26d9 - more ftp bugfixes 2010-12-29 08:10:22 +00:00
Mark Vejvoda
b84bede3df - ftp file xfer bugfixes 2010-12-29 06:11:06 +00:00
Mark Vejvoda
9afcbe97b8 - forgot to default ftp code to a default value (off) until ready 2010-12-29 06:03:07 +00:00
Mark Vejvoda
e79147796f - more ftp updates 2010-12-29 01:32:55 +00:00
Mark Vejvoda
9442c22dc3 - fixed cmake build file to no longer look for libircclient 2010-12-29 01:15:27 +00:00
Mark Vejvoda
6e88e4be4c - got my plumbers suit on and added the plumbing for FTP file xfers 2010-12-29 01:10:53 +00:00
Mark Vejvoda
ba995d1131 - show more friendly message when out of synch detected. 2010-12-28 02:57:36 +00:00
Mark Vejvoda
33aa51b5b5 - if we cannot put the unit in a cell because it is already occupied do not cancel the existing command 2010-12-28 02:24:54 +00:00
Mark Vejvoda
335749a15e - updated hp regeneration method to look for negative hp regen values and if health ticks below 0 the unit dies 2010-12-28 02:17:44 +00:00
Titus Tscharntke
36c4b4c5fa internet menu updated ( work in progress ) ; checkboxes ; lines 2010-12-27 00:59:57 +00:00
Mark Vejvoda
81783e3f1b - bugfix for multi-build, now units look for best cell to build but ALSO that the cell is not occupied by another unit 2010-12-26 04:38:03 +00:00
Mark Vejvoda
409c15d3f0 - more tweaking of threaded logging as well as removal of world synch logging items that are not needed 2010-12-26 01:13:04 +00:00
Mark Vejvoda
b006e72b53 - mutex cleanup in network classes to try to avoid game freeze( hangs) 2010-12-25 22:38:00 +00:00
Mark Vejvoda
bf8be83ccc - bugfix for fog of war enabling at game end.. now works properly for Winning teams, not just losing teams. 2010-12-25 21:30:54 +00:00
Mark Vejvoda
d997e2af5d - bugfix, threaded logging was NOT ever enabled because of a timing bug. Now threaded logging is enabled by default.
- Updated debug UI view to show threaded debug buffer count
2010-12-25 09:15:49 +00:00
Mark Vejvoda
da1adab808 - bugfixes for fog of war enable at game end
- Added more safety guards in threaded sockets in case this causes problems when things get very busy in the game during monster battles
2010-12-25 08:14:35 +00:00
Titus Tscharntke
a3e0ae890b removed unnecessary alarm checks 2010-12-24 10:03:17 +00:00
Mark Vejvoda
03eaa2c033 numerous important bugfixes:
- observers and end game fog of war enable would most likely cause out of synch, I think its fixed now
- better handling of threaded logging
- cleanup of socket thread processing to ensure all network packets get processed properly and in order
2010-12-24 08:43:09 +00:00
nosogo
2a4c9a99cd help and bugfix editor and start of keyboard 2010-12-24 03:36:34 +00:00
Mark Vejvoda
97ee61165a updates to irc use in mastermenu:
- shows local username
- bugfixes for detecting new/dropped users in the irc channel
- lots of cleanup to remove use of so many static variables
2010-12-24 02:10:31 +00:00
Mark Vejvoda
b954d399df - updated vc++ build script to always get the correct SVN revision (must have svnvversion command in the path for the current svn revision to work otherwise it defaults to rev in cpp file) 2010-12-23 23:17:15 +00:00
Mark Vejvoda
554a03279e - commented out assert is it should be handled by the map logic 2010-12-23 20:22:40 +00:00
Mark Vejvoda
809d56e86c - added option to log debug info using a worker thread, by default logging is NOT threaded. To enable:
ThreadedLogging=true
2010-12-23 19:47:40 +00:00
Titus Tscharntke
cfba817280 dansk language; fix for fog of war off; command queuing works a bit better ( especially when attacking ); 2010-12-23 10:44:11 +00:00
Mark Vejvoda
8b0b6300ed - some cleanup for the new IRC client in the Masterserver menu, and changed default channel for in game IRC chat to megaglest-lobby 2010-12-23 07:42:15 +00:00
Mark Vejvoda
1d4de5e423 - updates to cmake for libircclient 2010-12-23 06:56:19 +00:00
Mark Vejvoda
bafc574143 - added custom path for titi's old Ubuntu 2010-12-23 02:24:46 +00:00
Mark Vejvoda
ea4f8e0bcd - added IRC client to the Internet game menu (still need to update VC++ projects) 2010-12-23 00:00:30 +00:00
Mark Vejvoda
69e0130296 - added new --verbose commandline option 2010-12-22 00:31:30 +00:00
Mark Vejvoda
8534fa59a9 - added more stable way of setting thread run state 2010-12-22 00:15:32 +00:00
Titus Tscharntke
df583854c3 only attack warnigs for local players teammates, not for every fight out there! ;-) 2010-12-21 23:15:29 +00:00
Titus Tscharntke
43eb95f1b4 italien translation; Multiattack warnings ( with setting AttackWarnRange ) 2010-12-21 15:55:37 +00:00
Mark Vejvoda
bc90aa7ce4 - added UPNP router auto-configure for Internet games (hurray) 2010-12-21 05:07:10 +00:00
Titus Tscharntke
4037153df9 combined FogOfWar and ShowMapResources in Menus ( on client ist visible too now ) 2010-12-20 21:59:46 +00:00
Titus Tscharntke
6376728241 masterserver urls changed; VersionURL instead of versionURL; 2010-12-20 20:49:25 +00:00
Titus Tscharntke
45a3601286 you can attack teammates again; fix for attack queuing, units don't walk to dead bodies if next attack command is in queue ; 2010-12-20 20:01:14 +00:00
Mark Vejvoda
54f739c15d - added guards around masterserver property access so if missing we handle it more gracefully 2010-12-20 16:45:31 +00:00
Titus Tscharntke
591acdded4 No red 3d arrow pointer is painted when commanding via minimap 2010-12-20 03:12:00 +00:00
Titus Tscharntke
fa952efaf9 next try 2010-12-19 23:58:16 +00:00
Titus Tscharntke
39eefa1e67 trying to fix problems with false attack alarms ... 2010-12-19 23:31:11 +00:00
Titus Tscharntke
5ea9cd092a visual attack alert 2010-12-19 22:33:08 +00:00
Mark Vejvoda
e9c8928b49 - added new option to UI to Show Resources for custom games 2010-12-19 08:36:59 +00:00
Mark Vejvoda
f204d4445c - added a new bit style gamesetting flag for future new game settings.
- added ability to see map resources but still keep fog of war (GAE's shroud of darkness), but not activated by UI yet, tested and works
2010-12-19 08:04:25 +00:00
Mark Vejvoda
1c51b6c21d - code cleanup 2010-12-19 03:30:17 +00:00
Mark Vejvoda
3e83cb54f7 - used wrong enum value 2010-12-19 02:06:24 +00:00
Mark Vejvoda
5c0ebc04b1 - attempt to fix the following assertion failure:
glest.bin: /home/softcoder/Code/megaglest/trunk/source/glest_game/world/map.cpp:833: void Glest::Game::Map::putUnitCells(Glest::Game::Unit*, const Shared::Graphics::Vec2i&): Assertion `getCell(currPos)->getUnit(unit->getCurrField()) == __null' failed.
2010-12-19 02:04:16 +00:00
Mark Vejvoda
1f52a65679 - attempt to fix the following assertion failure:
glest.bin: /home/softcoder/Code/megaglest/trunk/source/glest_game/world/map.cpp:833: void Glest::Game::Map::putUnitCells(Glest::Game::Unit*, const Shared::Graphics::Vec2i&): Assertion `getCell(currPos)->getUnit(unit->getCurrField()) == __null' failed.
2010-12-19 01:24:37 +00:00
Mark Vejvoda
a844b79d3e - fixed an evil socket bug! Sockets in Linux were NOT properly set as non blocking and vice versa as expected. PErhaps this helps with the menu bug 2010-12-18 23:03:53 +00:00
Mark Vejvoda
eb17a1c052 - disable join button when auto searching for servers 2010-12-18 21:38:27 +00:00
Mark Vejvoda
dc87b9b452 - disable join button when auto searching for servers 2010-12-18 21:35:05 +00:00
Mark Vejvoda
3e20d3ffe8 - more menu freeze bugfixes 2010-12-18 21:32:54 +00:00
Titus Tscharntke
886bd3b37e alarmsound when enemy units are seen ( will be improved soon ) 2010-12-18 20:17:41 +00:00
Mark Vejvoda
6a99e2db8e - another attempt to guard socket thread access so avoid menu hang problems 2010-12-18 19:52:47 +00:00
Titus Tscharntke
7305391b6d Unit commanding via minimap 2010-12-18 17:18:36 +00:00
Titus Tscharntke
24a0eb31d8 about screen names fixed again ... 2010-12-18 00:37:59 +00:00
Titus Tscharntke
3d277e00e5 but this time its fixed ! 2010-12-17 23:23:45 +00:00
Mark Vejvoda
fd0875639e - attempt to fix menu hangs, don't believe we need any sleeps in this class 2010-12-17 21:39:31 +00:00
Titus Tscharntke
cf573a56e0 forgot to comment something 2010-12-17 21:36:34 +00:00
Titus Tscharntke
6ed3a3af53 build date removed from internet menu ( space needed for "IN PROGRESS Message" !);
CMake now defaults to RelWithDebInfo
2010-12-17 20:55:46 +00:00
Mark Vejvoda
158acea0b5 - attempt to fix problem with hanging sleep 2010-12-14 00:00:56 +00:00
Mark Vejvoda
8d6e33d4ba - added some extra guards in Network manager (throw exception if things are in a bad state) 2010-12-13 23:39:24 +00:00
Mark Vejvoda
5e410f3066 - bugfix for turning off fog of war on network games when players are dead. Now we DO NOT turn off fog of war until ALL of the players units are dead. 2010-12-13 23:24:03 +00:00
Mark Vejvoda
90fe87098c - added a wait time of 10 seconds max for some thread loops 2010-12-13 23:13:25 +00:00