Commit Graph

1113 Commits

Author SHA1 Message Date
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
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
Mark Vejvoda
3e20d3ffe8 - more menu freeze bugfixes 2010-12-18 21:32:54 +00:00
Titus Tscharntke
886bd3b37e alarmsound when enemy units are seen ( will be improved soon ) 2010-12-18 20:17:41 +00:00
Mark Vejvoda
6a99e2db8e - another attempt to guard socket thread access so avoid menu hang problems 2010-12-18 19:52:47 +00:00
Titus Tscharntke
7305391b6d Unit commanding via minimap 2010-12-18 17:18:36 +00:00
Titus Tscharntke
24a0eb31d8 about screen names fixed again ... 2010-12-18 00:37:59 +00:00
Titus Tscharntke
3d277e00e5 but this time its fixed ! 2010-12-17 23:23:45 +00:00
Mark Vejvoda
fd0875639e - attempt to fix menu hangs, don't believe we need any sleeps in this class 2010-12-17 21:39:31 +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
Mark Vejvoda
b148507411 - set anti-alias setting so it works if enabled 2010-12-17 02:53:52 +00:00
Mark Vejvoda
0c325baeb0 - added a missing include folder for win32 build and fixed compiler flag for special build type 2010-12-17 02:52:10 +00:00
Mark Vejvoda
158acea0b5 - attempt to fix problem with hanging sleep 2010-12-14 00:00:56 +00:00
Mark Vejvoda
8d6e33d4ba - added some extra guards in Network manager (throw exception if things are in a bad state) 2010-12-13 23:39:24 +00:00
Mark Vejvoda
5e410f3066 - bugfix for turning off fog of war on network games when players are dead. Now we DO NOT turn off fog of war until ALL of the players units are dead. 2010-12-13 23:24:03 +00:00
Mark Vejvoda
90fe87098c - added a wait time of 10 seconds max for some thread loops 2010-12-13 23:13:25 +00:00
Titus Tscharntke
75541aec3b Contact email changed; lots of strings replaced to MegaGlest 2010-12-13 00:32:59 +00:00
Mark Vejvoda
003d15c28a - updated cmake files to support toggling between release and debug builds (even release with debug info)
when calling CMAKE you may toggle debug or release like this:
cmake -D CMAKE_BUILD_TYPE=Debug ..
or
cmake -D CMAKE_BUILD_TYPE=Release ..
2010-12-12 08:10:18 +00:00
Mark Vejvoda
367effb217 - updated cmake files so windows build on windows OS build properly using wxWidgets dll's 2010-12-12 06:31:40 +00:00
Mark Vejvoda
8918b11320 - added an invlaid value check to the units field 2010-12-12 00:46:13 +00:00
Mark Vejvoda
1984c61386 - final completion of tools now building in both linux and windows through cmake 2010-12-11 15:05:43 +00:00
Mark Vejvoda
9cce656e65 - updated tools to use proper name libglest 2010-12-11 13:43:15 +00:00
Mark Vejvoda
e34c8977e1 - a few changes to cmake windows build so that it runs properly (libglest must be a dll) 2010-12-11 13:35:27 +00:00
Mark Vejvoda
f27cb6c8a3 - added support to cross compile win32 binary on Linux using cmake (just run build-mg-win32.sh) 2010-12-11 12:53:38 +00:00
Mark Vejvoda
8f579e735f - bugfix for new CPU multiplier constants for VC++ compiler 2010-12-11 08:00:49 +00:00
Mark Vejvoda
aebcca517c - bugfixes to get cmake working properly in linux and windows 2010-12-11 07:05:07 +00:00
Mark Vejvoda
755a7737fa - added CMAKE support for building MG in Windows using MingW 2010-12-11 06:32:21 +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
1ff84eaddb - updated cmake build to touch game_util.cpp every time make is called so it ALWAYS has the right date/time stamp 2010-12-10 02:45:07 +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
ac1a291739 - modified cmake scripts to place linux binaries in the same spot that jam placed them 2010-12-09 17:14:40 +00:00
Mark Vejvoda
2d402f0169 - updated cmake scripts to build everything 2010-12-09 00:20:43 +00:00
Mark Vejvoda
7a7bc828f1 - full support for all megaglest modules to compile with the following:
release / debug
 linux / windows
2010-12-08 20:03:15 +00:00
Mark Vejvoda
7341886b11 - changes so map editor compiles in mingw 2010-12-08 16:31:08 +00:00
Mark Vejvoda
20562c4dbb - updated to display MINGW client platform 2010-12-08 07:01:24 +00:00
Mark Vejvoda
7f0a179340 - bugfix for vc++ compile (added #define for mingw) 2010-12-07 22:29:31 +00:00
Mark Vejvoda
b605c65aa9 - updates to support both Windows and Linux targets from CodeBlocks Workspace 2010-12-07 07:00:11 +00:00
Mark Vejvoda
1e0a5dc304 - better stability of menu navigation and threads 2010-12-07 06:12:51 +00:00
nosogo
8c115809ce editor: shift map + mirror do player positions 2010-12-06 20:13:27 +00:00
Mark Vejvoda
df042b5bf2 - added another debug entry for client vs server version comparison 2010-12-05 03:41:44 +00:00
Mark Vejvoda
7872e980e1 - updated thread handling slightly in menus to make things more stable 2010-12-05 01:52:38 +00:00
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