Commit Graph

1409 Commits

Author SHA1 Message Date
Mark Vejvoda
324a506aac - more debugging for keyboard issues 2011-03-09 06:00:46 +00:00
Titus Tscharntke
ad94506842 gonanas patch! Thank a lot! For me it works, please test ! ( hopefully really no more flickering now ) 2011-03-09 01:46:00 +00:00
Titus Tscharntke
5e844c39e4 particles for ressouces ... the gold will glow tomorrow :-D 2011-03-09 01:32:27 +00:00
Titus Tscharntke
5db11ec538 double click selection for units standing near or in buildings 2011-03-08 20:19:19 +00:00
Mark Vejvoda
5b2a6bb45f - bugfix for esc key 2011-03-08 02:07:35 +00:00
Titus Tscharntke
5494a80233 removed unused isDirty bool ( maybe unstable with tileset particles before ) 2011-03-07 20:19:43 +00:00
Mark Vejvoda
f07b7a3603 - more keyboard bugfixes so some special keys above 255 work 2011-03-06 23:45:46 +00:00
Titus Tscharntke
4874d31ddd hopefully fix for tileset particle related crash in windows; particles must be removed from objects before the particle manager is cleared 2011-03-06 22:50:04 +00:00
Titus Tscharntke
273ab4c502 Option to switch on/off tileset particles 2011-03-06 13:11:22 +00:00
Mark Vejvoda
d75fbe51f6 - another attempt to fix keyboard menu for windows 2011-03-06 07:55:38 +00:00
Mark Vejvoda
d9e6b45052 - another attempt to fix keyboard menu for windows 2011-03-06 07:29:30 +00:00
Mark Vejvoda
9104141efe - added error handling for keyboard menu to see if we get this far in windows 2011-03-06 07:18:34 +00:00
Mark Vejvoda
9382473294 - attempt to make a few tweaks for more smooth network play 2011-03-05 20:15:28 +00:00
Titus Tscharntke
fefed3e3ce No more flickering! Thanks gonana ! ; Tilesetparticles are only rendered/calculated when visible now 2011-03-05 14:34:36 +00:00
Mark Vejvoda
dcecb1ba8d - carving pathfinder to 500 and disabling pathfinder cache to see if it performs better. 2011-03-05 08:01:48 +00:00
Mark Vejvoda
935895c89f - configurable keys can be edited in keyboard menu now 2011-03-04 22:54:04 +00:00
Mark Vejvoda
0f57fe6b92 - additional work to allow for changing hotkeys in the keyboard options menu, currently changes are not saved to file, only on screen. 2011-03-04 20:26:47 +00:00
Mark Vejvoda
744602d0e3 - more keyboard handler cleanup related to special key presses (like shift) 2011-03-04 00:46:45 +00:00
Titus Tscharntke
792d0aa665 particles for tilesets ( too much rendered at the moment ) 2011-03-01 23:36:33 +00:00
Mark Vejvoda
4975882ea2 - cleanup some useless warnings (thanks johndh) 2011-02-28 23:33:11 +00:00
Mark Vejvoda
1136f056ce - added performance logging for new ai unblock rule when perf logging enabled 2011-02-28 16:47:01 +00:00
Mark Vejvoda
45a646ffef - carved back max nodes in pathfinder to 600 2011-02-28 16:45:15 +00:00
Mark Vejvoda
c679c4bfe0 - set pathfinder max to 800 (From 1200) 2011-02-26 00:47:41 +00:00
Mark Vejvoda
823fd842d4 - added NULL guard for units without a move command to avoid segfault 2011-02-26 00:41:00 +00:00
Mark Vejvoda
bced200dd1 - bugfix when bad values are in map file, game would freeze at game start due to endless loop 2011-02-25 22:13:11 +00:00
Mark Vejvoda
9de151d975 - added more things to try to improve pathfinding (especially for the AI)
AI players should now detect when units are blocked (surrounded by other units from same faction) and tell the other units to move out of the way
2011-02-25 16:32:27 +00:00
Mark Vejvoda
c4795eb6cb - more fixing of map corner position actions causing memory access violations (this will further stabilize the code) 2011-02-25 04:15:22 +00:00
Titus Tscharntke
922df8e025 up to 36 units selectable; maps can set camera heigth now ( be careful with this for performance reasons! ) 2011-02-25 00:31:42 +00:00
Mark Vejvoda
4cb2485cdf - fixed meeting point crash on edge of map 2011-02-24 22:13:40 +00:00
Titus Tscharntke
25204e0084 I just removed an unneeded check 2011-02-24 20:14:12 +00:00
Mark Vejvoda
d300c5635b - bugfix for selection circle on units on the edge of map cells 2011-02-23 21:54:51 +00:00
Mark Vejvoda
16c7316887 - initial attempt to enable pathfinder caching (think it might work now). Please test 2011-02-23 07:03:38 +00:00
Mark Vejvoda
53e8d96092 - removed printf 2011-02-23 00:00:44 +00:00
Mark Vejvoda
77fb1b6d15 - bugfix for building units at edges of maps 2011-02-22 23:59:21 +00:00
Mark Vejvoda
8d8ed75990 - bugfix for building units at edges of maps 2011-02-22 22:25:03 +00:00
Titus Tscharntke
a06cb541b1 units with move skill have higher priority while selecting now than those without move skill ( typically buildings ) 2011-02-22 16:18:44 +00:00
Mark Vejvoda
bd29260fef - Does this fix choppy network play? Please test and let me know 2011-02-21 01:34:31 +00:00
James McCulloch
2def669678 fix fp flags on windoze release build (solves RoutePlanner sync problems)
init streflop in 'no denormals' mode (just in case)
2011-02-20 23:17:22 +00:00
Mark Vejvoda
b2ae0f3b7b - reverted morph to original code to see if this fixes out of synch (from muwums original change) 2011-02-20 00:04:57 +00:00
Mark Vejvoda
92ca6ba75d - attempt to see if this change corrects out of synch 2011-02-19 22:36:59 +00:00
Mark Vejvoda
755bed6553 - attempt to fix crash at intro screen 2011-02-18 16:15:14 +00:00
Titus Tscharntke
050a604390 hopefully the masterserver listing works now ... 2011-02-17 00:54:17 +00:00
Mark Vejvoda
69a7f8f1d6 - hopefully stabilized pathfinder for network play so we won't get out of synch 2011-02-16 19:44:12 +00:00
Mark Vejvoda
7a5de218b7 - chasing down out of synch 2011-02-16 04:43:27 +00:00
Mark Vejvoda
14c5b87da4 - debugging out of synch (make bailout logic optional) 2011-02-16 03:48:13 +00:00
Mark Vejvoda
a0cfe3fa08 - a few changes and now seems to compile in VC++ 2010 (still need to checkin project files) 2011-02-15 23:53:48 +00:00
Mark Vejvoda
8ec58868dc - attempt to improve network performance (use separate mutexes for read / write operations) 2011-02-15 07:49:40 +00:00
Mark Vejvoda
2357e2cfd1 - Titi, fixed the remove object so its done in the Object destructor (using an interface) 2011-02-15 04:34:19 +00:00
Mark Vejvoda
31e722287f - bugfixes for when players disconnect, do not switch observers to AI and only show message once.
- Attempts to debug/improve network performance
2011-02-15 03:32:14 +00:00
Titus Tscharntke
01db66105e status of serverline display fix / ressources are no longer selectable via rectangle ( which was quite useless ) 2011-02-15 00:24:31 +00:00
Titus Tscharntke
a214fa87f5 clickable resources with display ; softcoder please look at unit_updater.cpp line 1032 2011-02-13 21:04:30 +00:00
Titus Tscharntke
62a2b7cc94 bugfix for target selection 2011-02-13 16:46:32 +00:00
Titus Tscharntke
30da435fc2 target selection for ressource objects is done with opengl picking now 2011-02-13 14:35:17 +00:00
Mark Vejvoda
737f95e5dd - for testing made max pathfinder nodecount configurable 2011-02-13 03:31:05 +00:00
Mark Vejvoda
4488a4d388 - make pathfinder caching an ini setting tso its easy to test (disabled by default)
- some code cleanup related to threads and sockets
2011-02-13 03:06:12 +00:00
Mark Vejvoda
91a56e7805 - another segfault bugfix for spawned attacks 2011-02-12 21:47:31 +00:00
Mark Vejvoda
7dcb12ff60 - some more memory cleanup 2011-02-12 09:08:50 +00:00
Mark Vejvoda
c1ee5df801 - attempt to shutdown sdl in a more controlled way 2011-02-12 08:05:18 +00:00
Mark Vejvoda
cc973f3427 - bugfixes, some related to things pointed out by valgrind, some from opengl research and some for more stable operation 2011-02-12 07:34:32 +00:00
Mark Vejvoda
d056486ec4 - disable a cache that i think causes out of synch 2011-02-12 01:13:52 +00:00
Mark Vejvoda
0533ce2c63 - a simple attempt to improve pathfinder performance (this needs to be tested well and can easily be disabled by setting: const bool tryLastPathCache = false;) 2011-02-11 23:32:24 +00:00
Mark Vejvoda
34e95f5cd5 - streflop was disabled (likely when we switched to cmake). Turn it on for now but we need to investigate more thoroughly if we really need this? 2011-02-11 19:16:06 +00:00
Mark Vejvoda
cab252c220 - more expansion of the maximum distance the pathfinder will calculate, this is required for proper play with cliffs 2011-02-11 16:43:57 +00:00
Mark Vejvoda
41907b7728 - increase pathfinders range for better results with cliffs 2011-02-11 07:51:29 +00:00
Mark Vejvoda
b5e4eb53d8 - added numerous guards around spawn code because we had a number of crashes from this code somehow tonight 2011-02-11 07:39:58 +00:00
Mark Vejvoda
2d0912ae19 - attempt to fix some network performance issues 2011-02-11 05:36:01 +00:00
Mark Vejvoda
7cae047f15 - added more code guards around morph validation
- some render debug info
2011-02-11 04:48:17 +00:00
Mark Vejvoda
2d76d348c7 - bugfix to put priority on attacking units first 2011-02-10 22:54:49 +00:00
Mark Vejvoda
39e4d62133 - attempted bugfix for click like mad morph causing out of synch 2011-02-10 21:02:07 +00:00
Titus Tscharntke
91abdd3ed4 camera max height/ default are calculated based on the max height of a map 2011-02-10 00:14:21 +00:00
Mark Vejvoda
12dcc54c5a - more conversions to vertex arrays 2011-02-09 08:04:21 +00:00
Mark Vejvoda
bcc82a381d - again M$ compiler madness, absolute insanity, its why I love gcc and hate vc 2011-02-09 01:42:58 +00:00
Mark Vejvoda
49d7f5f036 - more rendering speed improvements (conversion of main portions of minimap to vertex arrays) 2011-02-09 01:27:41 +00:00
Titus Tscharntke
e20162a3c4 cleaned up the cliff coding; hopefully really no more flickering now 2011-02-08 20:59:34 +00:00
Mark Vejvoda
5623866779 - better handling of map preview for different resolutions 2011-02-08 20:17:16 +00:00
Mark Vejvoda
17e2a87890 - fixed one type of freeze in the custom menu
- some small opengl changes
2011-02-08 18:23:41 +00:00
Mark Vejvoda
a2b9ca9e18 - some smaller rendering improvements to surface render 2011-02-08 07:35:37 +00:00
Mark Vejvoda
86baa04a3b - added FBO's for map preview rendering, which improves fps in the custom menu for video cards that support Frame Buffer Objects 2011-02-08 05:54:05 +00:00
Titus Tscharntke
e03b029bea Cliffs work and some map cleanup; ( !!currently old maps are broken in editor!! ) 2011-02-08 03:50:59 +00:00
Titus Tscharntke
e856d5e4f0 MuwuMs changes ( spawn attack and more ) 2011-02-06 18:33:49 +00:00
Mark Vejvoda
c58e893047 - attempt to improve issues in the custom menu related to freezing
- modified debug UI display to support multi levels of UI debug info
- added more validations to mutexes
- improved client sockets to properly be setup as non blocking
2011-02-06 07:01:54 +00:00
Titus Tscharntke
f2caf186f9 step1 for cliffs; enable manually in map.cpp in Map::smoothSurface(...) ; set minCliffHeightDifference to 3.0f 2011-02-06 01:36:55 +00:00
Mark Vejvoda
ef3aaacbc2 - reverted back to original surface rendering due to memory issues that need to be looked at eventually 2011-02-06 00:46:40 +00:00
Mark Vejvoda
6052ee6cc7 - bugfix to clear surface data cache on game exit (lest we overfill system RAM) 2011-02-05 05:50:42 +00:00
Mark Vejvoda
25f1cdaae6 - updated surface rendering to improve performance (currently VBO's disabled for surface rendering because they somehow seem to give worse performance) 2011-02-05 05:07:05 +00:00
Titus Tscharntke
dc1033875a fix for status message not shown when inprogress 2011-02-05 00:32:31 +00:00
Mark Vejvoda
1574e05fcd - surface rendering is a step closer to using VBO's (code now works using Vertex Arrays, next stop Vertex Buffer Objects) 2011-02-04 23:27:55 +00:00
Mark Vejvoda
6ec92f2127 - attempt to add more randomness to pathfinding and faster AI decsions 2011-02-04 06:34:32 +00:00
Mark Vejvoda
ab9d2f1bf2 - some small cleanup in vbo code 2011-02-04 02:26:55 +00:00
Mark Vejvoda
dab57fcb34 - attempt to add "some" VBO rendering for static models (need to test if this improves performance in different environments) 2011-02-04 01:24:26 +00:00
Mark Vejvoda
5fd1bbe855 - updated version # for next dev cycle 2011-02-03 19:20:26 +00:00
Mark Vejvoda
2498d44cd3 - updated AI code for special empty cellmap units, so AI does not look for them (since they already cannot attack them) 2011-02-03 19:19:27 +00:00
Mark Vejvoda
145b71970e - set version to 3.4.0 in prep for release 2011-01-31 23:50:06 +00:00
Mark Vejvoda
325ea2515a - nicely formatted out of synch messages (one per line).. all for tomreyn's happiness :) 2011-01-31 23:36:13 +00:00
Mark Vejvoda
0b4eef10c5 - added a very useful way to track mutex usage and performance timings of mutex locking to discover thread lock issues 2011-01-31 23:01:39 +00:00
Mark Vejvoda
b8075eaf01 - added code to rename duplicate maps and show a warning at game start 2011-01-31 21:59:28 +00:00
Titus Tscharntke
d7a65ed18e fix for updateAttackStopped and command queuing;
switching tilesets react with delay like switching maps; 
new/updated maps; 
reverted egypt mining slave model;
many loading screens for scenarios
2011-01-30 23:01:55 +00:00
Mark Vejvoda
7397ff0368 - updated version to beta3 in prep for another beta
- updated romans_beta:
 - removed long-bowmen
 - change ballista to only have 1 attack for both air and ground
 - requires more use of stone now
2011-01-30 00:55:00 +00:00
Mark Vejvoda
4b085691df - added new LUA method togglePauseGame 2011-01-29 23:50:21 +00:00
Mark Vejvoda
f2467faebe - added wxWidgets version info to g3d viewer help and map editor
- added a log entry if sound thread starts to log
2011-01-29 21:20:33 +00:00
Titus Tscharntke
7d09f24b9e 5 seconds delay to switch over maps you don't want to distribute ( maybe tilesets shoudl do the same? ) 2011-01-29 20:13:29 +00:00
Mark Vejvoda
a5a6cf76d6 - updated some new lua commands 2011-01-29 17:52:53 +00:00
Mark Vejvoda
041289770e - cleaned up more compiler warnings in VC++ 2011-01-29 17:42:34 +00:00
Mark Vejvoda
1a3545f8ab - cleaned up compiler warnings in g3d viewer
- added a bunch of new lua commands for 'da boys' to be documented after being fully tested.
2011-01-29 12:42:18 +00:00
Mark Vejvoda
1b6f9c324a - more user friendly messages for scenario errors 2011-01-28 20:16:45 +00:00
mnaumann
0218c7bbf8 - set version string back to v3.4.0-dev (as requested by titi) 2011-01-28 15:03:40 +00:00
Mark Vejvoda
bbab778738 - attempt for improved harvesting when congested 2011-01-28 08:58:16 +00:00
Mark Vejvoda
177531c376 - commented out some debug statements and corrected stuck harvesting a bit 2011-01-28 08:37:48 +00:00
Mark Vejvoda
23135b5bab - when units get congested now we try to randomly pick different approaches to find resources 2011-01-28 07:17:32 +00:00
Mark Vejvoda
9adf8bcc62 - a few more logging entries for future debugging needs 2011-01-28 02:32:55 +00:00
Mark Vejvoda
1c558abef0 - bugfix for observers to see water effects 2011-01-27 22:17:31 +00:00
Mark Vejvoda
ab7cf4d22b - a cup of tea for m0llemeister (bugfix for observers to see attack particles) 2011-01-27 22:10:44 +00:00
Mark Vejvoda
f0c6c1b0c5 - bugfix for privacy settings invalid value sent to server 2011-01-26 21:18:26 +00:00
Mark Vejvoda
ff3bb353fc - bugfix for game over and player can see whole map causing out of synch in some cases. 2011-01-26 16:13:08 +00:00
Mark Vejvoda
d10054f1c3 - moved sound system debug into a new debugSound property to lessen the impact of regular debug logging since sound processing is now threaded and therefore logging sound system items may slow down performance
- added texture caching for faction preview textures
2011-01-26 09:09:59 +00:00
Mark Vejvoda
7c54e5e955 - added privacy option to options menu 2011-01-25 23:30:51 +00:00
Mark Vejvoda
909d36e457 - added privacy setting for country indicator. Add this to glestuser.ini to hide your country when hosting:
PrivacyPlease=true
2011-01-25 22:55:53 +00:00
Mark Vejvoda
e15c5b48e3 - null pointer check when slots are switching in game lobby (thanks tomreyn) 2011-01-25 22:43:39 +00:00
Mark Vejvoda
52ffe988b7 - bugfix for masterserver new field had a newline on wrong field (added some verbose debug when enabled for masterserver data) 2011-01-25 22:03:04 +00:00
Titus Tscharntke
66471d8ef4 masterserver menu rearranged ( ip and tileset are not longer shown ) 2011-01-25 21:45:42 +00:00
Mark Vejvoda
fbdd3a0a8f - fixed country filename lookup to be lowercase 2011-01-25 19:04:52 +00:00
Mark Vejvoda
e06639c78d - updated Internet games to use 2 new fields, country and game status.
for now svn users can edit glestuser.ini and add the following entry (pointing to your folder of course) to see the country flags in game:
CountryTexturePath=/home/softcoder/Code/megaglest/trunk/source/masterserver/flags
2011-01-25 07:41:12 +00:00
Mark Vejvoda
4670935fd0 - added a new check is there is a connection lost during command execution we now display a Connection Lost error along with possible out of synch. 2011-01-25 00:54:37 +00:00
Mark Vejvoda
ed90d620b3 - bugfix to disallow CPU players to be observers
- spelling mistake fix in error message
2011-01-25 00:42:09 +00:00
Titus Tscharntke
9faa63fd27 upgraded or upgrading upgrades still show their info 2011-01-23 23:57:46 +00:00
Mark Vejvoda
787db6df9f - updated version # to beta2 (for screenshot fix) 2011-01-22 18:29:51 +00:00
Mark Vejvoda
15e4792e32 - updated version # to beta1 2011-01-22 07:08:46 +00:00
Mark Vejvoda
d3db6a370c - attempt to shutdown program and threads on unhandled exceptiosn to avoid bad results (thanks for finding this ElimNator) 2011-01-22 01:23:45 +00:00
Mark Vejvoda
c5def0c3c2 - disable backtrace when running tech validation report 2011-01-22 00:57:32 +00:00
Mark Vejvoda
dde0abd04b - some in progress work for next release 2011-01-21 22:41:05 +00:00
Mark Vejvoda
895dde0de6 - added an IRC connection status label to the masterserver menu 2011-01-20 21:11:39 +00:00
Mark Vejvoda
b73045b349 - turn off music playing while game is loading 2011-01-20 19:56:11 +00:00
Mark Vejvoda
66261ad662 - updated line endings to unix style characters to fix Bug #3085838 2011-01-20 15:56:30 +00:00
Mark Vejvoda
a2b9754895 - changed some limit values related to lag checking to be a little more patient 2011-01-20 08:25:09 +00:00
Mark Vejvoda
fdaf9438d8 - added code so Alt-Enter etc. works during game loading phase 2011-01-20 08:19:14 +00:00
Mark Vejvoda
60b58eb44c - bugfix for multi-build segfault under special conditions (discovered today) 2011-01-20 07:56:02 +00:00
Mark Vejvoda
6b0bc35e3c - working VBO code for static objects in game, currently disabled in code but to enabled edit model.h and uncomment #define ENABLE_VBO_CODE 2011-01-18 23:56:30 +00:00
mnaumann
7c15f58286 www.megaglest.org 2011-01-18 21:58:04 +00:00
Mark Vejvoda
c54e6dbf5d - a little bit of plumbing for VBO's for static models (currently disabled via # define)
- small small speed improvement when calculating interpolations
2011-01-18 07:52:06 +00:00
Mark Vejvoda
55d213435a - changed music change-over during game start so that background music continues to play while waiting for network clients 2011-01-18 04:56:42 +00:00
Mark Vejvoda
d16f6a93bc - sound system is now threaded by default (hopefully this fixes buffer underruns errors from openal)
- background music now plays when game is loading
2011-01-18 01:24:45 +00:00
Mark Vejvoda
9ba8668751 - win32 winsock bugfixes causing havok and grief for win32 users (corrupt winsock stack due to extra call to wsacleanup) 2011-01-17 23:45:09 +00:00
Mark Vejvoda
d8e28fbf90 - attempt to fix WSAStartup error message on win32 2011-01-17 21:31:59 +00:00
Mark Vejvoda
c51eb0a3c4 - attempt to cleanup some debug logging to see if it helps restore normal performance 2011-01-17 16:31:25 +00:00
Mark Vejvoda
6d08797a14 - commented out another ftp console output 2011-01-16 06:41:48 +00:00
Mark Vejvoda
43f2677bad - disabled more console output for ftp 2011-01-16 04:15:18 +00:00
Mark Vejvoda
385fb0b3f0 - bunch of bugfixes for FTP file transfer:
- failed attempts should now properly cleanup partial downloaded files
  - better logging and resource usage to track down problems
2011-01-15 21:53:00 +00:00
Mark Vejvoda
67e0c27b60 - ftp connect change in master menu 2011-01-15 19:22:59 +00:00
Mark Vejvoda
934b430f93 - added more logging to see what client FTP port # will be 2011-01-15 19:16:00 +00:00
Mark Vejvoda
e6f69a3839 - added code for server to tell clients which port to use for FTP 2011-01-15 18:56:03 +00:00
Mark Vejvoda
c6e809ec97 - removed deprecated code from renderer since we have good success with the visible quad cache 2011-01-15 08:45:17 +00:00
Mark Vejvoda
a7ca23d18e - speed improvement for anti-hack checking 2011-01-15 04:13:15 +00:00
Mark Vejvoda
3dac5df814 - wacky vc++ compile bugfix, code was changed in other header files and now std::max fails! 2011-01-15 00:29:25 +00:00
Mark Vejvoda
2ab82c9271 - added some basic protection against memory hacking tools 2011-01-14 23:51:15 +00:00
Mark Vejvoda
ccaaf5ab35 - simple attempt to avoid one small type of cheating related to resource values (please test this tomreyn) 2011-01-14 21:16:43 +00:00
Mark Vejvoda
f6b0bd3fd7 - some ftp file transfer bugfixes and moved many strings into language file 2011-01-14 17:57:37 +00:00
Mark Vejvoda
a8f982ad2b - rollback last change since now we know what the problem is 2011-01-14 01:50:54 +00:00
Titus Tscharntke
0cb64ca1fa Selection bugfix? Lets see if this one line fix really fixes it... 2011-01-14 01:14:38 +00:00
Mark Vejvoda
469cf14b92 - FINALLY fixed freeze with tomreyn's fuzzer and helped further stabilize mutexes and network messages in threads. 2011-01-13 08:17:18 +00:00
Mark Vejvoda
6f601777ef - another bsd compiler fix
- added new command param for testing disable of backtrace
2011-01-13 01:52:34 +00:00
Mark Vejvoda
8c4cdd037c - updated for compiling on BSD
- also bugfix for socket broadcast segfault (partial fix)
2011-01-13 01:46:32 +00:00
Titus Tscharntke
fec68c872a Some changed external ports for ftp; switch ftp ports according to external port; Menu looks a bit more friendly(less fog) 2011-01-12 19:42:25 +00:00
Mark Vejvoda
0a01f98c4e - a few tweaks to lag limit / handling values 2011-01-12 07:03:29 +00:00
Mark Vejvoda
26a382bd64 - added queued broadcast message ability and tried to fix tomreyn's fuzzer program issue 2011-01-12 00:16:50 +00:00
Mark Vejvoda
ccbd707ae1 - numerous bugfixes including fixing a slowdown introduced in a previous recent checkin.
- Added Network Text Message queue as this is required in some tricky cases
- added more logging of memory cleanup events
- added memory safe snprintf calls
2011-01-11 22:09:46 +00:00
Mark Vejvoda
227f39ccf9 - bugfixes for connection slot disconnect handling 2011-01-11 20:02:07 +00:00
Mark Vejvoda
1a7716dbdd - bugfix for disconnected clients 2011-01-11 19:16:48 +00:00
Mark Vejvoda
a7f6a592ff - try to better handle socket disconnects 2011-01-11 18:39:18 +00:00
Mark Vejvoda
e319c2cf62 - attempt to fix game freeze when lag causes game pauses 2011-01-11 08:45:58 +00:00
Mark Vejvoda
b778098d13 - bugfix for multi-build discovered during testing (left a break statement when shouldn't have) 2011-01-11 05:18:53 +00:00
Mark Vejvoda
d9e7dcc69a - another attempt to fix socket send freeze 2011-01-11 03:56:38 +00:00
Mark Vejvoda
1225eecdf0 - attempt to fix the socket send freeze bug 2011-01-11 00:59:08 +00:00
Mark Vejvoda
35925a98a6 - attempt to fix tomreyns socket fuzzer 2011-01-10 21:00:55 +00:00
Mark Vejvoda
fb91c2b624 - added a new check for duplicate data (maps, tilesets and techtree names) 2011-01-10 20:27:25 +00:00
Mark Vejvoda
52fd9bfb6f - added another check to socket mutex processing to try avoid potential deadlocks 2011-01-10 15:50:16 +00:00
Mark Vejvoda
d301f5873d - bugfix for multi-build bug found by tomreyn (looks like an infinite loop) 2011-01-10 15:31:40 +00:00
Mark Vejvoda
fb42c50efd - added guards around CRC checking in client connected menu 2011-01-10 07:32:12 +00:00
Mark Vejvoda
9b275a5077 - added guard against NULL commandtype clicking in icon panel (discovered during testing) 2011-01-10 06:43:47 +00:00
Mark Vejvoda
b201cebf3b - added a new validation for faction validation report AND game load for attack-var since a negative value will segfault the game 2011-01-10 05:44:45 +00:00
Mark Vejvoda
18a0a93a8e - move return button placement on video info menu 2011-01-10 05:06:00 +00:00
Mark Vejvoda
3dd6f244e6 - bugfix for CRC handling in connected menu 2011-01-10 00:33:40 +00:00
Mark Vejvoda
7bc6b603b9 - lua bugfix for fog of war toggling
- ftp client bugfix for reported segfault
2011-01-10 00:05:31 +00:00
Titus Tscharntke
38da21ae18 fix in german languagefile, buildings can set meeting points when under construction 2011-01-09 20:52:00 +00:00
Titus Tscharntke
033c56d7f0 cleaned up options menu 2011-01-09 18:05:10 +00:00
Titus Tscharntke
6d94548b4f loading progress a bit more detailed 2011-01-09 12:41:08 +00:00
Mark Vejvoda
b5a139033a - added game loading progress bar 2011-01-09 10:03:33 +00:00
Mark Vejvoda
2d6203bd21 - ftp progressbar calculation error fix 2011-01-09 09:32:32 +00:00
Mark Vejvoda
26cdb8ccad - more bugfixes for ftp painting 2011-01-09 09:05:34 +00:00
Mark Vejvoda
5a8f05e8af - better messagebox painting
- bugfix for progress bar painting
2011-01-09 08:43:25 +00:00
Mark Vejvoda
74824fe753 - added some ftp logging to network debug log 2011-01-09 07:37:59 +00:00
Mark Vejvoda
94862e2671 - attempt to make ftp messagebox appear on top 2011-01-09 05:59:35 +00:00
Mark Vejvoda
31be2df752 - ftp bugfix for a segfault discovered 2011-01-09 05:12:48 +00:00
Mark Vejvoda
1c78fca0fb - Added tileset and map CRC check in the network lobby
- numerous bugfixes
2011-01-09 04:49:21 +00:00
Titus Tscharntke
2e60d3e0a8 no more error when no upgrade is defined in a faction 2011-01-09 01:02:50 +00:00
Mark Vejvoda
7347dc9545 - bugfix for multi-build queued commands 2011-01-08 21:53:05 +00:00
Mark Vejvoda
b30fe62528 - to appease the security freaks, ONLY clients that are ALREADY connected in the lobby are able to connect to the built in FTP server now 2011-01-07 06:21:23 +00:00
Mark Vejvoda
02b7787b35 - added an option to disable FTP server but keep ftp client 2011-01-07 05:32:47 +00:00
Mark Vejvoda
ec467b6ac4 - bugfix, when a unit morphs we now add to stored resource count if the unit is of that type (used to only work when building, now works during a morph) 2011-01-07 05:15:39 +00:00
Mark Vejvoda
a6cd69d9ed - a few bugfixes pointed out by tomreyn.. thanks 2011-01-07 04:32:41 +00:00
Mark Vejvoda
3e809c8c8e - added warnings for gcc for functions that are defined to return a value but they do not
- fixed a few defines that do the above
2011-01-06 23:31:07 +00:00
Mark Vejvoda
2956d2c782 - set FTP file transfers to be enabled by default 2011-01-06 07:17:02 +00:00
Mark Vejvoda
9698e6cc95 - added FTP settings to options menu 2011-01-06 07:15:43 +00:00
Mark Vejvoda
a5a744fcad - updated FTP code to use specific ports for MG and not random FTP ports 2011-01-06 00:52:00 +00:00
Mark Vejvoda
b5dd9591da - bugfix clinet connected menu and FTP transfer thread mutex 2011-01-04 22:14:42 +00:00
Mark Vejvoda
a029b92b2c - bugfix clinet connected menu and FTP transfer thread mutex 2011-01-04 22:13:49 +00:00
Mark Vejvoda
b8e272519c - updates to file transfer progress bar 2011-01-04 20:00:39 +00:00
Mark Vejvoda
f3eee457c0 - added an in progress bar when downloading tilesets
- clear the CRC cache after a new file is downloaded
2011-01-04 08:44:00 +00:00
Mark Vejvoda
b385d4c2b1 - bugfix for static inclusion of libcurl 2011-01-04 02:55:45 +00:00
Titus Tscharntke
5f831db095 beginning of keyboard setup menu ... 2011-01-04 01:39:54 +00:00
Mark Vejvoda
f7d2631879 - added a few more special keys for available use as hotkeys (vkPause and vkPrint) 2011-01-03 22:22:52 +00:00
Mark Vejvoda
4de585f5b8 - bugfix for merging ini properties (missed a line of code) 2011-01-03 22:03:41 +00:00
Mark Vejvoda
5495dcabac - nice formatting for ini settings 2011-01-03 21:28:43 +00:00
Mark Vejvoda
3978e85048 - fixed typo 2011-01-03 21:00:50 +00:00
Mark Vejvoda
21c1da2e18 - added a new commandline parameter to display merged ini settings and also to filter on a specific ini setting 2011-01-03 20:59:18 +00:00
Titus Tscharntke
5bb98fa261 Chat in custom game menu is only active if network slots are open; No more screenshots and debug toggling while chatting in Internet Menu; typo fix 2011-01-03 12:41:20 +00:00
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