Rampoina/MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4,742 Commits 1 Branch 0 Tags 27 MiB
94667b9ab9
Commit Graph

4090 Commits

Author SHA1 Message Date
SoftCoder
7643c2b591 - changed registry branch to hkey local machine for packet throttle 2014-01-01 11:23:51 -08:00
SoftCoder
02cb5c235d - bugfix to compile in msvc 2014-01-01 11:08:51 -08:00
SoftCoder
676a6071fa - attempt to disable packet throttling on windows 
- added some network packet debug code
 2014-01-01 10:59:55 -08:00
SoftCoder
21a12a6c72 - added ability to render map preview full screen when user clicks on the map preview. Click anywhere on the fullscreen map to restore. 2013-12-30 23:32:06 -08:00
SoftCoder
b109b26664 - attempt to add crude thread state tracking in thread class and force thread to die if it appears to be stuck (and output to console) 2013-12-30 21:23:49 -08:00
SoftCoder
e0aa65402d - added ability to force the LUA version to compile with (5.1 or 5.2) 2013-12-30 18:30:23 -08:00
SoftCoder
8742d36a06 - do not save empty lua tables 2013-12-30 17:12:49 -08:00
SoftCoder
5613b0739e - added more lua debug info 2013-12-30 14:00:04 -08:00
SoftCoder
853d531d11 - added two new lua methods basxto: 
storeSaveGameData(name, value)
string loadSaveGameData(name)
 2013-12-30 12:55:59 -08:00
SoftCoder
2c788e074a - fix auto loading scenario from commandline 2013-12-30 12:19:10 -08:00
SoftCoder
c7c82b56e1 - a little cleanup of building with lua and CMAKE 
- added ability to force building without static libs in build script: -d=1
- added --lua-debug commandline option
 2013-12-30 11:02:43 -08:00
SoftCoder
5c90b9148c - bugfix for saving / loading booleans in a lua table 2013-12-30 09:28:25 -08:00
SoftCoder
97d11a9cfd - script manager detected errors don't try to translate the error 2013-12-30 08:17:05 -08:00
SoftCoder
5b445ad388 - removed stack trace from script manager methods that create known errors to make error message smaller. 2013-12-30 07:57:51 -08:00
titiger
329805ac30 Merge branch 'master' of github.com:MegaGlest/megaglest-source 2013-12-30 16:20:03 +01:00
titiger
11eeed59a1 new attribute "render-size" in unit-type 2013-12-30 16:19:08 +01:00
SoftCoder
fda53f47d1 - bugfix for loading scenarios with their own techs 
- all scenario errors are now caught and shown in a messagebox and game can continue.
 2013-12-30 02:01:47 -08:00
SoftCoder
b6cd751250 - bugfixes on windows platform when some folders and files are missing, do not crash hard. 2013-12-27 23:05:20 -08:00
SoftCoder
163a5a173a - bugfix when user has no sound device 2013-12-27 22:32:58 -08:00
SoftCoder
c442328b58 - small bugfix for lazy loading textures 2013-12-27 22:08:51 -08:00
SoftCoder
62821793c0 - moved core game data asset loading into lazy load methods to try to improve the startup speed of megaglest. 2013-12-27 22:00:29 -08:00
Tom Reynolds
533b1f0bfe Merge branch 'master' of github-tomreyn-megaglest:MegaGlest/megaglest-source 2013-12-26 18:29:35 +01:00
Tom Reynolds
9c51bfc60c introduce shared linux shell code / externalize distribution check 2013-12-26 18:28:21 +01:00
SoftCoder
220a0130dd - bugfixes for msvc compile 2013-12-25 11:48:08 -08:00
SoftCoder
3bb9da6cdf - removed directsound related references as it has been deprecated since 3.6.0.1 
- coverity related fixes
 2013-12-25 11:42:00 -08:00
SoftCoder
f06d474b60 - cleanup some socket issues and also a possible int overflow 2013-12-24 22:44:46 -08:00
SoftCoder
3111b733e2 - bugfix for chrono class calcs causing group camera recall to fail (And numerous other problems) 
- added better tracking of mutexes by assigning them location info
 2013-12-24 22:27:44 -08:00
SoftCoder
25326c64b1 - cleanup some warnings from msvc 2013-12-23 10:34:52 -08:00
SoftCoder
1ba098d0f0 - clang compiler warning cleanup 2013-12-23 00:05:07 -08:00
SoftCoder
e0c2a388d4 - msvc compiler warning cleanup 2013-12-22 23:58:12 -08:00
SoftCoder
bcaad53fbe - cleanup some msvc++ compiler warnings 2013-12-22 23:15:31 -08:00
SoftCoder
3a24531ba7 - more code cleanup based on cppcheck results and valgrind 
- added -h option to build-mg.sh to show parameter usage.
 2013-12-22 22:53:26 -08:00
SoftCoder
2d3e04f413 - a few more minor code quality fixes 2013-12-22 21:03:40 -08:00
SoftCoder
da3c55c00b - bugfix, now support proper saving and reloading of games where attack boost is applied to units 2013-12-22 16:10:00 -08:00
SoftCoder
6cd1d237ab - a little more code cleanup from coverity issues 2013-12-22 13:18:40 -08:00
SoftCoder
f8c497f6dc - in progress work to try to get attack boosts loading from a saved game (not working yet and commented out) 2013-12-21 21:53:27 -08:00
titiger
372442d181 Render order changed to get better render results with units using 
semi-transparent textures.
 2013-12-22 01:36:54 +01:00
SoftCoder
343a728911 - cleanup some network related code and try to remove uneeded noise 2013-12-18 23:35:27 -08:00
titiger
9249d6370c looks like glEnable(GL_COLOR_MATERIAL); was still needed to render units properly 2013-12-18 21:35:04 +01:00
Tom Reynolds
39be9372aa Make showGameStats.php produce HTML which is suitable for embedding into an existing DOM 2013-12-18 20:40:08 +01:00
SoftCoder
998cabafac - a few more coverity reported fixes 2013-12-18 08:26:16 -08:00
SoftCoder
606aa392c7 - added coverity linux script 
- a few updates to fix coverity reported issues
 2013-12-17 23:57:45 -08:00
SoftCoder
e3996ceb92 - bugfixes for coverity reported issues 
- new bash parameters for build-mg.sh (in prep for coverity automation)
- updated travis build to use new bash param
 2013-12-17 17:35:51 -08:00
SoftCoder
d8160c1065 - modified game time to be game duration instead as that is more useful for players who want to see in game clock info 2013-12-17 13:26:58 -08:00
SoftCoder
a56eb83c91 - moved map path into config class 
- proper render performance calc compare
 2013-12-16 23:54:33 -08:00
SoftCoder
ca12b7912a - cleanup clang warning 2013-12-16 19:25:07 -08:00
SoftCoder
b5243763a2 - added some device cleanup in case its needed 2013-12-16 19:11:17 -08:00
SoftCoder
1463dc0fc1 - bugfix for memory leak 2013-12-16 17:48:52 -08:00
SoftCoder
d1f9fbc4a7 - cleanup warnings from clang 2013-12-15 09:19:24 -08:00
SoftCoder
0b73d3922a - fixed windows build from coverity updates 2013-12-14 22:59:32 -08:00
SoftCoder
f269273f07 - round #2 of coverity bug fixes 2013-12-14 22:37:15 -08:00
SoftCoder
b8ab732b85 - cppcheck code cleanup 2013-12-14 18:07:22 -08:00
titiger
87f855b419 Very transparent parts of textures were cutted away while rendering. It turned out there is only a need to do this for shadows and selection rendering, not for real rendering. 2013-12-15 00:12:25 +01:00
SoftCoder
6e061f459d - cleanup a few newly introduced compile warnings 2013-12-14 10:49:01 -08:00
SoftCoder
22beafe122 - fixed windows build for vc++ 2010 2013-12-14 03:09:12 -08:00
SoftCoder
b11932b92d - cleanup from cppcheck report 2013-12-14 03:03:19 -08:00
SoftCoder
d69e19b87b Merge branch 'master' of github-softcoder-megaglest:MegaGlest/megaglest-source 
Conflicts:
	source/shared_lib/include/platform/sdl/factory_repository.h
 2013-12-14 02:45:25 -08:00
SoftCoder
65e55d3796 - merged changes with windows build fixes 
- updated svn commands to git for validation params
 2013-12-14 02:44:41 -08:00
SoftCoder
1d9f1f9432 - forgot to commit changes 2013-12-14 02:33:03 -08:00
SoftCoder
ec13e904d3 - fixed windows build (removed gl2 references) 2013-12-14 02:29:32 -08:00
SoftCoder
209458adee - removed deprecated gl2 code as it was not used 2013-12-14 02:22:30 -08:00
SoftCoder
b9d6b38e8f - coverity based bug fixes - round #1 2013-12-13 23:04:12 -08:00
SoftCoder
c887b0c357 - attempt to cleanup a few warnings 
- attempt to get git rev info each compile (not just when running cmake)
 2013-12-11 23:16:56 -08:00
SoftCoder
c91b92901b - added ignore folder 2013-12-11 19:18:33 -08:00
SoftCoder
a567fe159d - bugfix for headless mode segfault reported by titi 2013-12-11 19:07:24 -08:00
SoftCoder
ad81692331 Merge branch 'master' of https://github.com/williame/megaglest-source 2013-12-09 18:07:42 -08:00
titiger
3bc5901a01 From Bugreport: cannot delete characters after clicking on player name in lobby 
https://forum.megaglest.org/index.php?topic=9302.0
 2013-12-10 01:52:08 +01:00
titiger
dcada00514 as there are already several changes to originla 3.9.0 we better set a new version number 2013-12-09 23:14:33 +01:00
SoftCoder
e718f78931 - corrected compile warnings for unit test 2013-12-08 20:08:44 -08:00
Will
2d6da27807 Merge branch 'master' of github.com:MegaGlest/megaglest-source 2013-12-07 20:41:44 +01:00
SoftCoder
02d41bd5f7 fixed windows build 2013-12-06 09:08:47 -08:00
Will
46a0dab916 moved model constructor always behind factory 2013-12-05 21:28:20 +01:00
Will
6afadafa1e Start to abstract model 2013-12-05 16:17:41 +01:00
SoftCoder
6ae1d179bb - updated for proper build on Mac 2013-12-04 14:54:02 -08:00
Will
03c0197437 merge from upstream 2013-12-04 23:37:04 +01:00
William Edwards
e71e7104dc Trying to build on OSX 2013-12-04 22:38:06 +01:00
SoftCoder
f9e217df94 - bugfix so Mac builds 2013-12-04 13:34:00 -08:00
Will
7e4e98857b integrate upstream 2013-12-04 08:49:33 +01:00
SoftCoder
b868a8468b - bugfixes to winner / loser logic to keep calculating stats and publish to masterserver after we determine a winner or loser as the game may not yet be fully over and we want accurate game stats on the masterserver. 2013-11-30 20:33:25 -08:00
SoftCoder
4b50560ca9 - added color picking used colors count in debug view 2013-11-30 17:38:32 -08:00
SoftCoder
f7bc5e8f92 - bugfix and additional code (for now) to track duplicates and problems in color picking. We now use will's implementation as it supports 64K colors. 2013-11-30 17:20:30 -08:00
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