Rampoina/MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,812 Commits 1 Branch 0 Tags 27 MiB
8059c064a3
Commit Graph

1596 Commits

Author SHA1 Message Date
Mark Vejvoda
819831a287 - misc logs and screenshots now also go in userdata folder 2011-03-10 17:31:55 +00:00
Mark Vejvoda
0e1b8e62e4 - debug logs now respect mydata path and will be written there 2011-03-10 17:13:15 +00:00
Mark Vejvoda
242b02c001 - added support for better user data customization and default linux path will now be ~/.megaglest/ for user related ini's and data content 2011-03-10 07:26:43 +00:00
Mark Vejvoda
2101a83a5d - added support for special tags in ini file strings in preparation for storing userdata in ~/.megaglest 2011-03-10 01:23:34 +00:00
Mark Vejvoda
63da3d7af2 - added techtrees for file xfer and CRC checking (might need to turn off etc later but lets test for now) 2011-03-09 23:09:32 +00:00
Mark Vejvoda
5f9e8d97d3 - bufix for ftp tileset xfer, if no 7z file exists continue getting individual files 2011-03-09 19:29:34 +00:00
Mark Vejvoda
ab706e1762 - some code cleanup related to vc++ posix naming warnings 2011-03-09 18:51:26 +00:00
Mark Vejvoda
0b67911199 - vc++ compile fixes 2011-03-09 18:42:50 +00:00
Mark Vejvoda
817d8cfea8 - added logic for ftp file transfers to look for 7z archives for tilesets and download and extract on the client side if the 7z archive exists on the server 2011-03-09 18:35:19 +00:00
Mark Vejvoda
b97687c772 - possible bugfix on windows for special key values 2011-03-09 06:15:09 +00:00
Mark Vejvoda
324a506aac - more debugging for keyboard issues 2011-03-09 06:00:46 +00:00
Mark Vejvoda
2c0353972f - more debugging for keyboard issues 2011-03-09 05:46:28 +00:00
Mark Vejvoda
323f72ea6e - more debugging for keyboard issues 2011-03-09 05:24:56 +00:00
Titus Tscharntke
ad94506842 gonanas patch! Thank a lot! For me it works, please test ! ( hopefully really no more flickering now ) 2011-03-09 01:46:00 +00:00
Titus Tscharntke
5e844c39e4 particles for ressouces ... the gold will glow tomorrow :-D 2011-03-09 01:32:27 +00:00
Titus Tscharntke
5db11ec538 double click selection for units standing near or in buildings 2011-03-08 20:19:19 +00:00
Mark Vejvoda
5b2a6bb45f - bugfix for esc key 2011-03-08 02:07:35 +00:00
Mark Vejvoda
76919f81b6 - does this help with the windows keyboard problem for some users? 2011-03-08 00:56:57 +00:00
Titus Tscharntke
5494a80233 removed unused isDirty bool ( maybe unstable with tileset particles before ) 2011-03-07 20:19:43 +00:00
Mark Vejvoda
f07b7a3603 - more keyboard bugfixes so some special keys above 255 work 2011-03-06 23:45:46 +00:00
Titus Tscharntke
4874d31ddd hopefully fix for tileset particle related crash in windows; particles must be removed from objects before the particle manager is cleared 2011-03-06 22:50:04 +00:00
Titus Tscharntke
273ab4c502 Option to switch on/off tileset particles 2011-03-06 13:11:22 +00:00
Mark Vejvoda
d75fbe51f6 - another attempt to fix keyboard menu for windows 2011-03-06 07:55:38 +00:00
Mark Vejvoda
d9e6b45052 - another attempt to fix keyboard menu for windows 2011-03-06 07:29:30 +00:00
Mark Vejvoda
9104141efe - added error handling for keyboard menu to see if we get this far in windows 2011-03-06 07:18:34 +00:00
Mark Vejvoda
4eb5879d04 - bugfix for ultifd, screenshots now save even when loading from open with 2011-03-05 23:15:07 +00:00
Mark Vejvoda
9382473294 - attempt to make a few tweaks for more smooth network play 2011-03-05 20:15:28 +00:00
Titus Tscharntke
fefed3e3ce No more flickering! Thanks gonana ! ; Tilesetparticles are only rendered/calculated when visible now 2011-03-05 14:34:36 +00:00
Mark Vejvoda
dcecb1ba8d - carving pathfinder to 500 and disabling pathfinder cache to see if it performs better. 2011-03-05 08:01:48 +00:00
Mark Vejvoda
f6a7bc2865 - removed a stray printf 2011-03-05 02:38:18 +00:00
Mark Vejvoda
935895c89f - configurable keys can be edited in keyboard menu now 2011-03-04 22:54:04 +00:00
Mark Vejvoda
0f57fe6b92 - additional work to allow for changing hotkeys in the keyboard options menu, currently changes are not saved to file, only on screen. 2011-03-04 20:26:47 +00:00
Mark Vejvoda
73efa41cc9 - more unicode character code cleanup 2011-03-04 02:01:20 +00:00
Mark Vejvoda
10eba296fe - some cleanup to free up using shift and alt key combinations for hotkeys also 2011-03-04 01:58:06 +00:00
Mark Vejvoda
ea8ce1d5c7 - fixed bug with unicode keypresses while pressing control 2011-03-04 01:32:10 +00:00
Mark Vejvoda
744602d0e3 - more keyboard handler cleanup related to special key presses (like shift) 2011-03-04 00:46:45 +00:00
Mark Vejvoda
d3feaaddec - a little more keyboard fixes to try to bring some consistency to unicode style keyboard events 2011-03-03 19:33:31 +00:00
Mark Vejvoda
330f54e7cb - bugfix for arrow keys, SDL docs had incorrect key names 2011-03-02 15:36:31 +00:00
Mark Vejvoda
c3286bf1a0 - attempt to fix previous messup with keyboard keys 2011-03-02 05:45:02 +00:00
Titus Tscharntke
792d0aa665 particles for tilesets ( too much rendered at the moment ) 2011-03-01 23:36:33 +00:00
Mark Vejvoda
18c863364f - does this finally fix stupid keyboard mapping issues on different locales? 2011-03-01 23:33:59 +00:00
Mark Vejvoda
3f32cddbf5 - added sdl keyname to console output and debug log (console when --verbose commandline option used) 2011-03-01 23:07:19 +00:00
Mark Vejvoda
4975882ea2 - cleanup some useless warnings (thanks johndh) 2011-02-28 23:33:11 +00:00
Mark Vejvoda
1136f056ce - added performance logging for new ai unblock rule when perf logging enabled 2011-02-28 16:47:01 +00:00
Mark Vejvoda
45a646ffef - carved back max nodes in pathfinder to 600 2011-02-28 16:45:15 +00:00
Mark Vejvoda
c679c4bfe0 - set pathfinder max to 800 (From 1200) 2011-02-26 00:47:41 +00:00
Mark Vejvoda
823fd842d4 - added NULL guard for units without a move command to avoid segfault 2011-02-26 00:41:00 +00:00
Mark Vejvoda
5787fb3e98 - memset map header to avoid garbage being written in unused reserved space 2011-02-25 22:33:40 +00:00
Mark Vejvoda
bced200dd1 - bugfix when bad values are in map file, game would freeze at game start due to endless loop 2011-02-25 22:13:11 +00:00
Mark Vejvoda
9de151d975 - added more things to try to improve pathfinding (especially for the AI) 
AI players should now detect when units are blocked (surrounded by other units from same faction) and tell the other units to move out of the way
 2011-02-25 16:32:27 +00:00
Mark Vejvoda
c4795eb6cb - more fixing of map corner position actions causing memory access violations (this will further stabilize the code) 2011-02-25 04:15:22 +00:00
Titus Tscharntke
922df8e025 up to 36 units selectable; maps can set camera heigth now ( be careful with this for performance reasons! ) 2011-02-25 00:31:42 +00:00
Mark Vejvoda
4cb2485cdf - fixed meeting point crash on edge of map 2011-02-24 22:13:40 +00:00
Titus Tscharntke
25204e0084 I just removed an unneeded check 2011-02-24 20:14:12 +00:00
Mark Vejvoda
d300c5635b - bugfix for selection circle on units on the edge of map cells 2011-02-23 21:54:51 +00:00
Mark Vejvoda
16c7316887 - initial attempt to enable pathfinder caching (think it might work now). Please test 2011-02-23 07:03:38 +00:00
Mark Vejvoda
53e8d96092 - removed printf 2011-02-23 00:00:44 +00:00
Mark Vejvoda
77fb1b6d15 - bugfix for building units at edges of maps 2011-02-22 23:59:21 +00:00
Mark Vejvoda
8d8ed75990 - bugfix for building units at edges of maps 2011-02-22 22:25:03 +00:00
Titus Tscharntke
a06cb541b1 units with move skill have higher priority while selecting now than those without move skill ( typically buildings ) 2011-02-22 16:18:44 +00:00
Mark Vejvoda
bd29260fef - Does this fix choppy network play? Please test and let me know 2011-02-21 01:34:31 +00:00
James McCulloch
2def669678 fix fp flags on windoze release build (solves RoutePlanner sync problems) 
init streflop in 'no denormals' mode (just in case)
 2011-02-20 23:17:22 +00:00
Mark Vejvoda
b2ae0f3b7b - reverted morph to original code to see if this fixes out of synch (from muwums original change) 2011-02-20 00:04:57 +00:00
Mark Vejvoda
92ca6ba75d - attempt to see if this change corrects out of synch 2011-02-19 22:36:59 +00:00
Mark Vejvoda
755bed6553 - attempt to fix crash at intro screen 2011-02-18 16:15:14 +00:00
Titus Tscharntke
050a604390 hopefully the masterserver listing works now ... 2011-02-17 00:54:17 +00:00
Mark Vejvoda
69a7f8f1d6 - hopefully stabilized pathfinder for network play so we won't get out of synch 2011-02-16 19:44:12 +00:00
Mark Vejvoda
7a5de218b7 - chasing down out of synch 2011-02-16 04:43:27 +00:00
Mark Vejvoda
14c5b87da4 - debugging out of synch (make bailout logic optional) 2011-02-16 03:48:13 +00:00
Mark Vejvoda
e5a62f57ef - some logging changes for helping test world synch better 2011-02-16 02:52:52 +00:00
Mark Vejvoda
a0cfe3fa08 - a few changes and now seems to compile in VC++ 2010 (still need to checkin project files) 2011-02-15 23:53:48 +00:00
Mark Vejvoda
8ec58868dc - attempt to improve network performance (use separate mutexes for read / write operations) 2011-02-15 07:49:40 +00:00
Mark Vejvoda
2357e2cfd1 - Titi, fixed the remove object so its done in the Object destructor (using an interface) 2011-02-15 04:34:19 +00:00
mnaumann
02979a7430 - some adjustments to olaus' online docs' mg.ini configuration file 2011-02-15 03:54:47 +00:00
Mark Vejvoda
31e722287f - bugfixes for when players disconnect, do not switch observers to AI and only show message once. 
- Attempts to debug/improve network performance
 2011-02-15 03:32:14 +00:00
Mark Vejvoda
508a2a8277 - updated with olaus's latest code (thanks Olaus) 2011-02-15 02:29:49 +00:00
Titus Tscharntke
01db66105e status of serverline display fix / ressources are no longer selectable via rectangle ( which was quite useless ) 2011-02-15 00:24:31 +00:00
Titus Tscharntke
a214fa87f5 clickable resources with display ; softcoder please look at unit_updater.cpp line 1032 2011-02-13 21:04:30 +00:00
Titus Tscharntke
62a2b7cc94 bugfix for target selection 2011-02-13 16:46:32 +00:00
Titus Tscharntke
30da435fc2 target selection for ressource objects is done with opengl picking now 2011-02-13 14:35:17 +00:00
Mark Vejvoda
737f95e5dd - for testing made max pathfinder nodecount configurable 2011-02-13 03:31:05 +00:00
Mark Vejvoda
4488a4d388 - make pathfinder caching an ini setting tso its easy to test (disabled by default) 
- some code cleanup related to threads and sockets
 2011-02-13 03:06:12 +00:00
Mark Vejvoda
91a56e7805 - another segfault bugfix for spawned attacks 2011-02-12 21:47:31 +00:00
Mark Vejvoda
7dcb12ff60 - some more memory cleanup 2011-02-12 09:08:50 +00:00
Mark Vejvoda
c1ee5df801 - attempt to shutdown sdl in a more controlled way 2011-02-12 08:05:18 +00:00
Mark Vejvoda
cc973f3427 - bugfixes, some related to things pointed out by valgrind, some from opengl research and some for more stable operation 2011-02-12 07:34:32 +00:00
Mark Vejvoda
d056486ec4 - disable a cache that i think causes out of synch 2011-02-12 01:13:52 +00:00
James McCulloch
87f21b71d6 init pathfinder log-file 2011-02-12 00:42:21 +00:00
Mark Vejvoda
0533ce2c63 - a simple attempt to improve pathfinder performance (this needs to be tested well and can easily be disabled by setting: const bool tryLastPathCache = false;) 2011-02-11 23:32:24 +00:00
Mark Vejvoda
34e95f5cd5 - streflop was disabled (likely when we switched to cmake). Turn it on for now but we need to investigate more thoroughly if we really need this? 2011-02-11 19:16:06 +00:00
Mark Vejvoda
cab252c220 - more expansion of the maximum distance the pathfinder will calculate, this is required for proper play with cliffs 2011-02-11 16:43:57 +00:00
Mark Vejvoda
41907b7728 - increase pathfinders range for better results with cliffs 2011-02-11 07:51:29 +00:00
Mark Vejvoda
b5e4eb53d8 - added numerous guards around spawn code because we had a number of crashes from this code somehow tonight 2011-02-11 07:39:58 +00:00
Mark Vejvoda
2d0912ae19 - attempt to fix some network performance issues 2011-02-11 05:36:01 +00:00
Mark Vejvoda
7cae047f15 - added more code guards around morph validation 
- some render debug info
 2011-02-11 04:48:17 +00:00
Mark Vejvoda
2d76d348c7 - bugfix to put priority on attacking units first 2011-02-10 22:54:49 +00:00
Mark Vejvoda
39e4d62133 - attempted bugfix for click like mad morph causing out of synch 2011-02-10 21:02:07 +00:00
Titus Tscharntke
91abdd3ed4 camera max height/ default are calculated based on the max height of a map 2011-02-10 00:14:21 +00:00
Mark Vejvoda
12dcc54c5a - more conversions to vertex arrays 2011-02-09 08:04:21 +00:00
Mark Vejvoda
bcc82a381d - again M$ compiler madness, absolute insanity, its why I love gcc and hate vc 2011-02-09 01:42:58 +00:00
Mark Vejvoda
49d7f5f036 - more rendering speed improvements (conversion of main portions of minimap to vertex arrays) 2011-02-09 01:27:41 +00:00
Mark Vejvoda
d0e050dde3 - M$ torments me day and night with their foolishness 2011-02-08 23:05:45 +00:00
Titus Tscharntke
e20162a3c4 cleaned up the cliff coding; hopefully really no more flickering now 2011-02-08 20:59:34 +00:00
Mark Vejvoda
5623866779 - better handling of map preview for different resolutions 2011-02-08 20:17:16 +00:00
Mark Vejvoda
17e2a87890 - fixed one type of freeze in the custom menu 
- some small opengl changes
 2011-02-08 18:23:41 +00:00
mnaumann
41027bb1b8 - new upstream version of convert_faction_xml2html 2011-02-08 17:59:40 +00:00
Mark Vejvoda
1ee25a2c91 - bugfixes to get win32 working with fbo's 2011-02-08 16:34:19 +00:00
Mark Vejvoda
a2b9ca9e18 - some smaller rendering improvements to surface render 2011-02-08 07:35:37 +00:00
Mark Vejvoda
01de8700ec - stupid win32 hacks to allow opengl extensions for FBOs 2011-02-08 07:33:28 +00:00
Mark Vejvoda
86baa04a3b - added FBO's for map preview rendering, which improves fps in the custom menu for video cards that support Frame Buffer Objects 2011-02-08 05:54:05 +00:00
Mark Vejvoda
dd75518af0 -small bugfix for titi's map support for cliffs.. all seems to work fine now 2011-02-08 04:52:01 +00:00
Mark Vejvoda
c856aa2c44 - fixed models that flicker when intersecting with other polygons (also known as z-fighting) 2011-02-08 04:50:57 +00:00
Titus Tscharntke
e03b029bea Cliffs work and some map cleanup; ( !!currently old maps are broken in editor!! ) 2011-02-08 03:50:59 +00:00
Titus Tscharntke
e856d5e4f0 MuwuMs changes ( spawn attack and more ) 2011-02-06 18:33:49 +00:00
Mark Vejvoda
c58e893047 - attempt to improve issues in the custom menu related to freezing 
- modified debug UI display to support multi levels of UI debug info
- added more validations to mutexes
- improved client sockets to properly be setup as non blocking
 2011-02-06 07:01:54 +00:00
Titus Tscharntke
f2caf186f9 step1 for cliffs; enable manually in map.cpp in Map::smoothSurface(...) ; set minCliffHeightDifference to 3.0f 2011-02-06 01:36:55 +00:00
Mark Vejvoda
ef3aaacbc2 - reverted back to original surface rendering due to memory issues that need to be looked at eventually 2011-02-06 00:46:40 +00:00
Mark Vejvoda
6052ee6cc7 - bugfix to clear surface data cache on game exit (lest we overfill system RAM) 2011-02-05 05:50:42 +00:00
Mark Vejvoda
25f1cdaae6 - updated surface rendering to improve performance (currently VBO's disabled for surface rendering because they somehow seem to give worse performance) 2011-02-05 05:07:05 +00:00
Titus Tscharntke
dc1033875a fix for status message not shown when inprogress 2011-02-05 00:32:31 +00:00
Mark Vejvoda
1574e05fcd - surface rendering is a step closer to using VBO's (code now works using Vertex Arrays, next stop Vertex Buffer Objects) 2011-02-04 23:27:55 +00:00
Mark Vejvoda
6ec92f2127 - attempt to add more randomness to pathfinding and faster AI decsions 2011-02-04 06:34:32 +00:00
Mark Vejvoda
ab9d2f1bf2 - some small cleanup in vbo code 2011-02-04 02:26:55 +00:00
Mark Vejvoda
dab57fcb34 - attempt to add "some" VBO rendering for static models (need to test if this improves performance in different environments) 2011-02-04 01:24:26 +00:00
mnaumann
2dc0d97f55 - make masterserver wait for 3 seconds before spawning connectivity test 2011-02-04 00:02:59 +00:00
Mark Vejvoda
5fd1bbe855 - updated version # for next dev cycle 2011-02-03 19:20:26 +00:00
Mark Vejvoda
2498d44cd3 - updated AI code for special empty cellmap units, so AI does not look for them (since they already cannot attack them) 2011-02-03 19:19:27 +00:00
Mark Vejvoda
b810bb2883 - bugfix for mapeditor, some systems segfault due to a wxwidgets bug related to the boxsizer 2011-02-01 20:10:18 +00:00
Mark Vejvoda
145b71970e - set version to 3.4.0 in prep for release 2011-01-31 23:50:06 +00:00
Mark Vejvoda
325ea2515a - nicely formatted out of synch messages (one per line).. all for tomreyn's happiness :) 2011-01-31 23:36:13 +00:00
Mark Vejvoda
f373a66c31 - fixed win32 build from last checkin 2011-01-31 23:17:42 +00:00
Mark Vejvoda
0b4eef10c5 - added a very useful way to track mutex usage and performance timings of mutex locking to discover thread lock issues 2011-01-31 23:01:39 +00:00
Mark Vejvoda
b8075eaf01 - added code to rename duplicate maps and show a warning at game start 2011-01-31 21:59:28 +00:00
Mark Vejvoda
c647e58260 - commented out old console outputs (see jack2 I do read IRC sometimes) 2011-01-31 02:07:58 +00:00
Mark Vejvoda
93f9d87e35 - updated techtree html parser and added missing files from original archive. Script now copies everything required (no manual steps required afterwards). Added an optional to take G3D screenshots of models via ini setting but disabled for now 2011-01-31 02:05:05 +00:00
Titus Tscharntke
d7a65ed18e fix for updateAttackStopped and command queuing; 
switching tilesets react with delay like switching maps; 
new/updated maps; 
reverted egypt mining slave model;
many loading screens for scenarios
 2011-01-30 23:01:55 +00:00
Mark Vejvoda
7397ff0368 - updated version to beta3 in prep for another beta 
- updated romans_beta:
 - removed long-bowmen
 - change ballista to only have 1 attack for both air and ground
 - requires more use of stone now
 2011-01-30 00:55:00 +00:00
Mark Vejvoda
4b085691df - added new LUA method togglePauseGame 2011-01-29 23:50:21 +00:00
Mark Vejvoda
82e31d670b - attempt to fix segfault on ubuntu 10.04 2011-01-29 23:12:20 +00:00
Mark Vejvoda
6e8601739a - attempt to fix segfault on ubuntu 10.04 2011-01-29 23:03:56 +00:00
Mark Vejvoda
da222ddefd - attempt to fix segfault on ubuntu 10.04 2011-01-29 22:59:33 +00:00
Mark Vejvoda
37d6bb4b6b - attempt to fix segfault on ubuntu 10.04 2011-01-29 22:39:57 +00:00
Mark Vejvoda
fe51ccee48 - attempt to fix segfault on ubuntu 10.04 2011-01-29 22:17:37 +00:00
Mark Vejvoda
f3a1b7534e - attempts to work around an ATI bug for our tools 2011-01-29 22:06:05 +00:00
Mark Vejvoda
d4370675be - added null checks for map editor 2011-01-29 21:44:09 +00:00
Mark Vejvoda
f2467faebe - added wxWidgets version info to g3d viewer help and map editor 
- added a log entry if sound thread starts to log
 2011-01-29 21:20:33 +00:00
Titus Tscharntke
7d09f24b9e 5 seconds delay to switch over maps you don't want to distribute ( maybe tilesets shoudl do the same? ) 2011-01-29 20:13:29 +00:00
Mark Vejvoda
632ab24b50 - disable memory vault to see how it affects game performance 2011-01-29 18:48:50 +00:00
Mark Vejvoda
a5a6cf76d6 - updated some new lua commands 2011-01-29 17:52:53 +00:00
Mark Vejvoda
041289770e - cleaned up more compiler warnings in VC++ 2011-01-29 17:42:34 +00:00