Rampoina/MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4,937 Commits 1 Branch 0 Tags 27 MiB
953c055ced
Commit Graph

617 Commits

Author SHA1 Message Date
Mark Vejvoda
4684779186 removed commented code 2013-06-22 18:09:29 +00:00
Mark Vejvoda
aceb9aec0a re-fix titi's morph when no space available 2013-06-19 00:19:29 +00:00
Titus Tscharntke
ee20fbd37b VCC does not like float constants ... 2013-06-13 21:29:03 +00:00
Mark Vejvoda
0ead6a36dc full support for translated techtrees 2013-06-13 08:55:48 +00:00
Titus Tscharntke
1f96dae8c7 tilesets can set default air unit heights 2013-06-13 07:34:32 +00:00
Mark Vejvoda
a8662c8b31 updated menus to display translated tech name 2013-06-13 01:37:15 +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
8066502f9b fix a few areas that vc++ 2012 pointed to as potential bugs 2013-06-08 03:40:04 +00:00
Mark Vejvoda
4499308888 fix a few areas that vc++ 2012 pointed to as potential bugs 2013-06-07 23:17:27 +00:00
Mark Vejvoda
8cd2383a78 bugfix for minimap for joining in progress games 2013-06-04 02:21:56 +00:00
Mark Vejvoda
4af65d1e19 added unique playerid for every client 2013-06-01 02:31:12 +00:00
Mark Vejvoda
6cc8f6ac75 attempt to fix the model render not properly timed 2013-05-31 07:09:25 +00:00
Mark Vejvoda
831bbda6c9 better error handling for game / scenario loading problems (like bad xml) 2013-05-28 15:42:54 +00:00
Mark Vejvoda
7acd500c08 bugfix for a number of legacy divide by 0 conditions discovered by Tiger. 2013-05-28 06:07:35 +00:00
Mark Vejvoda
43d533aec3 added ability to reference sound and videos in lua using variables: {TECHTREEPATH}, {SCENARIOPATH}, {TUTORIALPATH} example: 
playStreamingSound('{SCENARIOPATH}/music/myambient.ogg')
 2013-05-28 03:08:51 +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
93caf14362 attempt to fix out of synch of join in progress game 2013-05-27 08:26:01 +00:00
Mark Vejvoda
f4a29d98b8 bugfix to correct out of synch, titi tried to fix this a while ago but the code was not complete, we hit this when testing today 2013-05-27 04:56:07 +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
de68fc759d comment out some world synch logging 2013-05-25 18:22:36 +00:00
Mark Vejvoda
85ab3c76cc attempt to improve threaded logging and see if we fix targetVec 2013-05-25 05:31:32 +00:00
Mark Vejvoda
a98234c14e THIS IS NOT BACKWARD COMPATIBLE WITHY OTHER DEV VERSIONS! buffix the attack target issue mentioned in the forums 2013-05-21 21:19:59 +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
5cfc4d07a0 added logging of threaded unit actions 2013-05-21 05:43:57 +00:00
Mark Vejvoda
f98d9fdddc attempt to see if this corrects out of synch, i COULD NOT reproduce the out of synch with my winxp and linux 64 systems, perhaps titi had different ini values between linux and windows? 2013-05-21 00:38:35 +00:00
Mark Vejvoda
2f3433688f more logs to track out of synch 2013-05-20 21:52:36 +00:00
Mark Vejvoda
625628fc63 put change back to what it was before 2013-05-20 21:40:25 +00:00
Mark Vejvoda
6a34864c5d see if this corrects the current out of synch issues 2013-05-20 20:06:25 +00:00
Mark Vejvoda
538314eb48 add more world synch logging 2013-05-20 19:00:08 +00:00
Mark Vejvoda
8408526b12 code cleanup based on cppcheck results 2013-05-17 03:59:34 +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
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
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
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
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
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
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
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
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
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
7dae926cf2 - do not show errors on console for scenarios without a description 2013-02-09 17:18:34 +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
Mark Vejvoda
adc62b7df8 - updated code to protect against null pointers and uninitialized values and threading issues 2013-02-05 00:01:40 +00:00
Mark Vejvoda
196d1240f1 - attempt to fix the crash in game originally reported by nig 2013-02-04 23:47:54 +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
fe942809e6 - fixed a few issues found by JeffM (debian games team irc channel) while testing on Windows 7 64 bit 2013-01-30 06:08:14 +00:00
Mark Vejvoda
d9fac85d21 - added more debug logging 2013-01-27 07:26:35 +00:00
Mark Vejvoda
8cd7aa0e43 - code cleanup from cppcheck 2013-01-25 02:55:28 +00:00
Mark Vejvoda
4d0811f0ec - update debug stats to remove unused items 
- disable interpolation when doing unit or resource selection
 2013-01-12 07:36:14 +00:00
Mark Vejvoda
69a15d4544 - added a new skill to toggle fog of war for any command. 2013-01-11 18:40:47 +00:00
Mark Vejvoda
7b99501697 - added a new skill to toggle fog of war for any command. 2013-01-11 18:18:58 +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
b96eba3829 - a better way to cache fog of war and use much less memory 2013-01-04 18:00:51 +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
Mark Vejvoda
838d42599d - attempt to see if this fixes some strange problems for user 'gonse' 2012-11-17 12:07:51 +00:00
Mark Vejvoda
1dbcabf12c - minor feature request added from sourceforge, when command given cannot be executed, sometimes we show the requirements of the command so the user knows why it failed 2012-11-10 19:39:55 +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
e0efa229c5 - more updates to support big endian 2012-11-01 06:36:35 +00:00
Mark Vejvoda
81989f5947 - bugfix if user clicks around while game loading 
- cleanup from last checkin (corrections)
 2012-10-26 04:35:14 +00:00
Mark Vejvoda
28d65e8d55 - cleanup from last checkin (corrections) 2012-10-26 03:08:40 +00:00
Mark Vejvoda
3419127632 - proper way to handle size_t objects (cleanup warning on other platforms) 2012-10-26 02:42:10 +00:00
Mark Vejvoda
2796922914 - a bit more code cleanup from cppcheck 
- cleanup of english hints
 2012-10-24 06:54:10 +00:00
Mark Vejvoda
64058b17e7 - code cleanup from cppcheck 
- added more checks when loading models, maps and textures
 2012-10-20 07:15:13 +00:00
Mark Vejvoda
011e0263b0 - lots more code cleanup, using safe buffer size code to avoid buffer overflows 2012-10-19 01:31:20 +00:00
Mark Vejvoda
505206059b - added new lua method for Muwuum: 
void giveStopCommand(int unitId)
	bool selectUnit(int unitId)
	void unselectUnit(int unitId)
	void addUnitToGroupSelection(int unitId,int groupIndex)
	void recallGroupSelection(int groupIndex)
	void removeUnitFromGroupSelection(int unitId,int group)
	void setAttackWarningsEnabled(bool enabled)
	bool getAttackWarningsEnabled()
 2012-10-17 20:15:50 +00:00
Mark Vejvoda
b65bdee592 - added more info to error message 2012-10-15 00:48:05 +00:00
Mark Vejvoda
e63e634e1e - added a bit more lua and updated capture enemy flag 2012-10-13 07:33:33 +00:00
Mark Vejvoda
0180aa6bba - added new lua functions: 
triggeredCellEventUnitId()
showMarker(int flashCount, int factionIndex, string note, string textureFile,Vec2i pos)

1. The first one can be called in a cell trigger event and tell you which unit triggered the event
2. The second flashes a position in the minimap
 2012-10-13 05:06:53 +00:00
Mark Vejvoda
87c3a11876 - bugfix for lua setUnitPosition method 2012-10-12 21:50:00 +00:00
Mark Vejvoda
a9d5af5261 - updated unit already in cell error with more detail 2012-10-11 14:23:31 +00:00
Mark Vejvoda
165f281f92 - added a few new lua functions to check if a cell is free 2012-10-09 20:03:09 +00:00
Titus Tscharntke
b05adbc6d5 make sure humans cannot cheat with multipliers 2012-10-06 10:05:34 +00:00
Mark Vejvoda
5e42c6dc03 - loads of code cleanup based on verbose output from the latest git version of cppcheck 2012-10-06 07:06:40 +00:00
Mark Vejvoda
97ba1a27e2 - cleaned up some warnings from VC++ compiler 2012-10-06 02:40:24 +00:00
Mark Vejvoda
a8b8dcf464 - humans may now have a custom resource multiplier 2012-10-05 22:43:00 +00:00
Mark Vejvoda
7c0e10684a - added lua functions to add / remove cell markers: 
addCellMarker(0,'test from scenario!','',cellMarker)
param1=factionindex
param2=cell hint
param3=empty string
param4=cellPosition

removeCellMarker(0,{46,13})
param1=factionindex
param2=cellPosition
 2012-09-25 07:05:52 +00:00
Mark Vejvoda
3ede912b9a - added support for custom video's on battle end screen: 
look for videos in the following order:
1. check faction xml file for the following attributes (depends on win/lose) on the faction tag:
faction-battle-end-win-video="<path to video>"
faction-battle-end-lose-video="<path to video>"

if not defined 2. check the faction folder for the files:
battle_end_win_video.*
battle_end_lose_video.*

if not found check the data/core/menu/videos/ paths for:
battle_end_win.*
battle_end_lose.*
 2012-09-25 00:23:25 +00:00
Mark Vejvoda
9e75b9144c - removed cell marker from popup menu and moved to hotkeys (f2 add f3 remove) 
- added a new experiemntal feature called 'follow unit'. select 1 unit then press f4 and when the unit moves the camera tries to look from the units perspective. To turn this off select no unit and press f4.
 2012-09-24 17:13:27 +00:00
Mark Vejvoda
8e88b36723 - removed pathfinder from GAE and all references 2012-09-22 21:39:13 +00:00
Mark Vejvoda
871b6c4a6e - removed deprecated 'fast' pathfinder that wasn't fast enough and is not going to be used 2012-09-22 21:05:06 +00:00
Mark Vejvoda
1c211e4ce6 - lots of code cleanup from the cppcheck 2012-09-22 20:13:57 +00:00
Titus Tscharntke
5b6ffbd361 again new morphing feature: better way to handle the blocked places for morphing units 2012-09-21 23:45:59 +00:00
Titus Tscharntke
78643ddcfc savegame/loadgame works too now with the new blocking feature. 2012-09-15 23:43:31 +00:00
Titus Tscharntke
ed91a7c59b morph with blocking places works now. I still want to cleanup this after some discussion with softcoder ( some things marked with TT ) 2012-09-13 21:50:07 +00:00
Titus Tscharntke
75032c3287 reserve unit place while morphing. (first try) 2012-09-11 21:16:24 +00:00
Mark Vejvoda
e2fcf9ed94 - bugfix for lighting of tileset objects, when rotated objects had weird lighting causing random light patterns to show on them. 2012-08-13 21:46:27 +00:00
Mark Vejvoda
0b9ad4c457 - added support for throwing known errors and skipping stack traces (For friendlier error messages) 2012-07-20 23:51:10 +00:00
Mark Vejvoda
ed9ae076c5 - attempt to fix pizza's crash 
- safer use of random # in unit updater (not backward compatible with other builds)
 2012-07-20 23:07:44 +00:00
Mark Vejvoda
c42d44a53a - attempt to fix pizza's crash 2012-07-20 22:18:34 +00:00
Mark Vejvoda
2b0e9e40d3 - added more error checking in scenarios 2012-07-18 00:35:39 +00:00
Mark Vejvoda
e4cec7319e - added more error checking in scenarios 2012-07-18 00:21:39 +00:00
Mark Vejvoda
de2e889a4f - added more error checking in scenarios 2012-07-18 00:15:39 +00:00
Mark Vejvoda
4d97c80561 - added more error checking in scenarios 2012-07-18 00:04:24 +00:00
Mark Vejvoda
9f0546c008 - set correct exit codes (for tomreyn) 
- fix loading when too many units on map (do not segfault)
- deprecate ThreadedNetworkClient setting
 2012-07-17 23:04:30 +00:00
Titus Tscharntke
e311c439f6 sound is no more switched on when switching factions ( not a 100% fix but I think good enough ) 2012-07-15 19:45:55 +00:00
Mark Vejvoda
d9e2a64bb3 *NOTE: This is not backwards compatible with previous builds 
- disable the alpha fog of war cache as it takes too much RAM (not sure if it really improves performance that much)
- inline some common functions for speed
 2012-07-03 19:31:52 +00:00
Mark Vejvoda
0f5cb29919 - build silhouette now uses team colour and you see all team players building placement 
- improve performance when rending cell markers
 2012-06-22 13:30:15 +00:00
Mark Vejvoda
acc2a5f9c9 - show light green with alpha silhouette of building when unit is moving to a location to build another unit 2012-06-22 04:58:44 +00:00
Titus Tscharntke
ca39f8c6b1 new try with changed fighting behaviour of ultra and mega; 
fix for "*" in chat
 2012-06-04 21:53:20 +00:00
Titus Tscharntke
3f604ae359 I give up on this :( . Softcoder must help me here I don't understand whats going on. We still see out of syncs if this is commented in. 2012-05-31 21:54:00 +00:00
Titus Tscharntke
d6f04c66e0 ctNetworkCpuUltra was the problem ... 2012-05-31 20:59:04 +00:00
Titus Tscharntke
4a70d090a8 commented out all my last changes to hunt down out of sync 2012-05-30 23:17:17 +00:00
Titus Tscharntke
1595eb3043 Skill can be NULL .... 2012-05-30 22:26:55 +00:00
Titus Tscharntke
b8401bf208 Making it a bit random if standing or runnning units are attacked by Ultra/Mega CPUs 2012-05-30 21:53:41 +00:00
Titus Tscharntke
00b1bea1ac CPU-Ultra and Mega attack standing units in attack range first now. Lets see if this is good ... 2012-05-30 20:35:27 +00:00
Mark Vejvoda
8fd436b612 - added new lua method to play video's in scenarios: 
playStaticVideo
 2012-05-22 06:17:56 +00:00
Mark Vejvoda
0f25276e6f - applied patch from MuwuM 2012-05-21 20:15:37 +00:00
Mark Vejvoda
e2844938b7 - updated to not segfault when loading a saved game and tileset is not found 2012-05-11 19:52:34 +00:00
Mark Vejvoda
bf3e5a15bf - modders can now override land and air field names using lng specific files for a tileset (follows same principle as techtree lng files). Currently supported translatable strings: 
FieldLandName=Land
FieldAirName=Air
 2012-05-11 05:49:47 +00:00
Mark Vejvoda
2d6cda1f6f - more pathfinder tweaks to try improve performance 2012-05-09 23:56:14 +00:00
Mark Vejvoda
1b2b1f9821 - improved the new pathfinder using hashmap 2012-05-05 06:23:09 +00:00
Mark Vejvoda
f79222defa - more pathfinder in progress changes, nothing to test yet 2012-05-05 04:38:49 +00:00
Mark Vejvoda
3ff0796bec - some in progress pathfinder work 2012-05-04 21:03:52 +00:00
Mark Vejvoda
771ff91c1c - added a new pathfinder to test to see if it performs better than the old one 2012-05-04 14:57:59 +00:00
Mark Vejvoda
b8fb60b325 - speed up the pathfinder a bit 2012-04-21 03:42:25 +00:00
Mark Vejvoda
dbb116f250 - load of changes to get things compiling under VC++ 2010 (with updated deps seperate for vc2010) 2012-04-20 01:04:05 +00:00
Mark Vejvoda
aa831dbb61 - inlined a few more functions 2012-04-17 15:25:31 +00:00
Mark Vejvoda
6e7d4aeec5 - speed up some heavily used functions 2012-04-17 07:51:45 +00:00
Mark Vejvoda
c8fdc9269f - fix win32 build 
- cleanup a lot of win32 compiler warnings
 2012-04-16 20:15:57 +00:00
Mark Vejvoda
8c0bf75bf5 - got built in memory leak working. Just edit leak_dumper.h and uncomment: 
//#define SL_LEAK_DUMP
- got better / more accurate stack dumps when we detect errors in game.
- Both of these need to be worked on in windows next, win32 may not compile for now until i fix it on that platform.
- BE VERY CAREFUL when working in leak_dumper.* it may cause GCC and your system to crash if you don't know what you are doing!
 2012-04-14 21:21:09 +00:00
Mark Vejvoda
76c3fa1949 - fixed segfault when a unit is selected and they die (this is a long standing bug and not related to savegame) 2012-04-12 15:38:53 +00:00
Mark Vejvoda
22f43f4267 - added new lua method for setting the direct position of a unit (can be used for teleporting): 
setUnitPosition(int unitId, Vec2i pos)
 2012-04-11 05:41:40 +00:00
Mark Vejvoda
d16396db0a - more save / loadgame bugfixes 2012-04-02 15:17:31 +00:00
Mark Vejvoda
fce4d55dd5 - better error handling, try to display proper error message and restore state as best as possible 2012-04-02 01:45:13 +00:00
Mark Vejvoda
3d386936dc - updated loading games to translate tutorials and scenario paths 2012-03-31 20:58:33 +00:00
Mark Vejvoda
152e83399d - added a new lua method isUnitAlive(unitId) 2012-03-31 20:17:19 +00:00
Titus Tscharntke
0c16882d0a fix for "The last wave"-problem in amazon(light) scenario 2012-03-31 20:02:49 +00:00
Mark Vejvoda
2f885406e0 - added logic to delay AI player from path finding more than 10 units per frame (we make him think he is blocked and he will retry another frame) 2012-03-31 19:50:45 +00:00
Titus Tscharntke
45ff24dbd7 new switch "count-kill-for-unit-upgrade" if a unit has set this switch to false , killing it does not count up the number of kills of the attacking unit. 2012-03-31 10:14:42 +00:00
Titus Tscharntke
d8ba2443cf new switches "count-unit-death-in-stats", "count-unit-production-in-stats" and "count-unit-kill-in-stats" for unit.xml ( allows better "resource" production for example ) 2012-03-30 23:38:05 +00:00
Mark Vejvoda
c02c90427b - added some more lua commands: 
vector<int> getUnitsForFaction(factionIndex,commandTypeName, field)
int getUnitCurrentField(unitId)
 2012-03-30 07:10:14 +00:00
Mark Vejvoda
45b92f4316 - allow for a scenario based faction to be 'neutral' by specifying a team # of 9 
- added some new lua methods:
networkShowMessageForFaction(text,header,int factionIndex)
networkShowMessageForTeam(text,header,teamIndex)
 2012-03-30 05:53:33 +00:00
Titus Tscharntke
7cdf6eedd3 Map heightFactors above 100 are handled like heightFactor=heightFactor/100. By this you can have an effective heightFactor of 1.5 for a map now if you enter 150 in the map editor. 2012-03-29 20:18:20 +00:00
Mark Vejvoda
433f4e84ce - a few more fixes found using cppcheck 2012-03-28 06:34:34 +00:00
Mark Vejvoda
9286130138 - bugfixes and code cleanup found using cppcheck 2012-03-28 06:25:57 +00:00
Mark Vejvoda
bf3fbf5e71 - ensure that new check for ignore resource morph does not result in an invalid command type pointer. 2012-03-27 20:13:08 +00:00
Mark Vejvoda
12fdf262da - bugfix for passing commandtype 2012-03-27 19:53:43 +00:00
Mark Vejvoda
c0f3658faa - bugfix for network scenarios to NOT close unconnected network slots before loading, they will turn into AI players (this is required because the scenario code may require those factions) 
- added ability to morph and indicate the morph command should ignore resource costs, add this to the command type:
<ignore-resource-requirements value="true" />
 2012-03-27 03:23:03 +00:00