Commit Graph

45 Commits

Author SHA1 Message Date
Matthew Hoops
131b99844b PEGASUS: Fix the robot timer outside of the shield generator 2013-12-11 23:34:16 -05:00
Matthew Hoops
90db6590f8 PEGASUS: Fix missing text in canyon chase 2013-04-27 11:29:06 -04:00
Matthew Hoops
78f5e986ce PEGASUS: Add a workaround in case the player doesn't get the card bomb 2013-04-12 15:06:14 -04:00
Torbjörn Andersson
b3d52de50f JANITORIAL: Remove unnecessary semicolons 2013-03-02 20:19:45 +01:00
Johannes Schickel
7b18d4a468 PEGASUS: Silence C++11 narrowing warnings. 2013-01-09 07:24:37 +01:00
Matthew Hoops
85bd7daa41 PEGASUS: Fix uninitialized variable 2012-10-03 10:58:24 -04:00
Filippos Karapetis
4ad86e0c11 PEGASUS: MarsTimerEvent is a struct 2012-10-01 03:05:50 +03:00
Johannes Schickel
a6c6c74350 PEGASUS: Remove trailing whitespaces.
Powered by: git ls-files "*.cpp" "*.h" | xargs sed -i -e 's/[ \t]*$//'
2012-09-26 04:11:09 +02:00
Matthew Hoops
d9b204b78e PEGASUS: Fix minor formatting issue 2012-09-25 22:09:21 -04:00
Matthew Hoops
bbec9fac20 PEGASUS: Initialize _duration in RobotShip 2012-09-25 22:08:55 -04:00
Matthew Hoops
65664f8a9a PEGASUS: Fix avoiding Mars robot scoring
Thanks to Keith Kaisershot (blitter) for spotting
2012-09-20 23:12:32 -04:00
Johannes Schickel
1aa12ddb96 PEGASUS: "Fix" segmentation fault for DC toolchain when compiling shuttlehud.cpp.
It seems the explicit destructor of ShuttleHUD is problematic. When I move
it's implementation to shuttlehud.cpp it does not segfault. Removing it on
the other hand also does not cause it to segfault. So I chose the latter,
since it has no special implementation anyway.
2012-09-21 02:36:37 +02:00
Johannes Schickel
8aceef9711 PEGASUS: Replace FunctionPtr by our Functor code in Common.
This "fixes" a segmentation fault in our buildbot's toolchain for DC.
The segmentation fault occured while compiling
engines/pegasus/ai/ai_condition.cpp.

Thanks to clone2727 for looking over this and testing it.
2012-09-21 02:35:50 +02:00
Matthew Hoops
f61146f327 PEGASUS: Remove g_allItems global construction 2012-08-28 16:50:15 -04:00
Matthew Hoops
81e7c9a0c1 PEGASUS: Remove g_allHotspots global construction 2012-08-28 16:36:50 -04:00
Matthew Hoops
bb1e60e8b2 Merge remote branch 'upstream/master' into pegasus
Conflicts:
	AUTHORS
	devtools/credits.pl
	gui/credits.h
2012-08-26 16:12:25 -04:00
Matthew Hoops
3abacdae83 PEGASUS: Attempt to fix compilation on MSVC 2012-04-06 14:23:00 -04:00
Matthew Hoops
983bd16bb7 PEGASUS: Fix file permissions 2012-04-03 15:23:08 -04:00
Matthew Hoops
b2c29410b9 PEGASUS: Add some more protection about junk flying off-screen 2012-03-20 14:50:06 -04:00
Matthew Hoops
d29bde9abe PEGASUS: Remove another global construction 2011-12-20 18:56:42 -05:00
Matthew Hoops
a600dcb56a PEGASUS: Some space/misc cleanup 2011-12-20 18:26:25 -05:00
Matthew Hoops
f72884cb7b PEGASUS: Cleanup some constants
Added missing static qualifiers, get rid of some short/long
2011-12-16 23:24:55 -05:00
Matthew Hoops
12efb47b53 PEGASUS: Remove t prefix from typedefs
Some other minor cleanup too
2011-12-16 14:17:50 -05:00
Matthew Hoops
faa6018cad PEGASUS: Just clip the junk from going off right or bottom too 2011-11-01 20:38:22 -04:00
Matthew Hoops
bcf5ea1dc2 PEGASUS: Keep the space junk from flying beyond the screen boundary 2011-10-29 12:19:58 -04:00
Matthew Hoops
1ca6da46ad PEGASUS: Fix destroying the robot shuttle 2011-10-28 22:21:30 -04:00
Matthew Hoops
020f384247 PEGASUS: Fix pitch of one bit images in the shuttle HUD 2011-10-28 11:45:00 -04:00
Matthew Hoops
514d93622d PEGASUS: Fix RS232 draw call 2011-10-28 11:31:05 -04:00
Matthew Hoops
88360741bd PEGASUS: Fix the planet mover 2011-10-28 11:19:27 -04:00
Matthew Hoops
59f7d432d1 PEGASUS: Implement dirty rect erase code (as used by the space chase) 2011-10-28 01:43:05 -04:00
Matthew Hoops
3f69c195ae PEGASUS: Allow for initial support of the space chase
It's not ready yet, but it's slowly becoming playable. For instance, scaling, the shuttle HUD, and the energy beam work on the first try which is nothing short of a miracle.

This commit also moved around some Mars constants because the previous include setup did not work; I hope to make the other neighborhoods have a separate constants file too.
2011-10-28 01:24:57 -04:00
Matthew Hoops
e29d00e6b6 PEGASUS: Add the Shuttle HUD 2011-10-27 19:56:52 -04:00
Matthew Hoops
015d81b742 PEGASUS: Add the energy beam weapon 2011-10-27 19:24:11 -04:00
Matthew Hoops
1bd2480f5f PEGASUS: Add the tractor beam class 2011-10-27 16:41:54 -04:00
Matthew Hoops
0990703779 PEGASUS: Add the graviton cannon! 2011-10-27 16:02:20 -04:00
Matthew Hoops
9f1d9f3697 PEGASUS: Add the shuttle weapon base class 2011-10-27 14:43:18 -04:00
Matthew Hoops
61311a2648 PEGASUS: Add the robot ship 2011-10-24 16:23:32 -04:00
Matthew Hoops
b3059e75e2 PEGASUS: Add the space junk stuff 2011-10-23 22:50:54 -04:00
Matthew Hoops
841f96868a PEGASUS: Add the planet mover for the space chase 2011-10-23 21:54:13 -04:00
Matthew Hoops
cbcdf99092 PEGASUS: Add the basic 3D logic for the space chase 2011-10-23 21:38:40 -04:00
Matthew Hoops
c3d9a1cb35 PEGASUS: Add the hermite code for the space chase 2011-10-23 20:52:22 -04:00
Matthew Hoops
de3962fbc8 PEGASUS: Add the Mars canyon chase sequence 2011-10-23 18:52:49 -04:00
Matthew Hoops
1529ed0891 PEGASUS: Implement deleting items when inventory is full 2011-10-17 09:21:49 -04:00
Matthew Hoops
1c949d375a PEGASUS: Add the Mars neighborhood
Does not include the space chase just yet or canyon chase.

The robot timer seems a bit wonky right now and doesn't stop, but everything else seems to be working.
2011-10-15 19:48:36 -04:00
Matthew Hoops
64656342a9 PEGASUS: Add the Mars reactor element code 2011-10-14 16:08:34 -04:00