Commit Graph

390 Commits

Author SHA1 Message Date
PolitikerNEU
6d4697f2ba Tried to fix the command-queing bug not canceling attack on produce command 2010-05-18 21:18:51 +00:00
Mark Vejvoda
f010130c38 - stupid bugfix for win32 Vista / Windows 7 bug where alt-tab causes no mouse to be seen in windows desktop. 2010-05-18 06:36:47 +00:00
Mark Vejvoda
b69d808a0b - added loads of debug potential. We can now output most objects as a string for logging purposes.
- when we get the command type id not found error we now dump the whole world to a textfile
- Pressing the | hotkey at any time during a game dumps the whole world to a textfile
2010-05-18 03:53:57 +00:00
Mark Vejvoda
258cd1fea1 - bugfixes for custom port# configurations
- changed version to alpha2
2010-05-17 20:41:18 +00:00
Mark Vejvoda
ab5369a090 bugfix for endswith needs to check >= not just > 2010-05-17 20:05:35 +00:00
Titus Tscharntke
70383f2a30 better handling of attention sound / errormessages ... 2010-05-17 20:05:31 +00:00
Mark Vejvoda
8be87ee362 - bugfix for network game settings broadcast and game end fog of war fix 2010-05-17 16:02:47 +00:00
Mark Vejvoda
272a072ec3 added client socket accept info to debug log as well as some change detection 2010-05-17 06:41:05 +00:00
Mark Vejvoda
5ea892ba1a updated masterserver logic to more properly handle success and error conditions. 2010-05-17 05:38:07 +00:00
Titus Tscharntke
5a57113cac masterserver should be able to check the routersetup now ( important part is still uncommented ) 2010-05-16 23:03:22 +00:00
Titus Tscharntke
a6992ee686 sound effects if new servers are available or player joins. ( new data attention.wav is needed !)
menu navigation is corrected.
camera movement for new menues ( new menu.xml needed! )
2010-05-16 16:40:21 +00:00
Mark Vejvoda
3ba034b8bf Added more safety guards for mastermenu if we get exceptions thrown within the thread, now it won't crash the game 2010-05-16 03:31:12 +00:00
Mark Vejvoda
83dbaf7886 added hotkey of ? as a way to toggle on/off the debug UI display 2010-05-15 19:51:58 +00:00
Mark Vejvoda
1ae2a9ae10 - Added partial threaded network server handling of incoming socket data to try to improve performance
- Small changes to client network handling to be more accurate and efficient
- Added observer mode when a user loses a network game
2010-05-15 18:59:17 +00:00
Mark Vejvoda
9ab6732f86 added some safety checks if user does not have masterserver setup properly 2010-05-15 18:49:45 +00:00
Titus Tscharntke
6548c42d38 autorefresh
direct create game ( not completly finished yet )
2010-05-15 18:40:58 +00:00
Mark Vejvoda
0f6605fc4a made a few performance improvements for file scanning logic 2010-05-14 07:02:17 +00:00
Mark Vejvoda
0f83bdf58f updated version # to show alpha state of new multi-platform / master-server mega-glest 2010-05-13 23:08:52 +00:00
Mark Vejvoda
a585a6663f - added some bugfixes related to timing ans corrupt state in network and regular game menus 2010-05-13 21:47:14 +00:00
Titus Tscharntke
036cc5e0f3 language files
new menu cameras prepared
2010-05-13 21:07:43 +00:00
Titus Tscharntke
9163d75fcc masterserver works again 2010-05-13 11:19:10 +00:00
Mark Vejvoda
a7e7b00cba added another thread shutdown 2010-05-13 07:24:59 +00:00
Mark Vejvoda
c5485be4da - updates to language keynames and english strings
- added some more protection for shutdown of threads
2010-05-13 07:22:33 +00:00
Mark Vejvoda
4fc043ddb6 more bullet proofing of network activity 2010-05-13 07:13:53 +00:00
Mark Vejvoda
57d0420b76 Added some threading for URL calls for new masterserver game play 2010-05-13 06:43:56 +00:00
Titus Tscharntke
55d7c6eebc looks a bit better now 2010-05-13 00:42:49 +00:00
Titus Tscharntke
9fb3352dfe masterserver ( work in progress ) 2010-05-12 22:58:00 +00:00
Mark Vejvoda
36c7ccfff1 Added a few new version methods for compilter and platform 2010-05-12 22:54:42 +00:00
Titus Tscharntke
23ebbb15ad getCompileDateTime 2010-05-12 22:44:41 +00:00
Mark Vejvoda
43c00d5740 - removed interpolation thread as it did nothing to help performance.
- added a cache in the interpolation class
2010-05-12 21:49:12 +00:00
Mark Vejvoda
319b672e20 added better handling of network connections:
- only listen for new clients on a server if an open slot exists (unconnected)
- for both server and client we wait a max of 10 seconds to receive a proper intro packet or we disconnect (could have connected to / from a non glest application using the same port)
2010-05-12 15:25:56 +00:00
Mark Vejvoda
25b63b10e1 - Added libcurl to mega-glest for mu;ti-purpose / multi-platform http and ftp requests
(for linux requires the following new dependency: sudo apt-get install libcurl4-dev)
2010-05-11 05:39:00 +00:00
Mark Vejvoda
f7b6ef8450 commented out debug statements to remove some noise from logs 2010-05-10 23:58:07 +00:00
Mark Vejvoda
f091df9954 - added a more simpler version of right click to set meeting point from RCL 2010-05-10 23:56:55 +00:00
Mark Vejvoda
e7d06aebc3 commented out interpolation thread since it doesn't seem to improve anything. 2010-05-10 19:51:53 +00:00
Mark Vejvoda
a68ae2fdfb fixed teamcolor bug from last code checkins dealing with threaded interpolation 2010-05-10 19:35:56 +00:00
Mark Vejvoda
cde5a52fd3 - experiemental code to process interpolation calcs in a background thread
Requires a new setting to be turned on in glest.ini:
ThreadedInterpolation=true
2010-05-10 17:50:57 +00:00
Titus Tscharntke
13a1630e69 first steps for masterserver join menu 2010-05-09 21:23:13 +00:00
Mark Vejvoda
247cf32531 - Removed yet another platform specific remanant no longer required (win32 threads) since we use sdl threads 2010-05-08 09:40:25 +00:00
Mark Vejvoda
3547276699 - added a special thread to calculate interpolation to try to improve performance 2010-05-08 09:06:30 +00:00
Titus Tscharntke
54bcbf4303 watereffects in right place for big units 2010-05-07 08:01:14 +00:00
Mark Vejvoda
f192b33153 bugfix for stubbing out macro of logging code for win32 2010-05-07 07:18:54 +00:00
Mark Vejvoda
8aa14009d1 - added a more proper #define setup to completely stub out debugging to test performance
(simply uncomment #define UNDEF_DEBUG and the debug statements become nothing)
- Added piles of experimental changes for testing different performance scenarios (all of these changes are turned off by default and will most likely eventually be removed)
2010-05-07 06:46:55 +00:00
Mark Vejvoda
1a6bb489b8 - bugfix for language files in scenarios and tutorials
- added numerous performance profiling statements
2010-05-06 21:29:46 +00:00
Titus Tscharntke
304b6653e9 icons with colored frames
default map startup size raised to 128x128 
startup screensize raised to 1024x768
2010-05-04 22:55:22 +00:00
Mark Vejvoda
605dd746c0 some bugfixes for silly compile errors and painting issues in windoze 2010-05-04 08:15:16 +00:00
Mark Vejvoda
4b1a392f00 Bugfixes for network game launching:
- discard inprogress messages that don't apply during launch
- added better error handling of disconnects during game launch and play on both server and clients
2010-05-04 02:32:43 +00:00
Titus Tscharntke
acf4bebba6 GAE map editor ported to megaglest 2010-05-04 00:22:11 +00:00
Titus Tscharntke
73be43d6ad some (possible) bugs are fixed when starting but not all. Discussion needed . 2010-05-04 00:05:10 +00:00
Titus Tscharntke
0dd135fc12 windowed/fullscreen switch in options ( needed for windows )
watereffect improved for big unnits ( ElimiNator should test it )
2010-05-03 22:07:27 +00:00
Mark Vejvoda
1efc2dc0a6 - updates to Chinese font support so Linux will compile
- added more debugging and NULL guards
2010-05-03 06:25:54 +00:00
Mark Vejvoda
c3793d0cfb Added initial code changes to support Chinese Fonts 2010-05-03 06:16:32 +00:00
Mark Vejvoda
677da7f9d5 uncommented some streflop restore statements in lua calls 2010-05-02 14:49:58 +00:00
Mark Vejvoda
abf05a2ae6 - Fixed some bugs related to logfile processing.
- Added debug project to win32 projects
- Changed some compiler settings for win32 projects to enable sse
2010-05-02 06:21:36 +00:00
Mark Vejvoda
63aff0751c Updates to get things compiling under linux properly with streflop 2010-05-02 03:48:40 +00:00
Mark Vejvoda
7b9036345b streflop updates 2010-05-01 21:07:17 +00:00
Mark Vejvoda
5a1c48d148 added wrapper for streflop 2010-05-01 20:39:11 +00:00
Mark Vejvoda
e05062d6ea hopefully the bugfix for lua problems and streflop 2010-05-01 20:37:25 +00:00
Mark Vejvoda
04bb6659ce Added more debugging and option to disable new streflop usage. 2010-05-01 20:14:25 +00:00
Mark Vejvoda
2417f37e21 added more debugging for error conditions 2010-05-01 10:46:56 +00:00
Mark Vejvoda
77fccb8c4c a few win32 compile fixes 2010-05-01 09:39:20 +00:00
Mark Vejvoda
58386a72e8 Bugfix for cases where command cache was not yet initialized 2010-05-01 09:27:08 +00:00
Mark Vejvoda
e379905942 Added mutex guards around logging 2010-05-01 09:10:52 +00:00
Mark Vejvoda
a911088d39 Trying an experiment with a thread for playing streamed sounds 2010-05-01 04:34:23 +00:00
Mark Vejvoda
ff592be457 Some cleanup related to Cache Management 2010-05-01 01:22:48 +00:00
Mark Vejvoda
33084f8dbe bug fixes for CRC caching and working version of cache manager 2010-05-01 00:53:43 +00:00
Mark Vejvoda
5cf84e8a2a win32 compile fixes 2010-04-30 23:30:15 +00:00
Mark Vejvoda
fd2274775e moved threads into base common hiearchy and started an a new cache manager. 2010-04-30 22:54:24 +00:00
Mark Vejvoda
b10bb3c2bc moved common platform code into shared are for win32 projects 2010-04-30 19:01:47 +00:00
Titus Tscharntke
3e7f3ed485 client slot selection bug hopefully fixed 2010-04-30 18:36:38 +00:00
Mark Vejvoda
c53ff62c46 Moved most of the code from platform specific platform_util into a shared platform_common area 2010-04-30 18:16:54 +00:00
Mark Vejvoda
6577762297 - Added a new pre-Cache thread for CRC value calculation
- Added support in the client UI if multiple local LAN servers are discovered.
2010-04-30 06:45:30 +00:00
Mark Vejvoda
35cd622f43 changed max network command batch size to use unsigned int to allow more commands to be sent at once 2010-04-30 02:41:42 +00:00
Mark Vejvoda
e7cb595ae8 small change to compiler version stamp 2010-04-30 02:34:19 +00:00
Mark Vejvoda
19cd66fc2d Changed compiler stamp in version string 2010-04-30 02:20:27 +00:00
Mark Vejvoda
e8aa5083cb Added new binary compatibility check 2010-04-30 01:32:37 +00:00
Titus Tscharntke
0687a56e27 clients can choose their slots 2010-04-30 01:08:29 +00:00
Mark Vejvoda
140a304541 changed world synch logging locations 2010-04-29 17:00:14 +00:00
Mark Vejvoda
cc08074acf more caching and bug fixes for data synch compare 2010-04-29 08:36:37 +00:00
Mark Vejvoda
4f147b2d89 Added more guards and debug info related to network play 2010-04-29 07:59:44 +00:00
Mark Vejvoda
805015fd83 Updates to cache CRC values and folder traversal lookup 2010-04-29 06:10:51 +00:00
Mark Vejvoda
712b09c928 Added a guard for switching game settings on server from networked clients 2010-04-29 00:44:27 +00:00
Mark Vejvoda
ff32f34bfe change the way we get CRC for a list of files since folder scans don't sort the same on different platforms 2010-04-29 00:34:43 +00:00
Titus Tscharntke
50341e9db6 clients can choose team and faction ... client triggered slot change is prepared 2010-04-28 23:59:37 +00:00
Mark Vejvoda
a750d4eda9 bugfix for logfile sharing 2010-04-28 22:34:10 +00:00
Mark Vejvoda
76c256880e Added win32 version of glob to allow windows clients the ability to do unix like folder traversal 2010-04-28 21:49:03 +00:00
Mark Vejvoda
aad5c056a3 Added more info in data synch check debugging 2010-04-28 21:38:15 +00:00
Mark Vejvoda
5af308125b - Cleanup of logging code to properly manage multiple logs etc
- Cleaned up a bunch of compiler warnings (conversion from int to float and vice versa)
2010-04-27 20:38:34 +00:00
Mark Vejvoda
cfe7d8cec8 Updated world synch logging so we can better compare exact results every 40 frames 2010-04-27 14:10:53 +00:00
Mark Vejvoda
6d4838f470 Changed the logging system to be more flexible and to support world synch logging 2010-04-27 03:36:36 +00:00
Mark Vejvoda
3dc0e69441 Added FPU Safety check method 2010-04-24 12:22:35 +00:00
Mark Vejvoda
472e34dc6c HAd to add a #define for includes on non WIN32 platform 2010-04-24 11:33:50 +00:00
Mark Vejvoda
1d6f3ebe58 fixed broken build (renabled some header files) 2010-04-24 11:22:59 +00:00
Mark Vejvoda
f748874601 Ported streflop code to win32 2010-04-24 11:15:15 +00:00
Mark Vejvoda
2bfaa4d1d7 Added streflop (standalone reproducible floating point library) layer to mega-glest (initial checkin only) and changed a few areas to use the library in linux 2010-04-24 03:57:38 +00:00
Mark Vejvoda
a50b89e9cc Ported 3.3.4.2 fixes to trunk 2010-04-23 04:29:11 +00:00
Mark Vejvoda
a0fbe84054 Updated version # for last minor release of 3.3.4 2010-04-23 14:14:47 +00:00
Mark Vejvoda
afcdc1209c Changed fow setting to use a property instead of lua method 2010-04-23 14:08:19 +00:00
Mark Vejvoda
2e702d8dd8 One final bugfix for 3.3.4.2 release, click mouse buttons > 2 on some mice would cause a crash 2010-04-23 04:24:20 +00:00
Mark Vejvoda
ae2af01c2e Updated version # for new minor bugfix release 2010-04-23 02:53:57 +00:00
Mark Vejvoda
a01c0adb78 Added a new lua script function called: unfogMap to allow scenarios and tutorials to turn off fog of war. 2010-04-23 02:48:56 +00:00
Mark Vejvoda
4869b68b7a Disconnect client when server changes the map and the client is in a slot that is no longer a network slot. 2010-04-23 00:14:22 +00:00
Titus Tscharntke
edd3b66273 connected playernames and free slots are shown on the client.
some bugfixes
2010-04-22 23:18:04 +00:00
Titus Tscharntke
e692e6efee memory problems 2010-04-22 22:08:56 +00:00
Titus Tscharntke
e0c55688e3 used network slot is marked with Human instead of Network now 2010-04-21 23:26:10 +00:00
Titus Tscharntke
06660e3a17 clients can see which setups are made on the server. ( work in progress !)
menu gfx-components can be set editable/non editable now
+ in addition fixed several memory problems and FOW in scenarios ...)
2010-04-21 23:13:39 +00:00
Mark Vejvoda
ca10bd5776 Bugfixes for 3.3.4 defects found:
- Fog of War always turned off in scenarios and tutorials
- memory cleanup in join menu
- removed dsound.dll  copying from batch file
2010-04-20 23:23:06 +00:00
PolitikerNEU
21a1932bbb tried to fix a bug with upgrades 2010-04-20 17:32:09 +00:00
Mark Vejvoda
d412cb5f79 Added a bunch of NULL pointer guards, changed undertake to cleanup dead units more safely and added more debug tracing 2010-04-20 02:19:37 +00:00
PolitikerNEU
54db1e20f6 Chaning of the queuing key is easier 2010-04-18 19:28:52 +00:00
PolitikerNEU
e06e964728 Added queing commands with shift 2010-04-18 07:35:48 +00:00
Mark Vejvoda
e9453ae7d1 Updated version # for current development 2010-04-18 06:01:20 +00:00
Mark Vejvoda
3d670be353 Changed ver # in preparation for a new release 2010-04-16 08:29:58 +00:00
Titus Tscharntke
304739e990 'm' is no longer use dto move units ( I think noone ever used it ) Its used to display faded messages now
Releasenotes are in the reame.txt now
2010-04-16 00:07:32 +00:00
Titus Tscharntke
e02a81d1a2 press escape to abort chatting 2010-04-15 21:16:13 +00:00
Mark Vejvoda
6a9dcdcf7e Added some extra guards for NULL 2010-04-15 05:06:15 +00:00
Mark Vejvoda
30c4eb2b96 Added some performance logging capabilities and socket cleanup for new broadcast thread sockets 2010-04-15 01:19:00 +00:00
Titus Tscharntke
e5d9631a9f watersounds playing all over the map is fixed.
'M' key shows faded console messages again (currently ingame only )
2010-04-14 20:49:14 +00:00
Mark Vejvoda
4c8e4eaccb bugfix for silly legacy error that was thrown just because the user clicks a mouse button that the game didn't support. Just log the message now instead of throwing errors. 2010-04-13 23:55:07 +00:00
Mark Vejvoda
80f5ee91d5 bugfix to disable alt-enter in win32 2010-04-13 20:20:51 +00:00
Titus Tscharntke
8099e9db96 version number position in intro 2010-04-13 19:08:08 +00:00
Mark Vejvoda
8b90f2bf64 Cleanup from the fallout of porting file locking to win32 2010-04-13 17:14:42 +00:00
Mark Vejvoda
0657004da2 Ported debug file locking mechanism to win32 2010-04-13 17:09:49 +00:00
Mark Vejvoda
feb61e0598 Added a special file locking mechanism to the debug logging which allows testing multi-user to seperate logfiles automatically 2010-04-13 16:00:19 +00:00
Mark Vejvoda
8c438b812d Some final fixed related to combined cross platform socket code 2010-04-13 07:29:48 +00:00
Mark Vejvoda
561dd69107 First Attempt at merging socket code into cross platform classes 2010-04-13 06:59:30 +00:00
Mark Vejvoda
2c9b6ea3ee Ported bugfix to win32 2010-04-12 21:54:47 +00:00
Mark Vejvoda
a5aba5cc66 Bugfix for tracker#: 2985599
- Added better management of UDP broadcast thread when user toggles on/off network slots.
2010-04-12 21:40:57 +00:00
Mark Vejvoda
4e12d8dbcf Bugfix for tracker#: 2985601
- Added checking for NULL pointer as well as clients now check connection state of the server during load.
2010-04-12 20:32:47 +00:00
Mark Vejvoda
f7df0fd3d4 Bugfix for LAN autofind servers. Needed to change the way we broadcast UDP so that we do it individually for each NIC's broadcast address. (see: http://stackoverflow.com/questions/683624/udp-broadcast-on-all-interfaces) 2010-04-11 07:13:14 +00:00
Mark Vejvoda
da230fc73d Bugfix for LAN autofind servers. Needed to change the way we broadcast UDP so that we do it individually for each NIC's broadcast address. (see: http://stackoverflow.com/questions/683624/udp-broadcast-on-all-interfaces) 2010-04-11 07:12:56 +00:00
Mark Vejvoda
203d37bb6f Added status update for LAN server searching and guard against people who click find like mad. 2010-04-11 04:29:23 +00:00
Mark Vejvoda
af87e53bbe Bugfix for trace bug#: 2984991
falling back to english text for scenarios text. 
- Also added more error checking and commented out some excessive debug output statements.
2010-04-11 01:25:06 +00:00
Titus Tscharntke
ac6deedd93 fixed the null pointer exception related to font colors while chatting in the menu
setting version to 3.3.4-dev
2010-04-11 00:45:09 +00:00
Mark Vejvoda
63743aeedb Added more error condition checks and re-throw runtime_error in SDL event handler so we get a nice messagebox in the game 2010-04-09 07:44:23 +00:00
Mark Vejvoda
06b21ca4ee Bugfix for win32 loading jpg texture's 2010-04-09 06:51:13 +00:00
Titus Tscharntke
be9739cf29 3.3.3 2010-04-08 20:44:34 +00:00
Titus Tscharntke
f5e21ae896 ingame fontcolor change with key 'C' is back 2010-04-08 20:19:25 +00:00
Mark Vejvoda
a71f0d0e7c Bugfixes:
- Allow for load screens for networked clients
- Reworked the font loading for win32 so it will respect font names and sizes
- Disabled Alt-Enter for win32
2010-04-08 01:12:55 +00:00
Titus Tscharntke
d5a55f6a83 fonts can be scaled from options menu and more switches are in glest.ini
helvetica is used for linux
fire fix for blacksmith
persian elephant chaged a little bit for balance ( I think he is still too strong )
2010-04-07 22:20:28 +00:00
Titus Tscharntke
e290b6db82 resolution switch for windows fixed ( hopefully ) 2010-04-07 16:38:14 +00:00
Mark Vejvoda
b16b0f00fc Bugfix for release so if the current used resolution string isn't properly detected we add it at the end.
- Updated win32 glest.ini and win32 installer script
2010-04-06 23:50:06 +00:00
Mark Vejvoda
ff65495829 Changed ver # in preparation for a new release 2010-04-06 20:44:06 +00:00
Titus Tscharntke
1f76690cf5 loading screens for the factions
its possible to define a loading screen for a techtree too.
2010-04-06 20:15:06 +00:00
Mark Vejvoda
40f5097a07 SLight change to win32 re-init when doing ctrl-enter (a small speed up) 2010-04-06 20:10:38 +00:00
Mark Vejvoda
9a2b958869 bugfix for ctrl + # grouping of units in win32 2010-04-06 14:25:00 +00:00
Mark Vejvoda
99c03d25bc Added some debug output for keypress events 2010-04-06 14:09:42 +00:00
Mark Vejvoda
436f46fcba Added support for OpenAL in win32 2010-04-06 05:30:22 +00:00
Mark Vejvoda
d38a1f8877 Bugfix for cheating when the harvest command type has changed to a different command. Got this from Silnarm. 2010-04-06 03:28:20 +00:00
Mark Vejvoda
ec7e741ad3 Updated screen loading feature to support all supported image types 2010-04-05 21:41:33 +00:00