Commit Graph

1749 Commits

Author SHA1 Message Date
Mark Vejvoda
c196e1ccfc - try to see if this fixes an opengl bug, by retrying texture loading using older opengl API if newer fails 2011-04-05 21:10:20 +00:00
Mark Vejvoda
9cb1cd7bc8 - bugfixes related to multi-language text messaging 2011-04-05 20:19:25 +00:00
Mark Vejvoda
4a27e75891 - initial work to support multi-language text messages 2011-04-05 18:39:47 +00:00
Mark Vejvoda
4fb33d34ce - moved a few more strings into the language file 2011-04-05 14:59:48 +00:00
Mark Vejvoda
5b119d1378 - added the word 'victory' to show in green also when player is on victories team 2011-04-05 14:33:31 +00:00
Mark Vejvoda
0f52b630d7 - on battle end stats screen we show each item in green that the player had a best score. (ties are allowed) 2011-04-05 14:28:40 +00:00
Mark Vejvoda
f694c745f7 - winner has a small crown under their name now :) 2011-04-05 13:34:54 +00:00
Mark Vejvoda
5add2da254 - mingw compile fixes, now it seems to properly compile and runs under wine again :) 2011-04-05 12:57:52 +00:00
Mark Vejvoda
22328e0666 - mingw based compiling seems to work again with this fix 2011-04-05 07:32:36 +00:00
Mark Vejvoda
eaf10434b0 - bugfixes for compiling on older wxwidgets 2011-04-05 07:10:12 +00:00
Mark Vejvoda
1f433d6339 - bugfixes for compiling on older wxwidgets and also for mingw 2011-04-05 07:08:29 +00:00
Mark Vejvoda
0fce64897e - added a few more things to end game stats as requested by ultifd
(now we can tell the difference between killed units and killed enemy units and final score is based on killed enemy units not all killed units)
2011-04-05 06:32:23 +00:00
Mark Vejvoda
ebbdf2d2c2 - by default route planner is disabled for release, need to add the following to the ini to get it to show up:
EnableRoutePlannerPathfinder=true
2011-04-05 05:49:04 +00:00
Mark Vejvoda
0ad84a6920 - stupid stupid stupid Microsoft, I CANNOT BELEIVE IT THIS TIME!!! They broke their STL implementation in VC++ 2010! This fixes a problem using the inserter class.
see: http://code.google.com/p/angel-engine/issues/detail?id=34
2011-04-05 05:43:30 +00:00
Mark Vejvoda
bdb4db9756 - fixed loss of username sometimes when changing slots in network game lobby 2011-04-05 05:32:35 +00:00
Mark Vejvoda
53642bc7c7 - updated vc++ 2008 project files to handle default path for map editor and g3d viewer 2011-04-05 05:23:28 +00:00
Mark Vejvoda
f684e7f356 - updated g3dviewer and map editor to default to the userdata folder areas 2011-04-05 04:49:48 +00:00
Titus Tscharntke
5cd4824c94 default techtree and map ( if available ) , jpg default for screenshots 2011-04-04 23:11:59 +00:00
Mark Vejvoda
064addf888 - update ver# because current svn code not compatible with beta1 2011-04-04 18:32:16 +00:00
Mark Vejvoda
5fd59eb00f - added more debug info and error output to detect failures to write file data during file xfers 2011-04-04 17:56:47 +00:00
Mark Vejvoda
f91c4a8707 - added a new disabled field for mod data (and now disabled munchy until it is fixed) 2011-04-04 17:37:53 +00:00
Mark Vejvoda
e9ef00a213 - added more error checking in mod menu when retrieving masterserver data 2011-04-04 17:03:07 +00:00
Mark Vejvoda
6a35db6031 - do not render player status for closed slots 2011-04-04 05:06:22 +00:00
Mark Vejvoda
a48406a592 - attempt to fix bailout pathfinding logic to have better performance 2011-04-04 04:32:01 +00:00
Mark Vejvoda
d610c0fbd2 - added individual factions to crc pre-processing for better performance 2011-04-03 07:23:15 +00:00
Mark Vejvoda
d4d250f2b6 - more efficient handling of faction CRC calc in menus 2011-04-03 07:09:54 +00:00
Mark Vejvoda
678fca2aad - disable faction threads when user selects route planner pathfinder (fixes current crash) 2011-04-03 06:18:21 +00:00
Mark Vejvoda
7b14d860c9 - attempt to log more info related to CRC processing
- better thread mutex tracking
2011-04-03 06:09:43 +00:00
Mark Vejvoda
755378b0b1 - we now rename duplicate tilesets and techtrees also at program startup (with a warning message) 2011-04-03 04:15:25 +00:00
Mark Vejvoda
a58d4bb360 - only save ini for join menu if server IP address is different from the value already stored. 2011-04-03 02:47:46 +00:00
Mark Vejvoda
cd952fcda0 - updated world synch debug calls to only log outside of faction pre-calculated pathfinding 2011-04-03 02:42:45 +00:00
Mark Vejvoda
6384c4c611 - bugfix for auto-loading scenarios, new timer for the scenario preview was being called when the menu was already destroyed sometimes. 2011-04-03 02:11:45 +00:00
Mark Vejvoda
cf706491e1 - added screenshot file format to options menu
- more cleanup from things discovered with valgrind.
- added an environment variable to use with openal so it is possible to specify which sound device to use if needed down the road
2011-04-02 21:17:17 +00:00
Mark Vejvoda
54469e9090 - updated version # to 3.5.0.-beta1 2011-03-31 23:38:49 +00:00
Mark Vejvoda
acbb11b327 - bugfix for tileset crc calc (was cached and did not always update the cached value) 2011-03-31 23:26:32 +00:00
Mark Vejvoda
623dfe7aa5 - updated pathfinder max to 400 2011-03-31 19:08:52 +00:00
Mark Vejvoda
e3584c26ef - cancel button only shows is manually enabled in ini
- bugfix for playernames in network status loading screen
2011-03-31 18:30:53 +00:00
Mark Vejvoda
085cb7d543 - added a cancel button when loading a game for the server user only
- updated client side loading screen to show who the server is waiting for
- moved some more strings into the english language file
2011-03-31 18:13:02 +00:00
Mark Vejvoda
e56b6079c6 - added new menu option to be able to toggle texture compression
- scenario menu now does NOT cache textures
2011-03-31 01:34:01 +00:00
Titus Tscharntke
2a48f8e290 delayed loading of previews 2011-03-31 00:33:40 +00:00
Mark Vejvoda
a3029e6e25 - updated lua attribute to additionally accept:
<fog-of-war value="explored"/>
2011-03-30 23:48:27 +00:00
Titus Tscharntke
b4a352285f minimap transparent again but with border 2011-03-30 23:27:21 +00:00
Titus Tscharntke
12a33e8461 minimap with border and non transparent 2011-03-30 22:39:52 +00:00
Mark Vejvoda
438bedd4fa - now show scenario logo files when user selects a scenario with a loading screen 2011-03-30 22:14:51 +00:00
Mark Vejvoda
4344a958d6 - changed game unload so it doesn't try to render on exit 2011-03-30 21:15:20 +00:00
Mark Vejvoda
55f2bdc2d5 - when loading textures, if compressed texture call fails, try to revert to uncompressed before throwing an error 2011-03-30 19:23:27 +00:00
Titus Tscharntke
2f250846b1 forgot to comment debug ... 2011-03-29 23:19:19 +00:00
Titus Tscharntke
4719686440 enemy targeting changed a bit again 2011-03-29 22:12:55 +00:00
Titus Tscharntke
c99fb68f5b selecting mining positions (and by this mining itself ) should be much better now 2011-03-29 21:44:36 +00:00
Mark Vejvoda
d0b71d0eb2 - added a new commandline parameter to disable sound without having to edit the ini file 2011-03-29 19:30:17 +00:00
Mark Vejvoda
2c2b629cf9 - revert to old harvest selection 2011-03-29 19:01:15 +00:00
Mark Vejvoda
0e9cf65e70 - more code cleanup (removal of dead code that is no longer used)
- fix the icon for wartime mechanic's heal command
2011-03-29 16:27:01 +00:00
Mark Vejvoda
c58f338d1b - clear pathfinder precache for units when they die to free memory sooner 2011-03-29 10:01:01 +00:00
Mark Vejvoda
8059c064a3 - more cleanup of debug logging in menus 2011-03-29 09:45:15 +00:00
Mark Vejvoda
78b49f0a2e - bugfix for CRC cache that was not updated 2011-03-29 09:19:05 +00:00
Mark Vejvoda
82b6b02a89 - bugfixes for wrong item names sometimes for ftp file transfers 2011-03-29 08:45:56 +00:00
Mark Vejvoda
614d0c25db - attempt to improve harvesting a bit 2011-03-29 04:57:36 +00:00
Mark Vejvoda
b6e9a7aca5 - attempt to correct units that harvest a resource far away when they could take a better approach and harvest the resource closer. (needs testing) 2011-03-29 01:45:10 +00:00
Mark Vejvoda
1fc330ace3 - bugfix (And removal) for stop command and animation stopping when upgrading 2011-03-28 23:47:22 +00:00
Titus Tscharntke
7560970590 snake basket has (more) splash ; menu_state_mods a bit modified (more work needed) 2011-03-28 23:38:06 +00:00
Mark Vejvoda
56bc84923a - disabled the stopcommand throttling for now to see if performance is still ok 2011-03-28 21:10:49 +00:00
Mark Vejvoda
3ed636aae2 - fixes for some threading shutdown bugs
- We now display when a screenshot is taken in game showing an ingame console message
- Updated AI to attack closest attackers
- Updated found enemy to be closest attacker
2011-03-28 21:04:47 +00:00
Mark Vejvoda
8be4bafdcf - bugfix for segfault with new debug method needs to properly init debug system in a new area 2011-03-28 04:30:52 +00:00
Mark Vejvoda
3b56aa4475 - performance changes... (problem found by titi) most debug calls line are skipped when the debug flag is disabled even BEFORE getting into the handledebug method.
This improves performance VERY MUCH.
2011-03-28 03:54:23 +00:00
Mark Vejvoda
453e5a12e6 - crc thread program exit cleanup, client download now using language string in connected menu 2011-03-27 16:39:19 +00:00
Mark Vejvoda
965ac7e00b - commented out unused curl method so now it should be able to compile on older libcurl 2011-03-27 16:18:16 +00:00
Mark Vejvoda
472fc2989a - changed win32 to substitute $APPDATA for the current users app data folder instead of all users 2011-03-27 16:08:20 +00:00
Mark Vejvoda
0f915ae6a6 - better handling of sound system reset when clicking ok in options menu 2011-03-27 15:55:55 +00:00
Mark Vejvoda
5af6de5aec - win32 now looks/stores userdata in the default windows appdata folder: C:\Documents and Settings\All Users\Application Data\megaglest (all dev users should copy all contents of mydata into this new location).. NOT INCLUDING the mydata folder itself 2011-03-27 15:16:28 +00:00
Titus Tscharntke
df2df4bcfc some rearrangement in options, player names in chat with colors again 2011-03-26 21:38:26 +00:00
Mark Vejvoda
d9bc605974 - added scenarios to mod menu 2011-03-26 18:37:38 +00:00
Titus Tscharntke
5ccfc59819 Masterserver messages are highlighted in yellow now; console lines now can have individual colors (if not in game)! 2011-03-26 17:17:34 +00:00
Mark Vejvoda
8f2613e216 - fixed changing username in the lobby 2011-03-26 16:51:26 +00:00
Titus Tscharntke
5648080095 Ready/not Ready/brb in colors; labels can have colors now 2011-03-26 13:40:22 +00:00
Mark Vejvoda
846dd4769b - better CRC worker thread distribution 2011-03-26 05:16:39 +00:00
Mark Vejvoda
3c73464f5a - added a line to seperate mod lists from return button 2011-03-26 05:09:38 +00:00
Mark Vejvoda
6079e6de2b - better handling of mod menu threading when user has no internet connection 2011-03-26 05:03:38 +00:00
Mark Vejvoda
15e00694bf - attempt to tighten up socket connection logic that detects disconnect 2011-03-26 02:00:41 +00:00
Mark Vejvoda
a3c290240c - removed sleep when waitinf for exit of crc thread 2011-03-26 00:38:26 +00:00
Mark Vejvoda
ff02c552ea - fixed incirrect language string 2011-03-25 23:52:36 +00:00
Mark Vejvoda
07391af2f6 - moved all mod menu strings into english language file 2011-03-25 23:33:04 +00:00
Mark Vejvoda
884b46da60 - more thread cleanup 2011-03-25 22:50:30 +00:00
Mark Vejvoda
53f57dad13 - moved http meta-data work into a background thread for mod menu 2011-03-25 22:40:14 +00:00
Mark Vejvoda
7e35d4a050 - more efficient CRC updating in cache thread 2011-03-25 21:02:53 +00:00
Mark Vejvoda
68f1ec06b5 - fix for harvesting workers to reset to original harvest location each time they deliver resources 2011-03-25 20:51:14 +00:00
Mark Vejvoda
0f6f5cfe21 - rolled back last change as it makes things worse 2011-03-25 20:17:14 +00:00
Mark Vejvoda
742cbaa1c7 - attempt to ignore resource cache for human players to see if this fixes harvesting location problems for human players 2011-03-25 20:07:27 +00:00
Mark Vejvoda
fcb1681de9 - now all libcurl calls support http redirection 2011-03-25 19:19:59 +00:00
Mark Vejvoda
1a783b3bba - updates to mod menu for better user experience 2011-03-25 18:42:08 +00:00
Mark Vejvoda
9096449919 - fixed vc++ project files for mods download menu 2011-03-25 11:15:21 +00:00
Mark Vejvoda
51eca5610e - updated to point mod data lists to masterserver 2011-03-25 10:18:12 +00:00
Mark Vejvoda
9681e7f1bc - initial code for managing mod content (downloads and removal of user data) 2011-03-25 10:11:16 +00:00
Mark Vejvoda
90c12da33e - see if this removes the command delay when issuing commands on idle units 2011-03-25 01:50:35 +00:00
Mark Vejvoda
860777aaec - try to see if this stil lfixes performance without so much delay. 2011-03-25 01:08:34 +00:00
Mark Vejvoda
47a81f8b44 - performance improvements for units using the stop command when units are idle 2011-03-24 21:55:39 +00:00
Mark Vejvoda
ab7dc1d007 - more code cleanup from things found in valgrind 2011-03-23 05:49:38 +00:00
Mark Vejvoda
ffe957c9a6 - added a way to disable water sounds: DisableWaterSounds=true 2011-03-23 04:41:38 +00:00
Mark Vejvoda
6f523bb96a - small bit of code cleanup in unit_updater
- added alarmcount to debug view
2011-03-23 02:45:42 +00:00
Mark Vejvoda
41fc6f661e - rollback last change for testing 2011-03-23 01:17:38 +00:00
Mark Vejvoda
8a9505e1e8 - added conditional check to only issue a stop command to units if they are not already stopped
- memory cleanup on unit errors
- mutex for checksum class
2011-03-23 00:49:21 +00:00
Mark Vejvoda
2a93d22183 - commented out unused class instance as it caused trouble 2011-03-22 19:28:47 +00:00
Mark Vejvoda
6c9ba8bea4 - added more error details when some errors are generated 2011-03-22 17:55:11 +00:00
Mark Vejvoda
14bd71c250 - game ready status bugfix 2011-03-22 06:43:33 +00:00
Mark Vejvoda
f7fdafbff4 - did some code refactoring, wanted to load some textures threaded but bailed out due to opengl's hideous problems related to multi-threads 2011-03-22 02:02:54 +00:00
Mark Vejvoda
e3fd34c18c - attempt to make more randomized cell direction when harvesting using locations in the resource cache 2011-03-21 01:03:14 +00:00
Mark Vejvoda
18f2f531e3 - added map, tileset and techtree to debug view and also AI type 2011-03-20 23:41:46 +00:00
Mark Vejvoda
ab9f88e4c7 - bugfix for map CRC checking after downloading a map 2011-03-20 06:23:19 +00:00
Mark Vejvoda
829c499568 - bugfixes and cleanup for g3d editor and map editor so they now compile and run using newer wxwidgets (should also be backwards compatible with 2.8 2011-03-20 06:05:09 +00:00
Mark Vejvoda
c75181f350 - a few changes so things can also build when using newer wxwidgets libs as well as newer xerces 2011-03-20 00:59:17 +00:00
Mark Vejvoda
0379b7284d - removed requirement to have a newer libcurl, now most platform, should be able to build mg more easily (only require 7.16.4 or newer instead of 7.21.0) 2011-03-20 00:11:00 +00:00
Mark Vejvoda
04fe8b73f0 - segfault bugfix for client menu 2011-03-19 18:11:15 +00:00
Mark Vejvoda
513d3f1d3e - bugfix for faction crc checks 2011-03-19 18:05:13 +00:00
Mark Vejvoda
59fc55ffee - cleanup some compiler warnings 2011-03-19 17:19:37 +00:00
Mark Vejvoda
e2c4ae7c11 - cleanup some compiler warnings 2011-03-19 12:32:40 +00:00
Mark Vejvoda
97017b2f1f - added a new lua method to add text on the console for Elimnator's scenario. 2011-03-19 12:19:22 +00:00
Mark Vejvoda
bca617cf18 - bugfix for socket mutex locked when deleting socket
- added faction detail in lobby when CRC's do not match on techtree
2011-03-19 12:04:18 +00:00
Mark Vejvoda
83eaa67068 - bugfix for hideously aweful bug that made the lobby and lobby connection freeze for a long time 2011-03-19 05:11:36 +00:00
Mark Vejvoda
d21eeeae07 - lessen pathfinder max nodes to see if this gives better performance 2011-03-19 01:31:49 +00:00
Mark Vejvoda
505abbd1ec - observers now hear sounds from units of all team units in visible quad 2011-03-18 21:23:34 +00:00
Mark Vejvoda
07f56669b7 - attempt to see if threaded pathfinding will work and if it improves performance 2011-03-18 03:53:06 +00:00
Mark Vejvoda
e65f588045 - better randomization of CRC refresh 2011-03-17 16:44:55 +00:00
Titus Tscharntke
6b31149754 Revert last change because this is not done now and I accidently checked it in. 2011-03-17 00:43:46 +00:00
Mark Vejvoda
a0bd1242b6 - improved performance of CRC precache thread, now uses up to 3 worker threads to batch process techtree's 2011-03-16 23:43:31 +00:00
Mark Vejvoda
27c183370f - some lobby cleanup and added some options to disable techtree CRC checks on server 2011-03-16 18:39:53 +00:00
Mark Vejvoda
29a123e263 - cleanup a few compiler warnings 2011-03-16 05:55:11 +00:00
Mark Vejvoda
b81a0ffdb8 - consistent display order for unit and upgrade requirement resources as requested by tomreyn 2011-03-16 05:27:07 +00:00
Mark Vejvoda
43bf94c644 - only show MG_ usernames in Internet IRC lobby (just for you tomreyn) 2011-03-16 05:03:30 +00:00
Mark Vejvoda
d613e5da7b - bugfix for scenarios to be able to use local content in the scenario folder 2011-03-15 23:10:00 +00:00
Mark Vejvoda
2c6fef4efc - added purge file stats and bugfix when showing help on commandline 2011-03-15 16:52:42 +00:00
Mark Vejvoda
7d38aec84a - new commandline options to discover and optional delete unused files in techtrees 2011-03-15 15:30:28 +00:00
Mark Vejvoda
6eab8f905e - simple bugfix for file xfer's
- added openal call to try to work around an openal bug on some platforms
2011-03-14 20:25:27 +00:00
Titus Tscharntke
c54174061f particles have more switches: day/night visibility , alternating value , radiusBasedStartenergy ( can be disabled now! ) 2011-03-13 23:16:07 +00:00
Mark Vejvoda
28f74a15f7 - we can now save jpg screenshots and can also convert model textures to jpg (WARNING jpg DOES NOT support alpha channel (for transparency) so use this wisely 2011-03-13 22:43:44 +00:00
Mark Vejvoda
b3951b3940 -bugfix for vc++ compile 2011-03-13 13:14:47 +00:00
Mark Vejvoda
d0a95b1ff5 - added another option when converting model textures (keepsmallest) 2011-03-13 09:57:04 +00:00
Mark Vejvoda
39bf1b986e - added new commandline option to convert folders of g3d models to use specified texture format
- added new utility methods and changed code to use them (like adding trailing slash on paths)
2011-03-13 08:23:43 +00:00
Mark Vejvoda
f35e920d47 - added logic to delete old texture after doing a model texture conversion 2011-03-12 22:11:09 +00:00
Mark Vejvoda
c67d7d48c2 - some initial work to allow saving models in the current v4 g3d format (new commandline option to test it also) and also convert textures into png 2011-03-12 21:29:37 +00:00
Mark Vejvoda
f88836203a - another keyboard bugfix (pressing esc properly cancels chat mode), Thanks ultifd 2011-03-12 03:10:07 +00:00
Mark Vejvoda
9d2e08a8c7 - g3d viewer now auto registers g3d files with itself in windows so users may double click a g3d file to launch it within the viewer from explorer. Windows G3d is now a console application so we can see commandline options and console output 2011-03-12 02:28:00 +00:00
Mark Vejvoda
be5ac6c9e4 - bugfix for g3d viewer to work with windows openwith 2011-03-11 23:48:16 +00:00
Mark Vejvoda
9eb1f60048 - added option to disable file transfers for tileset and/or techtrees for published (internet) games 2011-03-11 12:14:24 +00:00
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
f46eaa159a - bugfix for bug reported by gonana (ascii hotkeys work properly once again) 2011-03-11 06:34:59 +00:00
Mark Vejvoda
4757bd3bb8 - bugfix for user ini files whne missing, we auto-create them and set proper flags (thanks Muwum) 2011-03-11 01:22:24 +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
ae97a1306c - added another special variable (application path) that can be used for variable substituion in ini file values 2011-03-10 19:19:14 +00:00
Mark Vejvoda
3758a4ba92 - bugfix for missing userdtaa folder, needs to be created right away if missing (thanks KroArtem) 2011-03-10 18:54:40 +00:00