Commit Graph

4009 Commits

Author SHA1 Message Date
Will a869dd0fee Tweak to see if we can get the new colour picking code working 2013-12-01 00:43:49 +01:00
SoftCoder b36244fcbd updated unit test to show max colors supported and when each algorithm fails. 2013-11-30 14:48:11 -08:00
SoftCoder c2929e3d2b merged 2013-11-30 14:31:05 -08:00
SoftCoder 2ff75c54e2 merged updates 2013-11-30 14:29:02 -08:00
SoftCoder 0400312810 Merge branch 'master' of github-softcoder-megaglest:MegaGlest/megaglest-source 2013-11-30 14:23:52 -08:00
SoftCoder d5b3972807 added new color picking tests to repo 2013-11-30 14:07:26 -08:00
williame 125e1c53dc Got the colour conversion wrong in colour picking 2013-11-30 21:44:53 +01:00
SoftCoder f217db38f1 - changed to git version stamp 2013-11-29 13:13:30 -08:00
SoftCoder 1a8673feb3 - bugfix for will's color pick optimization (was not properly doing cell selection) 2013-11-28 22:58:13 -08:00
Will c6530c2783 merging in all Will's changes 2013-11-29 02:12:34 +01:00
SoftCoder be3d4d300c - bugfix for headless server mode (null pixmaps) shown by stacktrace on fakir 2013-11-28 16:20:40 -08:00
filux 00b4d9ab4e resolved conflicts by conversion CRLF to LF 2013-11-28 08:26:39 +01:00
filux d0836a6573 transfered .tx and tx-cleanup to data, added license/readme, basic configuration 2013-11-28 07:58:09 +01:00
Mark Vejvoda 8d040b9f63 - attempt to ensure color picking ALWAYS has unique colors 2013-11-25 07:26:23 +00:00
Mark Vejvoda ceb799a66e - attempt to ensure color picking ALWAYS has unique colors
- better handling of scenario's that are missing techtrees
2013-11-24 04:44:12 +00:00
Mark Vejvoda 8414077d7a - bugfix for headless server's reporting of winning players and team.
- masterserver returns proper JSON header now
2013-11-22 21:17:38 +00:00
Mark Vejvoda f6806bd1ea - added unit tests for arabic handling in fribidi
- added default property value for right to left mixed in english.lng
- fixed bug in arabic.lng file
2013-11-20 00:22:39 +00:00
Mark Vejvoda 7d5b71b2cf - bugfix for compilation on windows 2013-11-19 22:47:22 +00:00
Mark Vejvoda ab64b9343f - updated to support building with clang compiler (And cleaned up clang warnings from initial compile). Edit build-mg.sh and read the clang section as to how to build. 2013-11-19 21:57:28 +00:00
Mark Vejvoda 929cc07895 - code cleanup based on additional gcc warnings 2013-11-19 07:05:45 +00:00
Mark Vejvoda ad7569ded1 - code cleanup based on additional gcc warnings 2013-11-19 07:02:26 +00:00
Mark Vejvoda 33d87512b0 - code cleanup based on additional gcc warnings 2013-11-19 06:58:52 +00:00
Mark Vejvoda 94684c66a4 - code cleanup based on additional gcc warnings 2013-11-19 06:56:09 +00:00
Mark Vejvoda 66761ba760 - code cleanup based on additional gcc warnings 2013-11-19 06:42:32 +00:00
Mark Vejvoda 39b41cdfea - code cleanup based on additional gcc warnings 2013-11-19 06:29:30 +00:00
Mark Vejvoda 4a4c7fbfde - code cleanup based on additional gcc warnings 2013-11-19 06:24:22 +00:00
Mark Vejvoda 9268aaf279 - a few minor bug fixes related to code warnings
- code cleanup based on additional gcc warnings
- enabled additional gcc compiler warnings
2013-11-19 06:14:06 +00:00
Mark Vejvoda 642a26bdb5 - bugfix for cmake builds handling of help2man for empty executable paths 2013-11-18 23:10:38 +00:00
Mark Vejvoda e28097e0d7 - bugfix for cmake builds handling of help2man for empty executable paths 2013-11-18 22:37:12 +00:00
Mark Vejvoda fe6886d273 - bugfix for cmake builds handling of help2man for empty executable paths 2013-11-18 22:05:16 +00:00
Mark Vejvoda b74271348c - bugfix for map editor hanging on some windows installations 2013-11-17 22:42:51 +00:00
Mark Vejvoda 145b90d341 - updating version to 3.9.0 for release
- increase installer size on linux for more accurate progrerss bar
2013-11-17 18:27:41 +00:00
Mark Vejvoda be7639aca4 - added a few more unit tests for version checks 2013-11-17 18:13:54 +00:00
Titus Tscharntke d2cb21d818 version is set to 3.9-dev until versioning system is discussed 2013-11-17 10:41:09 +00:00
Mark Vejvoda 4478b8d1df - fixed compiler warnings in linux 32 gcc 2013-11-17 09:03:57 +00:00
Mark Vejvoda ff9faf7a4a - fixed warnings in 32 bit linux gcc 2013-11-17 09:01:32 +00:00
Mark Vejvoda d0ac27353a - fixed compiler warnings in linux 32 gcc 2013-11-17 08:44:47 +00:00
Mark Vejvoda 9a03528ee8 - bugfix for g3d viewer screenshot automation 2013-11-17 08:19:17 +00:00
Mark Vejvoda a6fff895b3 - bugfix for g3d viewer to work in wxwidgets 2.9.4 2013-11-17 08:06:06 +00:00
Mark Vejvoda c825acd69f - bugfix for g3d viewer to work in wxwidgets 2.9.4 2013-11-17 08:01:45 +00:00
Mark Vejvoda ac59cf5ab8 - bugfix for g3d viewer to work in wxwidgets 2.9.4 2013-11-17 07:37:13 +00:00
Tom Reynolds 5de5fba834 - New translations
- convert_faction_xml2html: Correct location of default INI file
2013-11-17 00:36:01 +00:00
Mark Vejvoda e89210cf6c - updating version # to v3.9 in preparation for release 2013-11-16 21:50:54 +00:00
Mark Vejvoda b2f3748168 - updates related to debian package standards 2013-11-16 20:27:51 +00:00
Mark Vejvoda 303746df80 - updated cmake scripts to fix build problems on debian 2013-11-16 19:18:09 +00:00
Mark Vejvoda 1dd1b8febb some minor bugfixes (proper variable init, added validation error message) 2013-11-16 18:36:54 +00:00
Mark Vejvoda aa1efb5d3a added a check for missing data in menu 2013-11-16 10:02:32 +00:00
Mark Vejvoda 77fba5a65e bugfix for clients that have no data, no need to crash 2013-11-16 03:33:13 +00:00
Mark Vejvoda 09818dfdc1 - added a warning code comment to avoid this in the future 2013-11-16 02:12:26 +00:00
Mark Vejvoda 4c4bcd40a3 see if this helps stuttering 2013-11-16 00:28:55 +00:00
Mark Vejvoda c9a6078689 revert network code back 2013-11-15 20:04:12 +00:00
Mark Vejvoda 98bc4b190e attempt to see how this affects network games for tomreyn 2013-11-15 19:21:14 +00:00
Mark Vejvoda ea88a4c990 roll back last change 2013-11-15 18:58:28 +00:00
Mark Vejvoda 119a8cce4a attempt to see how this affects network games for tomreyn 2013-11-15 18:41:21 +00:00
Mark Vejvoda 35714002e9 bugfix for vc++ compile 2013-11-15 15:58:23 +00:00
Mark Vejvoda 9080ade759 small cleanup from cppcheck 2013-11-14 23:24:17 +00:00
Mark Vejvoda 445e39ab2d updated compressor to skip non mode game data by default unless additional parameter specified 2013-11-14 23:18:28 +00:00
Mark Vejvoda e3245eb7f4 disable rescursive ftp file download for techtrees and tilesets 2013-11-14 22:57:56 +00:00
Mark Vejvoda 429db5ff66 fixed rtl mixed support mode so that words are properly placed in the sentence 2013-11-14 22:19:40 +00:00
Mark Vejvoda f0737ac682 fixed rtl mixed support mode so that words are properly placed in the sentence 2013-11-14 22:17:30 +00:00
Mark Vejvoda 9350b16c4a cleanup from cppcheck 1.62 2013-11-14 16:42:22 +00:00
Mark Vejvoda b3a9ad5411 fixed some vc++ compiler warnings 2013-11-14 13:56:05 +00:00
Mark Vejvoda cc21dbbc5c cpp check warnings cleanup 2013-11-14 13:22:55 +00:00
Mark Vejvoda 3671bd0617 - removed debug code 2013-11-14 13:17:58 +00:00
Mark Vejvoda d48d63b1fa a bit more refactoring for command line parameters 2013-11-14 12:54:05 +00:00
Mark Vejvoda 53eca42a11 - Disable performance warnings by default. To enable, either press ' in a game top toggle on/off or add this key: PerformanceWarningEnabled=true
- refactor data compress into its own function
2013-11-14 12:38:03 +00:00
Mark Vejvoda a300621415 - added a new commandline command to create data archives for network xfer for techtrees and tilesets:
megaglest --create-data-archives=all
2013-11-14 06:59:29 +00:00
Mark Vejvoda 5db18c76f4 bugfix for load games when xml is bad 2013-11-14 04:13:40 +00:00
Mark Vejvoda 85799eddc2 more user friendly handling of loading corrupt saved game files 2013-11-14 03:33:15 +00:00
Mark Vejvoda ccd6e19683 bug fix for font handling of newlines and added unit test 2013-11-14 00:23:01 +00:00
Mark Vejvoda 0bc9ed082f attempt bugfix for bad screenshots on saved games 2013-11-13 23:37:12 +00:00
Mark Vejvoda 1067e89915 move text lower as it interferes with progress bar 2013-11-13 23:34:23 +00:00
Mark Vejvoda 5249ecc45d some code cleanup for xml parsing and loading saved games 2013-11-13 22:28:05 +00:00
Mark Vejvoda b7267c9176 some memory leak cleanup 2013-11-13 21:26:08 +00:00
Mark Vejvoda 4e1c9be664 some memory leak cleanup 2013-11-13 21:22:56 +00:00
Mark Vejvoda 2d8f0f7430 clear cache lookups when appropriate 2013-11-13 19:00:33 +00:00
Mark Vejvoda 94b8a346f2 bugfix to properly show render performance 2013-11-13 18:16:59 +00:00
Mark Vejvoda 5e7e440c5d attempt to see if this improves performance 2013-11-13 18:05:47 +00:00
Mark Vejvoda 0a0e3f408a - added experimental Right To Left 'mixed mode' support to attempt to make RTL languages with lines having mixed RTL and LTR words display properly (this is a manual hack). To enable, add this to the languages lng file: FONT_RIGHTTOLEFT_MIXED_SUPPORT=true 2013-11-13 07:56:19 +00:00
Mark Vejvoda 0557a1195e - added console output for socket errors (lets see if we get this on windows when they slow down)
- fixed missing reload ui items in menu
2013-11-12 15:01:37 +00:00
Mark Vejvoda 41083f9f32 small cpp check cleanup 2013-11-12 02:30:26 +00:00
Mark Vejvoda 7f5d35ef0f - do not validate null fire particle 2013-11-12 01:00:03 +00:00
Mark Vejvoda feedde5f61 - streamlining fog of war unit cache 2013-11-11 22:11:13 +00:00
Mark Vejvoda 6705a346ef attempt to squeeze a bit more performance 2013-11-11 19:33:25 +00:00
Mark Vejvoda 07ac33ec99 bugfix for performance enhancement 2013-11-11 18:34:51 +00:00
Mark Vejvoda c98a09b905 attempt to squeeze a bit more performance 2013-11-11 18:09:00 +00:00
Mark Vejvoda 9625bd77a4 - attempt ot get fine details of performance bottlenecks
- attempt to improve performance a bit
2013-11-11 08:28:15 +00:00
Mark Vejvoda f1abe148ea - bugfix for background crc thread shutdown
- more performance monitoring and better output of only warnings
2013-11-11 04:46:49 +00:00
Mark Vejvoda 8a7f686e33 updated to warn on console when performance is showing poor 2013-11-11 04:08:10 +00:00
Mark Vejvoda d2494605e9 made performance info viewable by toggle key 2013-11-11 03:34:42 +00:00
Mark Vejvoda ed94e9578c added performance info for various game sections using: ShowInGamePerformance=true 2013-11-11 01:42:27 +00:00
Mark Vejvoda d32de80491 bugfix for precache crc thread unpause on game end 2013-11-10 21:55:22 +00:00
Mark Vejvoda e712f307c3 attempt to see if removing this mutex is stable and improves performance 2013-11-10 19:49:02 +00:00
Mark Vejvoda 8ea6235495 ensure pre cache crc thread does not interfere with running game 2013-11-10 19:47:04 +00:00
Mark Vejvoda 2d4cf315f6 attempt to fix performance issue with pathfinder and mutexes 2013-11-10 07:25:52 +00:00
Mark Vejvoda 597feb452f fix warnings from vc++ 2013-11-10 05:27:59 +00:00
Mark Vejvoda ebaa8ced1a - ensure mutexes are properly protecting shared data in pathfinder 2013-11-10 05:23:59 +00:00
Mark Vejvoda c6368b221e - added optional display of a frame count to help debug 2013-11-10 04:42:24 +00:00
Mark Vejvoda b9e3f57894 - attempt to rollback change that causes game differences on different platforms 2013-11-10 04:26:57 +00:00
Mark Vejvoda 856e6fd88e when using team switch, AI player will now always answers YES if he already lost the game 2013-11-10 04:26:20 +00:00
Mark Vejvoda fd2cc5f66b updating pathfinder mutexes to ensure safety of shared access to precache buffers 2013-11-09 21:22:51 +00:00
Mark Vejvoda 273abcde75 try to see if this improves pathfidner performance 2013-11-09 20:44:37 +00:00
Mark Vejvoda ba3e5a6030 added ip address for socket write errors 2013-11-09 19:32:13 +00:00
Mark Vejvoda 54338461dc add timer for socket write errors to avoid performance penalty when writing to console 2013-11-09 19:30:36 +00:00
Mark Vejvoda bb2e2d0f64 removed more unused code for last path cache which was already removed 2013-11-09 19:14:53 +00:00
Mark Vejvoda 8d69cc02fd update cmake script for mac and miniupnpc 2013-11-09 18:33:19 +00:00
Mark Vejvoda d55af0355b added mac define for darwin compiling miniupnpc 2013-11-09 18:10:41 +00:00
Mark Vejvoda 095351c1a0 removed unused code 2013-11-09 16:51:00 +00:00
Mark Vejvoda 23cab07fe8 code cleanup from cpp check 2013-11-09 03:16:41 +00:00
Mark Vejvoda f6e5a6a3a0 code cleanup from cpp check (And removed commented and useless code) 2013-11-09 01:26:29 +00:00
Titus Tscharntke 907a95ff8b add "(.7z)"-String to error messages to give people at least an idea why tileset/techtree download is blocked 2013-11-09 01:14:32 +00:00
Mark Vejvoda 450f4eb0fb - bugfix masterserver showing multiple hosts when host opens and closes mutlipel times without starting
- stats shows no decimal places now for player score
2013-11-09 01:08:56 +00:00
Mark Vejvoda 2c452d3587 attempt to use per faction mutexes for safer pathfinding 2013-11-08 22:41:17 +00:00
Mark Vejvoda e8a94eacfc tracking for nig's issue 2013-11-08 19:00:47 +00:00
Mark Vejvoda 0f5f4c0792 bugfix for nig's issue 2013-11-08 17:01:32 +00:00
Mark Vejvoda 22b230a5b3 bugfix for nig's issue 2013-11-08 16:26:36 +00:00
Mark Vejvoda 96d2723646 tracking down nigs bug 2013-11-08 15:30:53 +00:00
Tom Reynolds ddbb69b6fb Masterserver:
· Add LICENSE file
· Add copyright header where missing
· Improve README file
2013-11-08 12:41:11 +00:00
Mark Vejvoda e75a88b42c updated status textures and alinged the texture position in menus as they were off by 2 pixels 2013-11-08 02:50:59 +00:00
Mark Vejvoda 342aba5caa - set curl connection timeout to 60 minutes
- set curl ftp response timeout to 2 minutes
2013-11-08 02:32:11 +00:00
Mark Vejvoda 2baab89bab more cpp check fixes 2013-11-08 01:03:24 +00:00
Mark Vejvoda 382cb120ee bugfix to init all variables for client connection 2013-11-08 00:48:05 +00:00
Mark Vejvoda 3796b035cd remove font macro since it always made cppcheck report bad things about the code 2013-11-07 20:41:05 +00:00
Mark Vejvoda 6fe733468d some cpp check cleanup 2013-11-07 20:07:03 +00:00
Mark Vejvoda 95b7172260 vc++ warnings fixes 2013-11-07 19:00:47 +00:00
Mark Vejvoda 9b097fd911 decouple masterserver from network host game settings into two seperate threads 2013-11-07 18:39:08 +00:00
Mark Vejvoda b7a7d3bc4a ensure load saved games checks if new attribute exists 2013-11-07 05:20:02 +00:00
Mark Vejvoda 4a70fd09e2 added lua method to be able to allow or disallow speed change toggle
void disableSpeedChange();
	void enableSpeedChange();
	bool getSpeedChangeEnabled();
2013-11-07 05:18:21 +00:00
Mark Vejvoda f7002a36ef attempt to fix menu disconnect timeout issues 2013-11-07 03:33:04 +00:00
Mark Vejvoda 73bf27d76e attempt to fix menu disconnect timeout issues 2013-11-07 02:30:23 +00:00
Mark Vejvoda f0546df518 added more debug tracking info if win64 crashes 2013-11-07 01:55:02 +00:00
Tom Reynolds 712e1129a7 · Make search engine robots not index the masterserver 2013-11-07 01:29:06 +00:00
Mark Vejvoda 3f611a1d17 refactor core data code to move features into smaller chunks 2013-11-06 07:52:05 +00:00
Mark Vejvoda 493981e8b3 - reverted win64 to sse2
- added some debug info for win64 testing
2013-11-06 02:14:49 +00:00
Mark Vejvoda eb6466889f do not crash and exit game when core data textures are not found 2013-11-06 02:02:00 +00:00
Mark Vejvoda 70421d1b3d added a check for data and user data paths being the same 2013-11-06 00:31:36 +00:00
Titus Tscharntke e689ac8bff "Observer" and "Random" moved to main lang file instead of techtree based translation 2013-11-05 23:35:11 +00:00
Titus Tscharntke 7224f134c7 hotkey support for scenario list boxes 2013-11-05 21:25:51 +00:00
Mark Vejvoda dbb2409d76 remove usless output from error message 2013-11-05 21:13:26 +00:00
Mark Vejvoda 5ab99d2469 cppcheck cleanup 2013-11-05 20:59:28 +00:00
Mark Vejvoda 282feba074 bugfix for holding control to set all slots to same control type 2013-11-05 19:40:27 +00:00
Mark Vejvoda 345907fc18 attempt to make win64 faster by using avx (as opposed to sse2) 2013-11-05 06:31:48 +00:00
Mark Vejvoda f4cbced3f4 more vc++ warning fixes as well as disable an unused font renderer in windows 2013-11-04 20:16:52 +00:00
Mark Vejvoda b190968e6b - bugfix for save / restore game (spelling mistake)
- vc++ warning fixes
2013-11-04 19:16:28 +00:00
Mark Vejvoda c6b42e4bf6 bugfixes in win64 for exception handling 2013-11-04 17:42:48 +00:00
Mark Vejvoda 1134ad399d - added a more graceful way to handle more serious errors during data validation commands in order to offer more detailed error analysis 2013-11-04 07:21:04 +00:00
Titus Tscharntke 7c4c7a142b code cleanup ( too many formatStrings() ...) 2013-11-03 21:55:50 +00:00
Titus Tscharntke d3d8623a2d default values for faction names and techtrees should be "formatted" to avoid confusion in menus 2013-11-03 21:38:39 +00:00
Mark Vejvoda 9a3463330c *Stupid* vc++ compiler never ceases to amaze me how pathetic it is. 2013-11-03 07:55:20 +00:00
Mark Vejvoda 8d4f5a9f40 i know its crazy, but attempt performance gains by avoiding use of int64 as much as possible. 2013-11-03 07:18:27 +00:00