Rampoina/MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,040 Commits 1 Branch 0 Tags 27 MiB
e4f0e8bfbf
Commit Graph

490 Commits

Author SHA1 Message Date
Mark Vejvoda
e070cf2cbb - added player status for network based games so players can indicate if they are ready to play or not 2011-03-11 11:11:46 +00:00
Mark Vejvoda
ee773ef96b - bugfix in connected client menu (init variables for proper techtree file xfer) 2011-03-10 22:00:59 +00:00
Mark Vejvoda
fe2854e3e0 - force crc refresh right after clearing the cache after file xfer 2011-03-10 21:50:43 +00:00
Mark Vejvoda
330caf7f8a - added a CRC file cache to improve performance of CRC operations for large lists of files 2011-03-10 21:38:43 +00:00
Mark Vejvoda
242b02c001 - added support for better user data customization and default linux path will now be ~/.megaglest/ for user related ini's and data content 2011-03-10 07:26:43 +00:00
Mark Vejvoda
63da3d7af2 - added techtrees for file xfer and CRC checking (might need to turn off etc later but lets test for now) 2011-03-09 23:09:32 +00:00
Mark Vejvoda
ab706e1762 - some code cleanup related to vc++ posix naming warnings 2011-03-09 18:51:26 +00:00
Mark Vejvoda
817d8cfea8 - added logic for ftp file transfers to look for 7z archives for tilesets and download and extract on the client side if the 7z archive exists on the server 2011-03-09 18:35:19 +00:00
Mark Vejvoda
b97687c772 - possible bugfix on windows for special key values 2011-03-09 06:15:09 +00:00
Mark Vejvoda
5b2a6bb45f - bugfix for esc key 2011-03-08 02:07:35 +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
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
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
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
Titus Tscharntke
050a604390 hopefully the masterserver listing works now ... 2011-02-17 00:54:17 +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
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
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
5623866779 - better handling of map preview for different resolutions 2011-02-08 20:17:16 +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
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
dc1033875a fix for status message not shown when inprogress 2011-02-05 00:32:31 +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
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
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
1b6f9c324a - more user friendly messages for scenario errors 2011-01-28 20:16:45 +00:00
Mark Vejvoda
f0c6c1b0c5 - bugfix for privacy settings invalid value sent to server 2011-01-26 21:18:26 +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
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
ed90d620b3 - bugfix to disallow CPU players to be observers 
- spelling mistake fix in error message
 2011-01-25 00:42:09 +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
66261ad662 - updated line endings to unix style characters to fix Bug #3085838 2011-01-20 15:56:30 +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
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
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
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
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
f6b0bd3fd7 - some ftp file transfer bugfixes and moved many strings into language file 2011-01-14 17:57:37 +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
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
fb42c50efd - added guards around CRC checking in client connected menu 2011-01-10 07:32:12 +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
033c56d7f0 cleaned up options menu 2011-01-09 18:05:10 +00:00
Mark Vejvoda
26cdb8ccad - more bugfixes for ftp painting 2011-01-09 09:05:34 +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
1c78fca0fb - Added tileset and map CRC check in the network lobby 
- numerous bugfixes
 2011-01-09 04:49:21 +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
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
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
Titus Tscharntke
5f831db095 beginning of keyboard setup menu ... 2011-01-04 01:39:54 +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
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
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
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
13c6fb49b3 chat highlighting, and more features related to chat 2011-01-01 20:31:25 +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
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
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
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
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
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
6e88e4be4c - got my plumbers suit on and added the plumbing for FTP file xfers 2010-12-29 01:10:53 +00:00
Titus Tscharntke
36c4b4c5fa internet menu updated ( work in progress ) ; checkboxes ; lines 2010-12-27 00:59:57 +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
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
ea4f8e0bcd - added IRC client to the Internet game menu (still need to update VC++ projects) 2010-12-23 00:00:30 +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
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
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
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
Titus Tscharntke
3d277e00e5 but this time its fixed ! 2010-12-17 23:23:45 +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
Titus Tscharntke
ebcadc13f0 Constants for easy/normal/ultra/mega default multipliers 
Multiplier example for scenarios
Version number is only shown with build date and so on for dev versions
 2010-12-11 00:20:31 +00:00
Mark Vejvoda
679557c6f2 - added proper SVN revision handling for CMAKE builds so now the --version and main menu display proper SVN Global Revision # 2010-12-10 01:53:51 +00:00
Mark Vejvoda
045c2f95e8 - added new commandline options to tell the game where to look for data, ini's and where to write logs 2010-12-09 20:41:11 +00:00
Mark Vejvoda
1e0a5dc304 - better stability of menu navigation and threads 2010-12-07 06:12:51 +00:00
Mark Vejvoda
7872e980e1 - updated thread handling slightly in menus to make things more stable 2010-12-05 01:52:38 +00:00
Mark Vejvoda
0537903a7d - updated main menu version # to show compile date / time 2010-12-02 01:04:06 +00:00
Titus Tscharntke
42ebe42155 new tileset fernland 
removed annoying debug of resource multiplier
fixed resource multiplier display in connected menu
 2010-12-01 21:18:29 +00:00
Titus Tscharntke
ede8977aff switched resourcemultiplier to int (using the index now) and added some debug output for testing. 2010-11-25 22:45:08 +00:00
Titus Tscharntke
c2c9cc0044 endgame stats screen shows multiplier now for CPU players 
you cannot switch unvisible resource multiplier any more
 2010-11-11 21:41:13 +00:00
Titus Tscharntke
99c70d301a resource multiplier only for cpu players. 
new resource multiplier defaults for cpu player
resource multiplier only active in advaced options
scenarios can use a new attribute resource_multiplier to setup games
 2010-11-11 01:24:48 +00:00
Mark Vejvoda
559806538f - cleanup stupid warnings on windows (see C4503) 2010-11-10 00:45:26 +00:00
Mark Vejvoda
cc91aed0bd - small bugfix to default CPU multiplier to 1.0 for old saved games 2010-11-09 18:13:21 +00:00
Titus Tscharntke
2440d475b3 beginning of new resource multiplier. Still work in progress but hopefully ready to test some things. 2010-11-08 23:15:50 +00:00
Mark Vejvoda
b52ca80388 - to make ultifd happy, fixed overlapping labels in lobbies 2010-11-05 23:12:46 +00:00
Mark Vejvoda
6b015964bb - menu lobbies uses real player color 
-  chat console no longer prefixes with *
 2010-11-02 20:19:56 +00:00
Mark Vejvoda
9978cbeff5 - added some initial work to support FBO (frame buffer objects) 
- added many NULL check guards throughout the code
- added a safe mutex around ptr access of background thread on custom menu
 2010-11-01 16:44:05 +00:00
Mark Vejvoda
d8c11ebe71 - thread synch bugfix in Internet Lobby Menu (thanks tomreyn for the stack trace) 2010-10-30 17:31:57 +00:00
Mark Vejvoda
f897884321 - fixed problem where custom menu was setting broadcast to master server when loading last game from commandline even though publish was not enabled. 2010-10-30 04:24:26 +00:00
Mark Vejvoda
465ae629ba - cache the techname and selected faction when doing a faction preview in lobbies 2010-10-30 03:29:29 +00:00
Mark Vejvoda
3c57f16a4a - cleanup some compiler warnings in vc++ and removed commented out debug info for in progress texture compression 2010-10-27 17:06:40 +00:00
Mark Vejvoda
3db2b07e90 - removed some unneeded things from the custom game menu (as requested by tomreyn) 2010-10-26 21:52:00 +00:00
Mark Vejvoda
c3d41f5082 - bugfixes to master server communication logic when starting a game. Now we only send updates if the game was published, not for every network game. Also we properly delete the game from the masterserver when it has ended. 2010-10-23 22:06:49 +00:00
Mark Vejvoda
ae8571a406 - added the beginning of some new master server info (very limited) 
- Masterserver menu will show more titles / colors.
    - We keep the game showing in the Masterserver menu while it is in progress.
   - Disable join button when slots are full.
   - Update title with IN PROGRESS when game is being played.
   - PHP Script is backwards compatible with older clients
 2010-10-23 09:06:47 +00:00
Mark Vejvoda
e2610df502 - fixed chatting logic to now retain more info about the user that sent the text in the console manager. Colors now apply to the playername and changing playernames is ok in the lobby andf rendering accounts for this (as well as switching slots) 2010-10-23 04:00:39 +00:00
Mark Vejvoda
6ace9ad571 - added ability to toggle team # from 1 to 8 (for tomreyn) 2010-10-22 17:20:55 +00:00
Mark Vejvoda
8ab3366c66 - added player color coding in lobbies as well as chat console 2010-10-22 07:28:55 +00:00
Mark Vejvoda
be979590c1 - more compiler warning cleanup 2010-10-21 17:42:45 +00:00
Mark Vejvoda
d96bf7f978 - added faction preview images for Random and Observer types (thanks Elimnator) 
- bugfix when choosing random faction and sometimes the game tries to load this as a real faction type
 2010-10-19 03:53:52 +00:00
Mark Vejvoda
59c5fd2581 - moved version checking into one common method in the util file. Now all network related checks use this common method to determine version compatibility 2010-10-15 17:27:00 +00:00
Mark Vejvoda
3d132d11a2 - added an extra guard to the masterserver thread pointer in case something happens in the constructor, now I make sure the thread pointer is set to NULL at the top of the constructor for safety. 2010-10-15 01:52:36 +00:00
Mark Vejvoda
025d8520b6 - bugfix to reset team to 1 when toggling OFF observers and we previously had an observer selected 2010-10-15 00:12:17 +00:00
Mark Vejvoda
4f3d5f0372 - when toggling observers, we now retain original faction selection 2010-10-14 23:22:09 +00:00