Commit Graph

1113 Commits

Author SHA1 Message Date
nosogo
f545edad68 more fixes for editor 2010-12-05 01:33:28 +00:00
Mark Vejvoda
15aab7a581 - some intial changes to support cross-compilation under mingw 2010-12-04 23:19:43 +00:00
nosogo
04aee1098d update of editor and g3dviewer 2010-12-03 05:07:42 +00:00
Mark Vejvoda
0537903a7d - updated main menu version # to show compile date / time 2010-12-02 01:04:06 +00:00
Mark Vejvoda
8deec8d518 - changed debug world synch formatting so on xplatform we don't have issues with filename and other header tag items 2010-12-01 23:38:03 +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
Mark Vejvoda
c55855c6f2 - bugfix for stack overflow 2010-12-01 00:05:33 +00:00
Mark Vejvoda
b02da7d1e0 - finally found and fixed out of synch related to AI.
- added ability to log all unit activity to world synch logfiles so we can diff game info from different network clients
2010-11-30 23:32:39 +00:00
Mark Vejvoda
e62f3ca64c - reverted AI's repair rule logic to hunt down an AI out of synch 2010-11-28 07:38:03 +00:00
Mark Vejvoda
33aac9f2ae - added useful debug info for world synch debugging (unit path and faction info) 2010-11-28 03:46:28 +00:00
Mark Vejvoda
ca2408073e - disabled more caching to determine if any of these caches cause out of synch 2010-11-28 03:35:44 +00:00
Mark Vejvoda
ab966d7872 - added map cell checks back but output to error log only (and assert for debug mode) 2010-11-28 03:21:20 +00:00
Mark Vejvoda
128b98b619 - removed un-necessary use of renderer while application shutdown to avoid bad use of the renderer. 2010-11-28 03:01:27 +00:00
Mark Vejvoda
edbc14a176 - disabled another cache in pathfinder trying to hunt down xplatform out of synch 2010-11-28 02:36:06 +00:00
Mark Vejvoda
664b2b1b7d - disabled another cache in pathfinder trying to hunt down xplatform out of synch 2010-11-28 00:07:08 +00:00
Mark Vejvoda
ee249b8878 - commented out another possibly bad assert /exception 2010-11-27 08:23:45 +00:00
Mark Vejvoda
4e36b4c30c - commented out what seems to be a bad assert / exception check 2010-11-27 07:11:54 +00:00
Mark Vejvoda
81d755cc83 - disabled a cache (cacheUnitCommandClassList) as we suspect this may cause crashes and is unstable 2010-11-26 00:09:54 +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
Mark Vejvoda
c1529fd8dc - added validation for unit's to ensure they still have the cached commandclass 2010-11-16 23:32:15 +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
Mark Vejvoda
cc4f268988 - some additional AI caching for improved performance 2010-11-11 08:02:50 +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
Titus Tscharntke
c3b96ec722 mega/ultra cpu still used its old multiplier ... fixed 2010-11-09 22:51:19 +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
Mark Vejvoda
d2de4eb22a - change to properly toggle socket blocking mode in Linux 2010-11-09 16:51:03 +00:00
Mark Vejvoda
d89953ee96 - improved performance and bug fixes. 2010-11-09 09:06:52 +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
9d9fa0deeb - improved performance for when the AI decides which resource is closest. 2010-11-07 03:27:06 +00:00
Mark Vejvoda
ca9cbc6e75 - removed some debugging that created very large debug files and improved performance a little bit 2010-11-07 02:37:00 +00:00
Mark Vejvoda
960dfcabfb - when calculating CRC on game data ignore XMl comments 2010-11-07 01:48:25 +00:00
Mark Vejvoda
edebc78d44 - when calculating CRC on game data ignore XMl comments 2010-11-07 01:39:57 +00:00
Mark Vejvoda
9e55d8e46b - added a small cache to improve pathfinding a bit
- added logic to IGNORE the following characters when doing CRC checks in XML files
 (space,tab,CR,LF)
2010-11-07 01:06:14 +00:00
Mark Vejvoda
b52ca80388 - to make ultifd happy, fixed overlapping labels in lobbies 2010-11-05 23:12:46 +00:00
Mark Vejvoda
8e6609fdac - texture info now logged to debug log when appropriate instead of spamming the console 2010-11-05 09:49:57 +00:00
Mark Vejvoda
3836e967ae - a little cleanup of windows exception handling code 2010-11-05 09:43:07 +00:00
Mark Vejvoda
1a33ade54b - added windows stack trace to debug.log also 2010-11-05 06:51:05 +00:00
Mark Vejvoda
8ab95a5305 - added stack trace for windows users when exceptions occur (snagged the idea from sauerbraten) 2010-11-05 06:46:30 +00:00
Mark Vejvoda
7c47a51718 - fixed font spacing in chat text 2010-11-04 06:27:25 +00:00
Mark Vejvoda
6312c0ec60 - bigfix for last checkin 2010-11-03 21:53:49 +00:00
Mark Vejvoda
d91bd593e8 - added more info related to ultifds error message to see what triggers the issue 2010-11-03 21:43:37 +00:00
Mark Vejvoda
ea27375b6f - updates from notsogood to add more player colors and splash particles and memory cleanup to G3d Viewer (thanks notsogood!) 2010-11-03 19:03:25 +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
cb52b4895d - performance fix in both pathfinder and debug output when pressing the debug key 2010-11-02 19:52:20 +00:00
Mark Vejvoda
3c7fbd1fd7 - for now disable refs to fbo's on windows platform till we decide if we include glew or not 2010-11-01 23:56:46 +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
dfedf2259b - numerous bugfixes to building an d repairing units.
- added new unit cell property called allowEmpty to allow units to build other units with cellmaps that have all 0's (since you can produce these types of units anyways)
2010-10-30 08:54:00 +00:00
Mark Vejvoda
060a9d3fe6 - disallow air units to morph back to land if unwalkable objects or water terrain are below 2010-10-30 04:49:49 +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
dec9dfe653 - added new attribute for tileset objects named "height". Air units will try to fly above the height of units and objects now (up to a max of terrain height + 15) 2010-10-30 04:05:48 +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
b1ff035f9e - added ability to turn on photo mode and zoom out while in a non network game (default key is f8) 2010-10-30 03:03:44 +00:00
Mark Vejvoda
44563b6f73 - allow screenshots to be taken ANY time (in menus etc.) and not only when a game is playing 2010-10-30 02:24:53 +00:00
Mark Vejvoda
77bad3ce07 - added new default PNG format for doing screenshots AND the saving to disk is queued in a background thread allowing almost no delay when saving many screenshots! 2010-10-30 02:21:47 +00:00
Mark Vejvoda
369a0dc215 - fixed warnings when compiling in vc++ 2010-10-30 00:14:15 +00:00
Mark Vejvoda
13c4deb5b6 - added new screenshot format to be bmp (can be oveeriden by ini setting, and more formats may be added later) ScreenShotFileType=tga to revert to old default tga screenshots 2010-10-29 22:18:23 +00:00
Mark Vejvoda
27212dd962 - a bit of code cleanup related to supporting texture compression on Intel 2010-10-29 21:18:07 +00:00
Mark Vejvoda
e299250f94 - try to add special texture compression types from GL_3DFX_texture_compression_FXT1 2010-10-29 20:53:20 +00:00
Mark Vejvoda
268730cfae - try to add special texture compression types from GL_3DFX_texture_compression_FXT1 2010-10-29 20:44:21 +00:00
Mark Vejvoda
200031874c - try to add special texture compression types from GL_3DFX_texture_compression_FXT1 2010-10-29 20:37:49 +00:00
Mark Vejvoda
d5018d217e - try to add special texture compression types from GL_EXT_texture_sRGB 2010-10-29 19:58:43 +00:00
Mark Vejvoda
0e3ba69160 - try to add special texture compression types from GL_EXT_texture_sRGB 2010-10-29 19:55:47 +00:00
Mark Vejvoda
7ccca89dbf - try to add special texture compression types from GL_EXT_texture_sRGB 2010-10-29 19:54:35 +00:00
Mark Vejvoda
1a32bf165e - try to add special texture compression types from GL_EXT_texture_sRGB 2010-10-29 19:50:59 +00:00
Mark Vejvoda
32f429e3c3 - try to add special texture compression types from GL_EXT_texture_sRGB 2010-10-29 19:34:58 +00:00
Mark Vejvoda
ba8704c5bd - try to add special texture compression types from GL_EXT_texture_sRGB 2010-10-29 19:29:26 +00:00
Mark Vejvoda
5888003aa6 - try to add special texture compression types from GL_EXT_texture_sRGB 2010-10-29 19:15:15 +00:00
Mark Vejvoda
d558d896d4 - try to add special texture compression types from GL_EXT_texture_sRGB 2010-10-29 19:02:23 +00:00
Mark Vejvoda
f0d9357d31 - try to add special texture compression types from GL_EXT_texture_sRGB 2010-10-29 18:54:55 +00:00
Mark Vejvoda
2cc28dda5e - more logging on texture init errors 2010-10-29 18:44:07 +00:00
Mark Vejvoda
e0d338b583 - added more texture compression supported types
- some in progress work related to texture reloading
2010-10-29 16:27:22 +00:00
Mark Vejvoda
02a16da938 - small change to the view co-ordinates of shadows 2010-10-29 00:46:54 +00:00
Mark Vejvoda
70927e5979 - added some console output to show which texture compression types the opengl driver supports 2010-10-29 00:45:09 +00:00
Mark Vejvoda
7f32456736 - changed default texture compression to non st3 for now 2010-10-28 22:07:44 +00:00
Mark Vejvoda
01c26b4224 - added the ability to track pixmap memory usage at start and end of a game 2010-10-28 21:06:20 +00:00
Mark Vejvoda
5cf0313c5a - bugfix for cancel icon displaying when unit has only the 'stop' command active 2010-10-28 18:31:12 +00:00
Mark Vejvoda
df3f56a451 - cleanup of texture compression. We output stats for textures that we attempt to compress and what percent they were compressed (before and after byte sizes) 2010-10-28 06:59:43 +00:00
Mark Vejvoda
de3a92081d - a bunch of in progress work related to texture compression and more timely texture memory management cleanup. For now to test texture compression use the following ini setting: EnableTextureCompression=true 2010-10-28 00:51:25 +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
78f6f49cb6 - fixed shadow mapping by removing the use of the extension: GL_ARB_shadow_ambient
(thanks: asmodeus and Ishmaru)
- added some initial work for texture compression (but not active yet)
2010-10-27 15:04:47 +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
43670f76c9 - bugfix for invalid map co-ordinates when looking for resources 2010-10-26 15:25:38 +00:00
Mark Vejvoda
1e104f0496 - attempt to further improve pathfinder performance when MANY units are on the map 2010-10-26 06:53:04 +00:00
Mark Vejvoda
c47b6c676c - attempt to further improve pathfinder performance when MANY units are on the map 2010-10-26 06:43:42 +00:00
Mark Vejvoda
8bbbe403ad - more performance improvements for resource cache logic (try to avoid repetitive caching logic when it was already done once) 2010-10-25 22:02:36 +00:00
Mark Vejvoda
d07cd76459 - added a guard for proper slot index usage in network code 2010-10-25 20:56:57 +00:00
Mark Vejvoda
45df867490 - replaced version check on masterserver with built in php function for proper functionality 2010-10-24 21:15:09 +00:00
Mark Vejvoda
117521a8d4 - disabled the recently introduced pathfinding cache as its too slow and not sure that it really does any good. This should help performance to be better. 2010-10-24 06:53:30 +00:00
Mark Vejvoda
bbc8f96327 - better masterserver thread management during game play (do not start the thread for non published games) 2010-10-24 05:52:21 +00:00
Mark Vejvoda
112bfd4445 - commented out debug code 2010-10-24 02:16:44 +00:00
Mark Vejvoda
7cb1d6a5b1 - some performance improvements with the new cached resource data 2010-10-24 01:49:25 +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
6a0e876bf2 - relaxed some of the special characters a bit so they can be used in the descriptions 2010-10-23 21:47:34 +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
fd3a8e4705 - minor bugfix when broadcasting on UDP (only one socket per unique subnet) 2010-10-23 05:12:28 +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
e53e6b49a9 - bugfix for multiple consumable resources applying incorrectly during the update interval. (thanks silnarm) 2010-10-22 22:52:37 +00:00
Mark Vejvoda
c4c812dd15 - updated chat player colors in console so ONLY playername is colored the players color
(by request from titi)
2010-10-22 21:54:47 +00:00
Mark Vejvoda
b72124a89a - bugfix for segfault (using wrong index variables again). This time I understand what to change and what not to change :) 2010-10-22 17:29:23 +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
40a0707519 - bugfix for switching human to AI on disconnect (the check used the wrong index) 2010-10-22 16:47:08 +00:00
Mark Vejvoda
707a26feb2 - bugfix for server side player color index being wrong 2010-10-22 16:35:16 +00:00
Mark Vejvoda
343fdb70b2 - fixed the cursor bug mentioned by claymore 2010-10-22 16:08:13 +00:00
Mark Vejvoda
c088889e7c - bugfix to retain proper team color based on actual slot position, regardless of how many closed slots there are. Yay, now team placement and color works properly 2010-10-22 08:10:56 +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
b869552cad - a little bit of fine tuning the new unit harvesting logic, now units are more intelligent about how they harvest (both AI and Human players) 2010-10-22 04:48:24 +00:00
Mark Vejvoda
cf5164d5ce - bugfix for consumable resources. Now we get the total usage value BEFORE applying the consequences (thanks for finding this Zoythrus) 2010-10-22 04:16:11 +00:00
Mark Vejvoda
362ae6f4fa - attempt to see if this fixes some lua problems 2010-10-21 22:12:05 +00:00
Mark Vejvoda
178809ada3 - changed resource faction cache to a map for better performance 2010-10-21 21:53:08 +00:00
Mark Vejvoda
07fe6a2196 - added to the faction resource cache pool for even better AI discovery of resources 2010-10-21 20:31:09 +00:00
Mark Vejvoda
ae367fb252 - updated to units harvesting so they try to harvest different resources when blocked if other resources are close by. 2010-10-21 19:26:14 +00:00
Mark Vejvoda
79318735ab - cleanup of last compiler warnings in Linux (hurray!) 2010-10-21 18:24:54 +00:00
Mark Vejvoda
ba088e9258 - bugfix for linux builds after compiler warning cleanup 2010-10-21 17:49:14 +00:00
Mark Vejvoda
be979590c1 - more compiler warning cleanup 2010-10-21 17:42:45 +00:00
Mark Vejvoda
cbe6860826 - more compiler warning cleanup 2010-10-21 16:36:26 +00:00
Mark Vejvoda
45a26a4597 - cleaned up more compiler warnings
- added unsigned 64 bit type for windows
2010-10-21 15:55:12 +00:00
Mark Vejvoda
c6a4e53151 - fix compile error on linux 2010-10-21 15:35:13 +00:00
Mark Vejvoda
06b9d7eef7 - cleaned up a whole pile of compiler warnings 2010-10-21 15:21:46 +00:00
Mark Vejvoda
d5117ed7fa - cleaned up a whole pile of compiler warnings 2010-10-21 07:20:17 +00:00
Mark Vejvoda
93e56df3d6 - fixed some misc code bugs (incorrect assignment) and cleaned up some compiler warnings 2010-10-21 01:07:11 +00:00
Mark Vejvoda
f5f406dfb3 - bugfix related to segfault when a network disconnect occurs while a thread is updating a slot 2010-10-21 00:21:58 +00:00
Mark Vejvoda
bc7ba297fd - more tweaking for units harvesting, this hopefully cleans up segfaults and makes things more stable. 2010-10-20 20:40:29 +00:00
Mark Vejvoda
6104dedc76 - added a resource harvest success cache for stuck units to look at when they cannot harvest. 2010-10-20 07:28:27 +00:00
Mark Vejvoda
ddb4c42bf5 - added some guard conditions to avoid segfault when resources are harvested quickly 2010-10-19 22:47:45 +00:00
Mark Vejvoda
913df7ec3b - added more cached information to help deal with units getting stuck while harvesting. Trying to keep them busy instead of standing around. 2010-10-19 22:26:49 +00:00
Mark Vejvoda
dda594cf33 - a slight change in dealing with units getting stuck while harvesting. Trying to keep them busy instead of standing around. 2010-10-19 16:54:48 +00:00
Mark Vejvoda
182f2cd20d - bugfixes to AI where workers harvesting think they have arrived but really did not. 2010-10-19 04:38:55 +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
7564635643 - added initial code for switching dropped network players to AI (currently hard coded to normal CPU) 2010-10-18 23:09:43 +00:00
Mark Vejvoda
3d4ccb460c - added a little extra logic for units when pathfinding. We keep temporary lists of bad cells of harvest resources where a unit simply cannot get to. This is kept for small periods of time and then the bad cell list is purged when data gets old. This tremendously helps units to be more active when getting stuck in challenging places on maps. 2010-10-17 08:50:27 +00:00
Mark Vejvoda
55b4f0bd2b - Incremented version to next major release # so new work can begin.
- some initial work to assist units from getting stuck when given commands. This is for both AI and human players and deals with the pathfinder and units getting constantly blocked from their destination.
2010-10-17 06:34:42 +00:00
Mark Vejvoda
b3d981c2fd - updated version to 3.3.7.2 for next release 2010-10-15 19:19:36 +00:00
Mark Vejvoda
9490e64750 - turned on a flag for libcurl so timeout issues don't cause segfaults in threads 2010-10-15 17:49:18 +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
1353f61069 - added some additional safety around the logger in case we have problems opening files on the filesystem 2010-10-15 16:22:35 +00:00
Mark Vejvoda
427f505c4c - updated version to 3.3.7.1 for minor update release 2010-10-15 02:03:48 +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
Mark Vejvoda
94da959fd4 - force sending game settings just before launch if we detect something has changed (like random faction calculation) 2010-10-14 22:41:03 +00:00
Mark Vejvoda
9a73cd520c - commented out printf 2010-10-14 19:53:34 +00:00
Titus Tscharntke
a01ae45ede Similar to announcements a version info is implemented now. We can put there an info string which will tell the user that his version is outdated and he should update or whatever. 2010-10-13 19:16:04 +00:00
Titus Tscharntke
15c6ea93b3 Bugfix for lua related crash 2010-10-12 10:20:00 +00:00
Mark Vejvoda
2519588148 - attempt to fix lua code that might be crashing the game 2010-10-11 23:39:44 +00:00
Mark Vejvoda
fd4054e345 - attempt to fix lua code that might be crashing the game 2010-10-11 23:33:03 +00:00
Mark Vejvoda
3a94f1506f - attempt to fix lua code that might be crashing the game 2010-10-11 23:24:10 +00:00
Mark Vejvoda
67c1c52caa - added an extra NULL check to new max unit check 2010-10-11 15:58:10 +00:00
Titus Tscharntke
d80127f697 forgot to remove label and listbox from header. 2010-10-11 00:59:45 +00:00