Commit Graph

101 Commits (master)

Author SHA1 Message Date
vexed 77f37c0a0f Merge branch 'bugfixes'
Conflicts:
	src/scriptfuncs.cpp
2013-10-27 19:09:42 -04:00
per cea585162d Fixes for various bugs noticed by Coverity static analysis tool. 2013-10-21 22:04:27 +02:00
Ivan Vasilov 290d95fc14 Fix spaces to tabs. 2013-10-14 00:08:58 +02:00
Ivan Vasilov 9a2563de97 Minor fixes for bugs which can cause segfaults. 2013-10-14 00:08:25 +02:00
per 7901595c07 Remove old wzscript debugging watch window. Add new debug hotkey to test
temporary map reveal ability (by default shift+w).
2013-05-18 14:26:40 +02:00
per e7e643c05b Fix possible crash bug, remove useless casts to const chars, and remove duplicate macro getStatName(). 2013-05-13 23:11:34 +02:00
per 911d02e24f Remove useless statRefStart(), statType() and componentType(). 2013-05-13 22:20:49 +02:00
per 100f5e9560 Use 'names' fields in ini files instead of looking up names in names.txt 2013-05-12 23:50:57 +02:00
per bfb47fff4c Simplify psDroid->asBits from array of structure with a single field to just an array.
This makes it identical to the template array asParts which does the same thing.
2013-05-09 13:25:40 +02:00
per 545832358b Convert functions.txt to handle upgrades from within javascript and research.ini.
hackChangeMe() can no longer take -1, instead add new receiveAllEvents(bool) function
for that purpose. Campaign upgrades are not yet converted. All 'Power' settings in
ini files are changed, since they used meaningless values, to 'PowerLevel' with 0..2
values that correspond to button settings.
2013-05-05 13:34:59 +02:00
Cyp 8713039c5f Add teams mode without shared research. 2013-04-29 21:20:34 +02:00
per 9e16fc5e1d Move number of building modules (its "capacity") to parent class,
simplifying a great deal of code.
2013-04-17 00:15:04 +02:00
per 2753aaab61 Add missing research items causing crashes in campaign. Closes ticket:3977 and closes ticket:3974. 2013-03-11 23:55:44 +01:00
per d69f336ec4 Do not set light parameters every frame (except Sun position). Fix bug
with light parameters not being reset between games. Closes ticket:3952
2013-02-18 17:20:59 +01:00
Cyp c1cb8e4343 Merge branch 'bugfixes'
Conflicts:
	src/ai.cpp
	src/combat.cpp
	src/mapgrid.cpp
	src/mapgrid.h
	src/projectile.cpp
	src/qtscriptfuncs.cpp
2013-02-10 13:46:55 +01:00
Cyp 5c7788784b Change gridStartIterate interface to safely allow recursive calls.
Probably fixes ticket:3894.
2013-02-09 12:33:00 +01:00
per 13dbbf1b4d Merge remote-tracking branch 'origin/bugfixes'
Conflicts:
	src/qtscriptfuncs.cpp
	src/scriptfuncs.cpp
2013-01-21 22:21:02 +01:00
per 8149dc94c0 Fix bug that made droids produced by scripts get human player's upgrades. 2013-01-21 22:17:58 +01:00
vexed 6c6fe7c38a Merge branch 'bugfixes'
Conflicts:
	src/e3demo.cpp
	src/e3demo.h
2013-01-16 15:44:22 -05:00
vexed e34e7e4e0c Seems time don't stop, so bump the year to 2013. 2013-01-16 15:34:57 -05:00
Per Inge Mathisen 2acf859725 More misc cleanup 2012-12-21 15:50:06 +01:00
Per Inge Mathisen 10e62e44e0 Fix bug in counting of mission droids each loop. 2012-12-16 21:46:59 +01:00
Per Inge Mathisen 39bd82fcf4 Run astyle over scriptfuncs.cpp and some manual cleanups of dead code and asserts. 2012-12-16 21:03:00 +01:00
Per Inge Mathisen d573f38565 qtscript: Add new event eventBeaconRemoved(from, to), which for the moment is only
called when scripts remove their beacons, since players can't.
2012-12-10 17:05:13 +01:00
Per Inge Mathisen 88b6abff59 qtscript: Add eventBeacon(x, y, from, to[, message]) that triggers on beacon messages. 2012-11-27 19:05:23 +01:00
Per Inge Mathisen acf0f0083b qtscript: Add addBeacon(x, y, target player, message) and removeBeacon(target player) functions. 2012-11-26 23:04:41 +01:00
Per Inge Mathisen bfdb67e614 wzscript: Prevent new assert failure when a wzscript tries to build a template
that is not yet researched. Also stop that build now rather than allow cheating,
instead output a warning.
2012-11-23 19:33:22 +01:00
Per Inge Mathisen e0fe042831 qtscript: Hopefully fix all the issues with chat messages not going to some AI players. 2012-11-16 15:27:53 +01:00
Per Inge Mathisen d0ed5c9de7 Fix assert failure from scrTakeOverDroidsInArea() when it tries to gift a droid
to owning player. Also cleanup up this function.
2012-11-16 13:51:59 +01:00
Per Inge Mathisen 30e0f8e65c Remove the distinction between short and long range for accuracy purposes.
Everything is now shooting at long range accuracy.
2012-08-11 16:12:26 +02:00
Per Inge Mathisen a9a7886c7e Silence a cppcheck warning 2012-07-28 12:49:57 +02:00
Per Inge Mathisen 7bc528ebd7 Merge branch 'bugfixes'
Conflicts:
	src/qtscriptfuncs.cpp
2012-06-25 21:37:47 +02:00
safety0ff 6382bbb08e Fix dangling pointer when structures are destroyed and you are repositioning the delivery point.
Untangles delivery points code from building placement code.
You can no longer "quick queue" units from the debug menu.

Fixes #2041.
2012-06-21 18:44:27 -04:00
automerge e03bfe06ee Merge branch 'bugfixes' 2012-05-11 08:00:10 +02:00
vexed 7079ad2951 Fix tutorial that was broken in a6fa286dcf and e862a993cb
Fixes ticket:3058
2012-05-09 22:44:23 -04:00
automerge 8c1dd73fee Merge branch 'bugfixes' 2012-04-04 09:00:07 +02:00
vexed 361212d906 Revert back to flashing the intel button by default. (New players to the game have no idea what "New Intelligence Report" meant if they don't have the vids installed) 2012-04-03 21:39:03 -04:00
vexed 123e5a3a65 Merge branch 'bugfixes'
Conflicts:
	src/droiddef.h
	src/qtscriptfuncs.cpp
2012-02-27 21:46:51 -05:00
vexed 9e63fe3433 Fix transporter check for SP games.
Add some FIXME comments when we properly fix the campaign scripts.
Expose DROID_SUPERTRANSPORTER to the script engine
Fix gifting of the Super Transporter, along with some other fixes.
Fixes ticket:3224
2012-02-27 21:17:47 -05:00
vexed 6bc90e6d2e Apply rest of the patch that was mistakenly left out of
fcede64e42
Thanks to cybersphinx for the heads up.
2012-02-25 22:35:38 -05:00
vexed fcede64e42 Create new droid type, DROID_SUPERTRANSPORTER.
fixes ticket:3196
2012-02-25 19:21:29 -05:00
cybersphinx d78970cc7a Merge branch 'bugfixes'
* bugfixes:
  Only copy javascript doc if we build out of tree.
  Fix lassat firing too many times when clicking fast.
  Rename game debug messages to GAME_DEBUG_*.
  Synchronise enabling of debug mode.
  Remove legacy synch code.
  Update Vorbis to 1.3.3.
  In reference to 3e15039 bump the year in the mac files.
  Fix unit speeds.
  Fix ping times for clients. broken in 74261ad652
  Add a A_O_R to prevent crashing on null pointer
  Unfortunately, the Project can't stop time, so bump the year.
2012-02-15 23:10:06 +01:00
vexed 3e15039aa6 Unfortunately, the Project can't stop time, so bump the year. 2012-02-11 16:50:52 -05:00
Per Inge Mathisen 4f030f4b6d Fix ticket:3133 - Unable to order cyborg engineer production via JS api.
The problem was that a simplified droidType was passed in as a function
parameter to buildDroid(), and those droid types simplified out could not
be built. Solution chosen was to remove the droidType parameter - it is now
unused. Instead, the body stats can set the droid type, allowing us to know
which droid type we mean when we have specified a body component.
2012-02-07 22:09:10 +01:00
Per Inge Mathisen 2f84b60214 Remove --self-test command line option, as it was not maintained properly over a very long time. 2012-01-21 17:02:08 +01:00
Per Inge Mathisen c907d5ab1c Temporary hack to fix T2/T3 for now. Basically just ignoring attempts to research
things that do not exist (instead of having lots of unreachable techs that do
nothing, which was the previous state). Remove duplicate script code for setting
amount of starting power; as a side effect starting power may be less now for
T2/T3. Will fix that later when scripts know the T2/T3 state. Closes ticket:3044
2012-01-14 23:44:29 +01:00
Cyp 0dbf008bc4 Squelch enum abuse warning-errors. 2012-01-08 17:29:03 +01:00
Per Inge Mathisen 3462f7b5cd Fix crash on placing beacons. 2012-01-07 23:02:53 +01:00
Per Inge Mathisen 545eb5c272 Convert research message data to ini file format. 2012-01-07 19:14:34 +01:00
Cyp 8cca01dfe2 Do not treat pointers as 32-bit integers when comparing values in scripts.
When comparing two RESEARCHes, compare RESEARCH::ref, since the pointers may apparently be different.

Fixes ticket:3027.
2012-01-07 18:41:54 +01:00