Rampoina/MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
5,838 Commits 1 Branch 0 Tags 27 MiB
0b1dcc70f5
Commit Graph

812 Commits

Author SHA1 Message Date
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
f269273f07 - round #2 of coverity bug fixes 2013-12-14 22:37:15 -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
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
Will
7e4e98857b integrate upstream 2013-12-04 08:49:33 +01: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
2ff75c54e2 merged updates 2013-11-30 14:29:02 -08:00
SoftCoder
f217db38f1 - changed to git version stamp 2013-11-29 13:13:30 -08:00
Will
c6530c2783 merging in all Will's changes 2013-11-29 02:12:34 +01:00
filux
00b4d9ab4e resolved conflicts by conversion CRLF to LF 2013-11-28 08:26:39 +01: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
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
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
b2f3748168 - updates related to debian package standards 2013-11-16 20:27:51 +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
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
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
85799eddc2 more user friendly handling of loading corrupt saved game files 2013-11-14 03:33:15 +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
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
d32de80491 bugfix for precache crc thread unpause on game end 2013-11-10 21:55:22 +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
b9e3f57894 - attempt to rollback change that causes game differences on different platforms 2013-11-10 04:26:57 +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
9b097fd911 decouple masterserver from network host game settings into two seperate threads 2013-11-07 18:39:08 +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
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
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
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
Mark Vejvoda
3fb957a13e more vc++ compiler warning cleanup 2013-11-02 22:58:00 +00:00
Mark Vejvoda
eb085907d0 fixed the build 2013-11-02 11:22:32 +00:00
Mark Vejvoda
1d3859ff32 - windows x64 updates to get things compiling on vc2012 x64 2013-11-02 11:04:52 +00:00
Mark Vejvoda
2612774078 a few small performance improvements based on perf tool 2013-11-01 06:42:57 +00:00
Mark Vejvoda
7ad30f92bf - added game statistics gathering and saving on masterserver. 
see Table glestserver now has the field: gameUUID
Table glestgamestats has game header stats
Table glestgameplayerstats has game player stats
 2013-10-31 00:57:36 +00:00
Mark Vejvoda
c66db8ce49 fix windows build 2013-10-28 21:08:49 +00:00
Mark Vejvoda
957fe2d09b cleanup of show message code for headless mode 2013-10-28 18:58:15 +00:00
Mark Vejvoda
a17068165f try to see if this makes disabled network crc checking more performance freindly 2013-10-20 20:06:19 +00:00
Mark Vejvoda
a4a32fc4fe - added more crc checking info to track oos 2013-10-19 21:12:08 +00:00
Mark Vejvoda
9224a7e242 - attempt to fix crc file bug 2013-10-18 15:47:17 +00:00
Mark Vejvoda
83055456d2 - added more crc capture data to track down oos 2013-10-17 06:36:28 +00:00
Mark Vejvoda
fb276d1dd7 - added more crc logging to detect oos location 2013-10-17 02:49:25 +00:00
Mark Vejvoda
37a53c114a - attempt to detect oos by adding more crc and log info 2013-10-14 02:35:42 +00:00
Mark Vejvoda
ada8810666 added support for properly named attack-strength tag (and keep support for old name) 2013-10-03 14:51:26 +00:00
Mark Vejvoda
53a557d8d1 - fixed mod center image previews in cases where userdata folder was non default 
- removed commented out old code
 2013-10-03 05:44:50 +00:00
Mark Vejvoda
9e60723296 revert most doubles back to float and truncate at 6 decimals 2013-10-03 00:17:51 +00:00
Mark Vejvoda
dc503d6340 - attempt to see if this makes stability better 2013-10-02 20:22:10 +00:00
Mark Vejvoda
939e88ce38 - attempt to fix additional oos issues 2013-09-28 07:10:25 +00:00
Mark Vejvoda
9967df316c - attempt to fix additional oos issues 2013-09-28 05:06:04 +00:00
Mark Vejvoda
63ed244de2 - attempt to fix additional oos issues 2013-09-27 00:14:54 +00:00
Mark Vejvoda
37c2ace11a - rollback last commit 2013-09-26 16:37:32 +00:00
Mark Vejvoda
7349a1f126 - attempt to convert use of more floats to double 2013-09-25 15:40:19 +00:00
Mark Vejvoda
525e0da652 - change a bunch of floats to double and remove path from particle texture 2013-09-25 00:17:11 +00:00
Mark Vejvoda
875eb95790 bugfix for particle cleanup 2013-09-24 03:44:15 +00:00
Mark Vejvoda
f66a0834c9 try to cleanup possible memory issue 2013-09-23 22:25:38 +00:00
Mark Vejvoda
3a6544a257 attempt for big cleanup of out of synch issues, please test! 2013-09-23 17:16:34 +00:00
Mark Vejvoda
b5e26070b1 - updated to beta2 and added primitive CRC checking for network games, requies the Host user to set the following ini to enable CRC's: 
EnableNetworkGameSynchChecks=true
 2013-09-12 03:33:43 +00:00
Mark Vejvoda
17da18978a init variables 2013-06-22 07:39:12 +00:00
Mark Vejvoda
67bf5ebc1b bugfix for vc++ compiling 2013-06-22 04:32:22 +00:00
Mark Vejvoda
bb14d4cc1e bugfix for shutdown of threads and garbage collection. 2013-06-22 03:36:18 +00:00
Mark Vejvoda
76ee030e93 bugfix for shutdown of threads and garbage collection. 2013-06-21 22:59:22 +00:00
Mark Vejvoda
bd4e2c8724 applied heightmap addition to map editor -> thanks muwum 2013-06-21 18:21:07 +00:00
Mark Vejvoda
dde601e416 attempt to implement will's mesh merging for better render performance 2013-06-20 07:24:09 +00:00
Mark Vejvoda
1eb17e3bb2 - added support for translated techtrees. To produce a default techtree lng file in the proper techtree folder run: 
megaglest --translate-techtrees=megapack

where megapack is the name of the techtree
 2013-06-12 22:49:47 +00:00
Mark Vejvoda
adce76d68f more mad attempts to squeeze better performance 2013-06-12 17:49:12 +00:00
Mark Vejvoda
1e1676a34a more render improvements 2013-06-12 06:14:55 +00:00
Mark Vejvoda
668b34db8e more mad attempts to squeeze better performance 2013-06-11 06:44:26 +00:00
Mark Vejvoda
267dc7534f bugfix for float rounding segfault 2013-06-11 01:23:04 +00:00
Mark Vejvoda
d067b52799 fixed windows build and added new test to vc++ project 2013-06-10 23:08:03 +00:00
Mark Vejvoda
16f4e08395 attempt to speed up float truncation and add some unit tests 2013-06-10 22:38:33 +00:00
Mark Vejvoda
4533da71bd bugfixes for attack boost did not properly rollback boost value sometimes for multiplier style boosts 2013-06-06 04:10:49 +00:00
Mark Vejvoda
173075d962 allow each language to specify special keys allowed for that language (bugfix for polish) 2013-06-05 05:53:59 +00:00
Mark Vejvoda
25450ebb85 bugfix for both progress and animation smoothness 2013-06-03 14:30:52 +00:00
Mark Vejvoda
e809080d0f tracking down bug on i386 platform 
- comment titi's model debug output
 2013-06-01 17:23:51 +00:00
Mark Vejvoda
8c725df8a2 tracking down bug on i386 platform 2013-06-01 17:02:10 +00:00
Mark Vejvoda
22eb5cc4d4 attempt to fix a thread bug when starting a game 2013-06-01 06:28:03 +00:00
Mark Vejvoda
7f88d866c1 attempt to fix a thread bug when starting a game 2013-06-01 06:07:14 +00:00
Mark Vejvoda
4af65d1e19 added unique playerid for every client 2013-06-01 02:31:12 +00:00
Mark Vejvoda
72480bc576 added ability to reference sound and videos in lua using variables: {TECHTREEPATH}, {SCENARIOPATH}, {TUTORIALPATH} example: 
playStreamingSound('{SCENARIOPATH}/music/myambient.ogg')
 2013-05-28 02:54:23 +00:00
Mark Vejvoda
aa69a5818b added some new lua methods to determine day or night and new event 2013-05-25 20:46:36 +00:00
Mark Vejvoda
a17fcdb5b4 bugfixes for thread shutdown 2013-05-17 00:40:54 +00:00
Mark Vejvoda
910bb8bc56 - attempt to have more clean shutdown of threads on game exit 2013-05-17 00:08:26 +00:00
Mark Vejvoda
febbf5012c attempt to fix delay of irc client 2013-05-15 04:49:57 +00:00
Mark Vejvoda
dbd26de28f attempt to fix crash of irc client on exit 2013-05-15 00:45:34 +00:00
Mark Vejvoda
5370729ce1 bugfix to close irc client down quickly when exiting application. 2013-05-03 23:11:57 +00:00
Mark Vejvoda
1b344808ff added more unit tests and did some refactoring of xml parser code 2013-05-03 20:18:01 +00:00
Mark Vejvoda
c30d78ff74 saved games for rejoining in progress games saves to .zip and sends that to clients. 2013-05-01 20:56:19 +00:00
Mark Vejvoda
65266ca41e - added cppunit into build system and started writing some unit tests (requires new dependency cppunit) 2013-04-30 01:27:14 +00:00
Mark Vejvoda
8983592400 - attempt to make mutex usage more stable and find memory issues 2013-04-05 05:39:30 +00:00
Mark Vejvoda
159cdc40d0 - attempt to see if this helps network performance 2013-03-23 22:32:51 +00:00
Mark Vejvoda
6152b6b7bb - additional socket thread protection to fix latest crash reported by titi 2013-03-11 03:27:20 +00:00
Mark Vejvoda
e74f747fbd - attempt to make connection status more reliable and have less hangs when disconnects occur 2013-03-08 08:42:08 +00:00
Mark Vejvoda
704935c534 - attempt to fix double free bug reported by tomreyn 2013-03-08 05:24:37 +00:00
Mark Vejvoda
47aa0050b8 - this seems to be stable now and handles lag quite well i think 2013-03-02 07:33:01 +00:00
Titus Tscharntke
01b6986581 First steps for new terrain texturing. In tileset xml do: 
<surface partsize="64">
			<texture path="textures/512.png"/>
                </surface>
 2013-02-20 17:42:47 +00:00
Mark Vejvoda
8916a86b8c - bugfixes for load / save game for in progress joining 2013-02-19 06:41:56 +00:00
Mark Vejvoda
9d19ff2b57 - added the first draft of joining games in progress 2013-02-15 18:25:10 +00:00
Titus Tscharntke
a3635376cf no more trouble with middle mouse button camera view 2013-02-09 23:20:40 +00:00
Mark Vejvoda
bf468a39e1 -bugfix for vc++ 2010 (last commit was done from vc++ 2012) 2013-02-05 02:35:09 +00:00
Mark Vejvoda
f4b026b41f - bugfix on linux 2013-02-04 08:36:03 +00:00
Mark Vejvoda
f87b8b6ee2 - updated code to protect against null pointers and uninitialized values and threading issues 2013-02-04 08:30:43 +00:00
Mark Vejvoda
8dc637527a - tighten up code.. ensure pointers set to null after delete, etc 2013-02-01 17:25:49 +00:00
Mark Vejvoda
bff9b1b3bc - cleanup a bunch of vc++ compile / link warnings 2013-02-01 08:12:20 +00:00
Mark Vejvoda
8cd7aa0e43 - code cleanup from cppcheck 2013-01-25 02:55:28 +00:00
Mark Vejvoda
87b39a3cb5 - fix unit selection 2013-01-24 15:52:11 +00:00
Mark Vejvoda
bf7445903d - cleanup some color pick code 2013-01-24 00:42:06 +00:00
Mark Vejvoda
d7d83f7c5e - attempt to speed up color picking 2013-01-23 23:20:54 +00:00
Mark Vejvoda
86eac7451b - attempt to speed up color picking 2013-01-23 22:34:22 +00:00
Mark Vejvoda
93438d42f4 - attempt to see if this fixes units that do not attack when right clicking enemy 
- see if this fixes crashes when using color picking
 2013-01-23 21:03:00 +00:00
Mark Vejvoda
ceedef5200 - see if this fixes color picking 2013-01-15 03:18:26 +00:00
Mark Vejvoda
2a927cd0b8 - try to improve error handling on windows for better stack traces 2013-01-11 22:00:10 +00:00
Mark Vejvoda
5d2066fdbb - added a new thread manager to try to see if it takes less CPU cycles while the thread controller waits for slaves to do their work. To enable the experimental thread manager set: EnableNewThreadManager=true 2013-01-10 21:16:28 +00:00
Mark Vejvoda
67be884d25 - bugfix for ircclient segfault using global cache 2013-01-08 07:55:48 +00:00
Mark Vejvoda
6872a873b2 - added support to disable libircclient via cmake: 
-DDISABLE_IRCCLIENT=On
 2013-01-08 06:59:53 +00:00
Mark Vejvoda
1f49886755 - re-enabled fog of war cache to improve performance 
- improve xml file loading speed
 2013-01-03 17:30:59 +00:00
Tom Reynolds
7c511b1238 Remove executable bit (svn propdel svn:executable) off files which don't need it 2013-01-02 15:03:44 +00:00
Mark Vejvoda
9275debe2d - allow changes to video resolution and fullscreen mode without restart 2013-01-01 02:24:23 +00:00
Mark Vejvoda
4c94cedb85 - upgrade embedded miniupnpc to 1.7 (fixes build) 2012-12-27 18:59:38 +00:00
Mark Vejvoda
7fdd70402d - added support for libfribidi for languages requiring complex text rendering like Arabic and Hebrew 2012-12-27 08:24:30 +00:00
Mark Vejvoda
68d8ef11d8 - see if this hotkey fix is ok for titi 2012-11-21 18:54:50 +00:00
Mark Vejvoda
f7ebba0301 - when changing playername, we reset the irc client connection when entering the internet lobby 2012-11-19 21:56:21 +00:00
Mark Vejvoda
3f82137c03 - fix for irc bug when leaving internet lobby too soon 2012-11-19 20:14:23 +00:00
Mark Vejvoda
4a0617b12c - ripped out a lot of unused code dealing with utf8 2012-11-15 08:12:40 +00:00
Mark Vejvoda
d0006db4a1 - updated for debian compliance 2012-11-15 07:50:43 +00:00
Mark Vejvoda
20def412bf - attempt to get new version system working 2012-11-15 00:35:49 +00:00
Mark Vejvoda
d322f73284 - bug fixes and patches from hasufell related to: 
- fontconfig not working
- new cmake option to control inclusion of libvlc
- new commandline option to force where to look for fonts: --font-path=x
- removal of libluajit from cmake
 2012-11-14 19:20:08 +00:00
Mark Vejvoda
0cd2389e95 - updated for debian compliance 2012-11-12 04:50:34 +00:00
Mark Vejvoda
24fae99539 - remove unused code as debian flagged it as potentially unsafe 2012-11-12 04:18:43 +00:00
Mark Vejvoda
8ba5524f35 - updated error handling to be more flexible so we can display better error details (like bad tga file, etc) 2012-11-10 23:19:42 +00:00
Mark Vejvoda
35f6a6665b - attempt to keep irc connection and just join / leave the irc channel as required to speed up irc in the lobby 2012-11-10 09:22:28 +00:00
Mark Vejvoda
2e14844a24 - attempt to bugfix windows using proper printf syntax for data types 2012-11-10 07:03:47 +00:00
Mark Vejvoda
ff58a868b3 - attempt to bugfix windows using proper printf syntax for data types 2012-11-10 06:37:23 +00:00
Mark Vejvoda
e3a7aedd5c - headless server now supports lan option 2012-11-09 21:50:01 +00:00
Mark Vejvoda
51ca2ccc91 - some cleanup of the irc code 2012-11-09 07:09:53 +00:00
Mark Vejvoda
16b85dbe79 - added another patch from cygal (he's on fire people!) to word wrap messagebox text 
- remove newlines from english text where appropriate
 2012-11-07 21:24:44 +00:00
Mark Vejvoda
29da478bd5 - more cppcheck code cleanup 2012-11-06 03:52:27 +00:00
Mark Vejvoda
61c86c15d1 - added code for new network protocol (disabled by default as i need to test this on arm) 2012-11-02 19:08:55 +00:00
Mark Vejvoda
00e075df97 - more byte order logic 
- added new network packet debug
 2012-11-01 22:00:55 +00:00