Commit Graph

1424 Commits

Author SHA1 Message Date
Mark Vejvoda
1520cdcea0 add check for invalid model missing texture 2013-06-22 21:41:30 +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
0e184d609c updated cmake message 2013-06-21 19:24:59 +00:00
Mark Vejvoda
7b4a724764 bugfix for libminiupnpc cmake script 2013-06-21 19:19:38 +00:00
Mark Vejvoda
0c56e13e7a bugfix for libminiupnpc cmake script 2013-06-21 19:04:57 +00:00
Mark Vejvoda
bd4e2c8724 applied heightmap addition to map editor -> thanks muwum 2013-06-21 18:21:07 +00:00
Mark Vejvoda
441390e5c5 - fixed vc++ 2012 build
- some fixes found from vc++ 2012 code analyser
2013-06-21 00:12:19 +00:00
Mark Vejvoda
4848e957e7 code cleanup from cppcheck 2013-06-20 22:51:28 +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
b31df9e94c attempt to further stabilize thread garbage collector 2013-06-18 22:41:18 +00:00
Mark Vejvoda
eec6d4f59c bugfix for pure virtual error on garbage collector thread 2013-06-18 22:26:12 +00:00
Mark Vejvoda
1b3ee1503b code cleanup from cppcheck 2013-06-15 01:43:44 +00:00
Mark Vejvoda
b9bb1623a6 make sure unpnpc patch is applied as given on sourceforge 2013-06-14 03:32:10 +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
1d7b138ac3 load bmp's a little faster 2013-06-12 15:22:16 +00:00
Mark Vejvoda
cc4d650fad tga file load speed improvement 2013-06-12 07:21:16 +00:00
Mark Vejvoda
80f25e8fff bugfix for windows copmpiler 2013-06-12 06:51:59 +00:00
Mark Vejvoda
1e1676a34a more render improvements 2013-06-12 06:14:55 +00:00
Mark Vejvoda
836172f87c more render improvements 2013-06-12 01:24:10 +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
6387d1b1b1 add default value of allowed keys in english of none 2013-06-08 21:57:11 +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
56774bc087 make server slots continuously read data on sockets during game 2013-06-04 00:31:41 +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
9ef098ba02 add more unit tests to cover all of the xml parser code 2013-05-28 20:56:01 +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
2c1b181bc7 a bunch more code cleanup from cppcheck 2013-05-26 06:03:32 +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
5b664fb1a2 - bugfix for transifex tutorial download files now loaded into UI
- updated each thread to provide its name
2013-05-21 20:28:42 +00:00
Mark Vejvoda
7966422582 attempt to fix segfaults discovered during testing 2013-05-18 05:57:22 +00:00
Mark Vejvoda
748763f0f1 code cleanup based on cppcheck results 2013-05-17 05:21:14 +00:00
Mark Vejvoda
2fd5c2241e code cleanup based on cppcheck results 2013-05-17 04:06:39 +00:00
Mark Vejvoda
8408526b12 code cleanup based on cppcheck results 2013-05-17 03:59:34 +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
7534feb971 forgot to add an include 2013-05-01 21:01:57 +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
3163b3887a fix the unit tests that didn't work on some compilers handling static cast of enums in a weird way 2013-05-01 01:20:29 +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
Titus Tscharntke
6849d432bf colorpicking improved again and hopefully fixed false clicks on attacks ... ( works with low display resolutions too now) 2013-04-27 17:38:35 +00:00
Titus Tscharntke
8ba869c4b7 fixed double click selection for colorpicking 2013-04-26 15:25:15 +00:00
Titus Tscharntke
77ca62240e and colorpicking is faster again 2013-04-25 23:46:55 +00:00
Titus Tscharntke
9d3c99d6d0 Speed for colorpicking :-D. Its nearly as fast as selectbuf now . ( and tree selection for colorpicking is fixed ) 2013-04-25 23:12:34 +00:00
Titus Tscharntke
519ad0fbeb Bug in models or bug in g3dviewer ? Newer models have set opacity of Material set to 0 ( needed to see transparency in blender ) but this full transparency is ( correctly) exported, resulting in not beeing shown in G3d Viewer or when used as unit. Used as tileset Models all was ok. So fixed for the Moment, but not entirely happy with this now. Maybe the blender exporter should set opacity to 1 if its set to 0 instead. 2013-04-08 22:01:38 +00:00
Mark Vejvoda
8983592400 - attempt to make mutex usage more stable and find memory issues 2013-04-05 05:39:30 +00:00
Titus Tscharntke
d2928459a0 better line wrapping respecting \n too now 2013-04-03 16:16:39 +00:00
Mark Vejvoda
d703f7605b - try to improve network performance 2013-03-23 23:18:50 +00:00
Mark Vejvoda
01b757a743 - try to improve network performance 2013-03-23 23:13:33 +00:00
Mark Vejvoda
159cdc40d0 - attempt to see if this helps network performance 2013-03-23 22:32:51 +00:00
Mark Vejvoda
bad8f62f94 - bugfixes for detecting client disconnection 2013-03-15 06:51:57 +00:00
Mark Vejvoda
b805308a42 - bugfixes for detecting client disconnection 2013-03-15 00:31:51 +00:00
Mark Vejvoda
9ceaf6cec1 - attempt to further protect threaded socket access 2013-03-14 19:46:31 +00:00
Mark Vejvoda
16d25210e4 - make client use less CPU for network games 2013-03-13 21:32:48 +00:00
Mark Vejvoda
1e07d023ce - additional socket thread protection to fix latest crash reported by titi 2013-03-11 03:52:35 +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
560ed46cc0 - more bugfixes for slot switching and joining in progress games
- disallow server to toggle pause state when client is joining
- fix dmp extension on linux
2013-03-06 14:29:49 +00:00
Mark Vejvoda
b8357b8696 - updated cmake to output more info regarding finding libircclient and better support for ircclcient
- cleanup too many exclamations in finding ftgl libs
2013-03-06 00:47:21 +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
Mark Vejvoda
45b8cf21a4 - attempt to fix disconnect and thread lock for in game connect games 2013-02-26 07:05:46 +00:00
Mark Vejvoda
af89f4c5ed - fixed the build on windows 2013-02-22 22:40:31 +00:00
Mark Vejvoda
b8f594fcf2 - comment out debug statement from last commit 2013-02-21 23:34:26 +00:00
Mark Vejvoda
98e8aff4c3 - check when loading xml's that they are not a folder
- change dump world key to \
2013-02-21 23:30:26 +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
87a4eb49e4 - fixed lua 5.2 code for save / load games
- cmake now prefers lua 5.2 over 5.1
2013-02-16 21:20:09 +00:00
Mark Vejvoda
45dc4c0e5d - updates to join in progress game, and now allow for switching slots 2013-02-16 19:11:36 +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
9bc6d33f1d - bug fixes to stabilize the windows build 2013-02-09 06:57:05 +00:00
Mark Vejvoda
86a7ca2b6f - bugfix for older upnpc versions 2013-02-08 17:51:53 +00:00
Titus Tscharntke
06a1fad2fc fix for more picky gcc 4.7.2 compiler 2013-02-08 17:42:44 +00:00
Mark Vejvoda
da611f8a1f - add a few more safety's in the code to avoid memory issues 2013-02-08 07:56:46 +00:00
Mark Vejvoda
74d7841c4d - add a few more safety's in the code to avoid memory issues 2013-02-08 07:54:12 +00:00
Mark Vejvoda
941b00b9bb - remove 8 bit color as a selectable options in UI 2013-02-07 01:41:52 +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
71d5f24828 - added support for google-breakpad in linux 2013-02-01 02:27:01 +00:00
Mark Vejvoda
bf71461d78 - see if this fixes loading issue on windows 2013-02-01 00:30:32 +00:00