Commit Graph

780 Commits

Author SHA1 Message Date
Steve 2a5b048253 Merge branch 'patch' into develop
Conflicts:
	common.mk
	src/battle/battle.h
2015-12-18 12:03:34 +00:00
Steve b553126f6c Added second Clarke mission. 2015-12-18 12:03:18 +00:00
Steve f87d992465 Reduced health of engines. 2015-12-18 12:02:55 +00:00
Steve 2d37460944 Generate cap ship component names from parent name. 2015-12-18 12:02:45 +00:00
Steve cfc0ed7cc8 AI can now follow leaders. 2015-12-18 12:02:01 +00:00
Steve b5dfab1bd5 Added debug keys. 2015-12-18 10:12:37 +00:00
Steve 7325bbe506 INF Corvette updates. 2015-12-18 08:26:21 +00:00
Steve 929e942bba INF corvette graphic updates. 2015-12-17 23:15:10 +00:00
Steve 942281352c Corvette config updates. 2015-12-17 23:14:46 +00:00
Steve 48d54af42e Use float for draw angle, instead of int. 2015-12-17 23:14:25 +00:00
Steve 2e2bd9d882 Debris updates. 2015-12-16 22:40:26 +00:00
Steve 33373457b2 Error when no capital ship found. 2015-12-16 22:40:14 +00:00
Steve 81a536177c Added INF corvette. 2015-12-16 22:39:59 +00:00
Steve 7701fc0336 Combined guns bug fix. 2015-12-14 14:05:02 +00:00
Steve 691068a634 Shield smash bug fix. 2015-12-14 14:04:48 +00:00
Steve 310637b4eb Merged from v0.41. 2015-12-14 11:41:43 +00:00
Steve 76f1b9786a Flush all events when mouse has been warped. 2015-12-14 08:33:14 +00:00
Steve 1577907390 Warp mouse to centre of galactic map upon start, to prevent scrolling. 2015-12-14 08:32:59 +00:00
Steve 1054fc1aa8 Added keyboard alternatives for some mouse controls. 2015-12-14 08:32:36 +00:00
Steve 7bda6d7ed3 Initial commit of first Mace mission. 2015-12-14 08:17:38 +00:00
Steve bb4e7940f0 Reduced availibilty of missiles on corvette. 2015-12-14 08:15:56 +00:00
Steve c4dfb823ef Code clean up. 2015-12-14 08:15:41 +00:00
Steve 2012f87b39 Randomize debris for fighters. Added Rebel AI thresholds. 2015-12-13 17:56:16 +00:00
Steve 8e1fdf559a Scatter debris more quickly. 2015-12-13 17:55:10 +00:00
Steve 260ada68c8 Capital ships: scatter debris when components destroyed. Run scripts upon certain events. 2015-12-13 17:54:57 +00:00
Steve 743786efb8 Added debris. 2015-12-13 14:50:54 +00:00
Steve 99eb742d34 HUD distance calculation bug fix. 2015-12-12 18:24:41 +00:00
Steve 4fbdcd0af6 Allow flags in missions to be added to existing entity flags, or replace them completely. 2015-12-12 18:24:23 +00:00
Steve 6b06b2a431 Increased corvette engine health. Allowed guns to fire missiles. Cap ships will also hunt down AI targets. 2015-12-12 17:12:25 +00:00
Steve 247c9f79e3 Created capital ship engine effect. 2015-12-12 15:11:40 +00:00
Steve 5416debc21 Corvette graphics updates. 2015-12-12 14:56:33 +00:00
Steve fb41a28c0c Corvette graphics updates. 2015-12-12 12:17:29 +00:00
Steve 25f2204d06 Clear drawBullet list when battle starts. 2015-12-11 19:10:27 +00:00
Steve fb524386fa drawBullets() bug fix. 2015-12-11 19:06:16 +00:00
Steve 1fa033bc7e Relocated corvette graphics. 2015-12-10 17:50:03 +00:00
Steve 3ab78a070a Updated HUD distance display. 2015-12-10 14:25:22 +00:00
Steve 05f58e0971 Added SECONDARY_TARGET flag. 2015-12-10 12:40:23 +00:00
Steve e3ec8017af Fewer guns on corvette. Lowered component health. 2015-12-10 11:47:39 +00:00
Steve 51452925f9 Death of guns does not affect cap ship health. 2015-12-10 11:47:18 +00:00
Steve a5f8be0586 EF_STATIC now means entity will never move (not even rotate). 2015-12-10 11:46:57 +00:00
Steve da692862b9 Include cap ships in force counts. 2015-12-10 11:11:32 +00:00
Steve 09d93f9163 Treat capital ship engines differently from components. Will cause vessel to stop moving when they are all destroyed. Don't contribute to ship health. 2015-12-10 11:11:04 +00:00
Steve 4358d5b698 Misc. fixes. 2015-12-10 10:16:44 +00:00
Steve deafab786e Separate gun AI. 2015-12-10 10:16:27 +00:00
Steve 833043ba7d Bullets don't hit their own entity groups (mainly for capital ships). 2015-12-10 10:16:16 +00:00
Steve 1b1a4ca792 Shift dead entities out of main list instead of freeing, to counter dangling pointers. 2015-12-10 10:15:27 +00:00
Steve a541cf1976 Allow mod to handle floats. 2015-12-10 10:05:00 +00:00
Steve 54ebea7c43 Further capital ship tweaks. 2015-12-10 10:04:22 +00:00
Steve ede17199c3 Created corvette. 2015-12-10 10:04:00 +00:00
Steve c8eecdd316 Further capital ship tweaks. 2015-12-09 07:25:24 +00:00