Commit Graph

3513 Commits

Author SHA1 Message Date
Mark Vejvoda
0f7f2ae287 lineup ui for pause for lag 2013-05-04 06:09:00 +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
348993853f bugfix for crc checking when data is toggled and user downloads somethign different 2013-05-03 06:25:38 +00:00
Mark Vejvoda
dc27d02972 bugfix to not crash when loading corrupt scenarios 2013-05-03 06:03:54 +00:00
Titus Tscharntke
775b351bc2 more space in options menues ( gfx menu will follow later ) 2013-05-02 22:35:54 +00:00
Titus Tscharntke
325f33a155 Selection via cellmap turned out not to be good -> revert 2013-05-02 20:52:23 +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
480c77949c bugfix for crc checking after download of missing content and server changes to different data then the data downloaded 2013-05-01 04:57:41 +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
3f15947448 fix the unit tests that didn't work on some compilers handling static cast of enums in a weird way 2013-05-01 01:13:17 +00:00
Mark Vejvoda
587377c03f fix the unit tests that didn't work on some compilers handling static cast of enums in a weird way 2013-05-01 01:01:50 +00:00
Mark Vejvoda
ec8d98f3c9 bugfix, restore human playername when reloading last game settings 2013-05-01 00:44:29 +00:00
Mark Vejvoda
c19065ebd0 bugfix for rain particles when loading keyboard setup in game (and memory cleanup) 2013-04-30 06:17:30 +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
db921c3fb7 attack enemy units even if you missed them and only hit the map cell. 2013-04-29 23:05:56 +00:00
Mark Vejvoda
45a1fcdf4e bugfix for purgeunused to not delete language files for techtrees 2013-04-29 05:51:41 +00:00
Titus Tscharntke
d303170b3f colorpicking: first we render buildings then we render units. By this we can select units in or behind buildings with colorpicking. 2013-04-28 10:26:25 +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
c8b6a9f410 fixed colorpicking selection for units in front of trees ( flying units above forests for example ) 2013-04-24 23:06:11 +00:00
Titus Tscharntke
b5aeb02d22 return button returned to wrong menu 2013-04-21 23:41:06 +00:00
Titus Tscharntke
1884fc5653 new options menu(s) 2013-04-21 17:04:36 +00:00
Titus Tscharntke
883cfbbd27 Default for twoFrameAnimation smoothing is false. 2013-04-17 00:56:04 +00:00
Titus Tscharntke
88e2756ac2 new switch for animated tileset objects with only two animation frames: smoothTwoFrameAnim="true".
( std::sin was used with intention, no need for streflops in this case )
2013-04-17 00:12:54 +00:00
Titus Tscharntke
a7b1f95ee4 g3d exporter sets fully transparent objects to opacity=1 2013-04-10 00:15:53 +00:00
Titus Tscharntke
59f6688dad uuh , I had some == = problems ... 2013-04-09 23:15:48 +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
Titus Tscharntke
1d8644bff5 making network things work... 2013-04-07 20:32:00 +00:00
Titus Tscharntke
bd5aa2e112 making network things work... 2013-04-07 19:25:02 +00:00
Titus Tscharntke
1071358140 making network things work... 2013-04-07 17:44:07 +00:00
Titus Tscharntke
571775fb30 making network things work.. 2013-04-07 17:11:29 +00:00
Titus Tscharntke
4a436066e7 slowdown and speedup clients based on recorded stats 2013-04-07 15:27:55 +00:00
Tom Reynolds
e8e7b96865 * master server: server list: search engines should not follow/weigh parameterized self references
* master server: allow / require product URL and and add link on public HTML server list
2013-04-06 17:50:49 +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
7a39fae6d0 message box shows up if player name is set to "newbie" 2013-04-03 16:17:14 +00:00
Titus Tscharntke
d2928459a0 better line wrapping respecting \n too now 2013-04-03 16:16:39 +00:00
Titus Tscharntke
c72cd2ac4c lets try it with a smoother catchup of clients 2013-03-25 22:25:57 +00:00
Titus Tscharntke
dba93e2bf4 I think the frames stored in messages are no network frames but world frames 2013-03-25 20:55:28 +00:00
Titus Tscharntke
30cb3926d5 maybe we are in pause mode 2013-03-25 19:57:17 +00:00
Mark Vejvoda
079dbf808a - try to improve network performance 2013-03-24 05:16:56 +00:00
Mark Vejvoda
b2853b760e - fix bug reported on sf: Glest::Game::Selection::select crash with NULL pointer - ID: 3608835 2013-03-24 04:43:50 +00:00
Mark Vejvoda
15987d83d7 - try to improve network performance 2013-03-23 23:34:51 +00:00
Mark Vejvoda
9dc863e5e3 - try to improve network performance 2013-03-23 23:24: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
97aadb6a44 - try to improve network performance 2013-03-23 23:00:11 +00:00
Mark Vejvoda
c36e8297fa - try to improve network performance 2013-03-23 22:56:08 +00:00
Mark Vejvoda
bc06b4799a - try to improve network performance 2013-03-23 22:44:55 +00:00
Mark Vejvoda
159cdc40d0 - attempt to see if this helps network performance 2013-03-23 22:32:51 +00:00
Tom Reynolds
ef58a2285d Changes to olaus' techtree HTML docs script:
* rename mg.ini to megapack.ini
* add Opensuse support (thanks atze)
2013-03-17 18:55:59 +00:00
Titus Tscharntke
b6b0e989da lets try (again) if this makes things less choppy 2013-03-16 23:05:11 +00:00
Mark Vejvoda
44a498958c - battle end screen render fix for tomreyn 2013-03-16 06:57:16 +00:00
Mark Vejvoda
203ad150ef - battle end screen render fix for tomreyn
- more thread safety for threaded client sockets
2013-03-16 06:55:16 +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
cb96232256 - should fix the strange pause / unpause behaviour for joining in progress games 2013-03-14 21:41:15 +00:00
Titus Tscharntke
e7907394de lighting of rotated tileset objects was wrong. 2013-03-14 21:16:16 +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
3661d62c03 - attempt to fix client crash on disconnect 2013-03-12 22:50:26 +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
88b31797e7 - make client use less CPU for network games 2013-03-11 03:46:40 +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
21d38b6231 - make client use less CPU for network games 2013-03-10 16:19:04 +00:00
Titus Tscharntke
d041f1eea6 commented my last changes ( beside "+1" )as itmade clients freeze on exiting games 2013-03-10 01:32:00 +00:00
Titus Tscharntke
c2e94985b2 "\n" was missing ( please look at my last changes it softcoder ) 2013-03-10 01:02:41 +00:00
Mark Vejvoda
2210d48c49 - added a temp ini setting: DebugGameSynchUI=true
to show all units in minimap to compare on two screens if the game is going out of synch.
2013-03-10 00:40:38 +00:00
Titus Tscharntke
9db9d12891 next try 2013-03-10 00:16:02 +00:00
Titus Tscharntke
7263274d51 trying to fix clients with high load. 2013-03-10 00:09:09 +00:00
Titus Tscharntke
c8458237e0 trying to fix slowdowns of clients ( maybe they are ahead ) 2013-03-09 23:36:25 +00:00
Mark Vejvoda
ac992b431d - attempt to fix threaded client stability and fixed some server side network bugs to also improve its stability 2013-03-09 20:57:06 +00:00
Mark Vejvoda
760ba99fd7 - attempt to fix double free bug 2013-03-08 21:53:11 +00:00
Mark Vejvoda
11d4c4a1dc - attempt to fix double free bug 2013-03-08 21:00:37 +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
198fa1d05d - bug fix to send packets every 4 seconds if nothing has been sent (especially when the game is paused) 2013-03-08 04:41:57 +00:00
Mark Vejvoda
aec3ff1f63 - bugfix for restoring explorations on loading a saved game 2013-03-06 15:02:17 +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
951cd33ef4 - try to get threaded client working without lag 2013-03-02 02:35:53 +00:00
Mark Vejvoda
019c7edcc7 - try to get threaded client working without lag 2013-03-02 02:19:34 +00:00
Mark Vejvoda
503627f02b - try to get threaded client working without lag 2013-03-02 01:05:39 +00:00
Mark Vejvoda
6603e08c96 - try to get threaded client working without lag 2013-03-02 00:53:55 +00:00
Mark Vejvoda
c49962c644 - try to get threaded client working without lag 2013-03-02 00:30:26 +00:00
Mark Vejvoda
2fc2e51842 - attempt to fix lagging clients 2013-03-01 23:31:53 +00:00
Mark Vejvoda
74119d0b93 - bugfix for in game joins pause / resume 2013-03-01 23:05:38 +00:00
Mark Vejvoda
c3feec02ee - increase resume speedup to improve performance 2013-03-01 19:54:27 +00:00
Mark Vejvoda
2d2ec9afac - allow the game to be published if it allow in game joining 2013-03-01 17:21:58 +00:00
Mark Vejvoda
5dd73bdec8 - update masterserver so it inserts in progress games properly if they are missing 2013-03-01 17:17:51 +00:00
Mark Vejvoda
c6e3fd1156 - avoid double joining a game in progress 2013-03-01 15:56:00 +00:00
Mark Vejvoda
b6cefa3388 - attempt to fix lag issue when resuming paused network game (also for resume joining in progress game) 2013-03-01 06:52:33 +00:00
Mark Vejvoda
5aaa023476 - bugfix for in game joins pause / resume 2013-02-28 01:31:02 +00:00
Mark Vejvoda
e4235cc551 - attempt to further stabilize joining in progress games 2013-02-27 06:46:42 +00:00
Mark Vejvoda
b0a370900f - attempt to make joining in progress games a bit more reliable and stable 2013-02-26 23:31:59 +00:00
Mark Vejvoda
13665d58f1 - attempt to fix light sources handling as reported by tomreyn
- allow speed up / slow down for network game as long as no-one is connected
2013-02-26 20:48:20 +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
Tom Reynolds
ea458a7cf1 fix system report utility for linux 2013-02-25 21:20:09 +00:00
Titus Tscharntke
61e75417a5 Respecting requirements for attack commands . ( Bug fix for attack hot-key cycling through attacks. ) 2013-02-24 23:56:49 +00:00
Mark Vejvoda
e0bda20f5e - bugfix for slot not re-opening after disconnect when required 2013-02-24 00:28:45 +00:00
Titus Tscharntke
2bc2555c22 Attack key ("a") cycles through attack types if you have a uniform selection of units 2013-02-22 23:31:55 +00:00
Mark Vejvoda
af89f4c5ed - fixed the build on windows 2013-02-22 22:40:31 +00:00
Mark Vejvoda
759997916e - only output changed file paths for load games if verbose enabled 2013-02-22 15:59:18 +00:00
Mark Vejvoda
c63da54bbd - attempt to improve performance when units are blocked badly (this is not backwards compatible with other builds, will create out of synch) 2013-02-22 06:52:51 +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
Mark Vejvoda
39f81afe5c - allow threaded calculation of unit movement for attacking units (was disabled for nig's bug but this was not the cause so re-enable) 2013-02-20 19:21:55 +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
c8cdca22fd - some code cleanup and try to improve joining in progress game performance 2013-02-19 22:00:15 +00:00
Mark Vejvoda
286dc58aa6 - bugfix for unit sight on game load 2013-02-19 07:13:49 +00:00
Mark Vejvoda
8916a86b8c - bugfixes for load / save game for in progress joining 2013-02-19 06:41:56 +00:00
Mark Vejvoda
69925fb887 - bugfixes for joining network games 2013-02-19 04:53:24 +00:00
Mark Vejvoda
54c026bb3e - bugfixes for in game joining 2013-02-17 07:15:01 +00:00
Titus Tscharntke
e771b53f1c trying to get rid of double entrys in the master server ( I can't explain why they still happened before from time to time. ) 2013-02-17 01:19:35 +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
85b1365e7e - bugfix for in game joining, loading saved game needs to change this to properly indicate which faction is the joining players 2013-02-16 20:02:22 +00:00
Mark Vejvoda
cfe0f6bb55 - bugfix for in game joining 2013-02-16 19:26:17 +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
b38f6b20a1 - updates to join in progress game, and now allow for switching slots 2013-02-16 10:07:36 +00:00
Mark Vejvoda
9d19ff2b57 - added the first draft of joining games in progress 2013-02-15 18:25:10 +00:00
Mark Vejvoda
fb6cff0ed1 - bugfix for latest harvest updates 2013-02-12 22:37:14 +00:00
Mark Vejvoda
646d11f143 - if unit harvests a resource, stops and harvest the same type again they do not need to return to the store house 2013-02-12 21:51:25 +00:00
Titus Tscharntke
4e6e96b125 AI scouting switched back to something we had before "THE BUG" 2013-02-12 21:17:21 +00:00
Mark Vejvoda
aca17684a7 - attempt to see if this fixes drawing of starting points for some bad video drivers 2013-02-12 20:47:46 +00:00
Mark Vejvoda
589962868b - added ability for units to return harvested resources in an emergency by clicking a store house when a unit has a load 2013-02-12 08:44:12 +00:00
Mark Vejvoda
a71c3d239f - added unit auto repair a buidling if the meeting point is on that building 2013-02-12 03:41:59 +00:00
Mark Vejvoda
c0fe242504 - allow for translated names to be shown for tutorials and scenarios in selection menu 2013-02-12 02:10:00 +00:00
Mark Vejvoda
93773839fd - allow for multiple preview / loading / hud textures for different resolutions 2013-02-11 23:52:44 +00:00
Mark Vejvoda
5fd8b121a9 - allow for multiple preview / loading / hud textures for different resolutions 2013-02-11 23:43:30 +00:00
Titus Tscharntke
41671ac997 frustRum ->frustum 2013-02-11 22:51:36 +00:00
Titus Tscharntke
a3635376cf no more trouble with middle mouse button camera view 2013-02-09 23:20:40 +00:00
Mark Vejvoda
7dae926cf2 - do not show errors on console for scenarios without a description 2013-02-09 17:18:34 +00:00
Mark Vejvoda
af100408ed - correct vc++ build so that we properly parse the version info for automated builds 2013-02-09 08:01:06 +00:00
Mark Vejvoda
50e64e9564 - scenario description patch applied from Muwuum 2013-02-09 07:17:10 +00:00
Mark Vejvoda
9bc6d33f1d - bug fixes to stabilize the windows build 2013-02-09 06:57:05 +00:00
Titus Tscharntke
f06f86904c recall group select again 2013-02-08 23:54:50 +00:00
Mark Vejvoda
8e97a7598d - update cmake so some game tools respect output folder setting 2013-02-08 18:21:49 +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
cfb9b61168 - rollback AI so nig can test anarchy bug 2013-02-06 23:58:49 +00:00
Mark Vejvoda
25f2b92892 - update version to 3.8-dev as svn seems to be no longer compatible with 3.7.x 2013-02-06 23:00:25 +00:00
Titus Tscharntke
3ea6a02d95 no return in void methods 2013-02-05 22:00:50 +00:00
Mark Vejvoda
b2be14ca33 - updated the AI's scouting logic
- updated from transifex
2013-02-05 06:56:59 +00:00