Commit Graph

807 Commits

Author SHA1 Message Date
Allanis
092b48651d [Change] Restructured a little to prepare for puffs of nebulae. 2013-07-22 15:53:09 +01:00
Allanis
1e7d19b2a6 [Change] Moved some code from perlin to nebulae. 2013-07-22 12:06:55 +01:00
Allanis
7b7ddae70e [Add] Rolled my own, much better python xml writing scheme. 2013-07-22 10:27:13 +01:00
Allanis
240869046b [Fix] dt weirdness on low fps. 2013-07-21 16:03:32 +01:00
Allanis
e066250c1f [Change] Improved nebulae system. 2013-07-21 15:58:58 +01:00
Allanis
ea3573404f [Fix] Nebulae overlay. 2013-07-21 15:35:30 +01:00
Allanis
7ea6e809e8 [Change] Increased star map size. 2013-07-21 13:37:11 +01:00
Allanis
df8af779ee [Add] Star system can now set nebuale density and volatility. 2013-07-21 13:33:43 +01:00
Allanis
9fb781d27e [Fix] Rumble no longer affects nebulae. 2013-07-21 13:29:05 +01:00
Allanis
2381ca3a36 [Fix] spfx_clear() also clears rumble. 2013-07-21 11:40:32 +01:00
Allanis
e331a8e8b6 [Fix] Map giving stats about unknown systems. 2013-07-21 11:33:44 +01:00
Allanis
6e3417907f [Fix] Segfault with creating new pilot. 2013-07-21 11:25:20 +01:00
Allanis
42a57d09e9 [Add] space_renderOverlay(). 2013-07-21 11:13:53 +01:00
Allanis
862ef7759b [Change] Split the star rendering to be able to switch to nebulae soon. 2013-07-20 19:17:10 +01:00
Allanis
475aa1f1fa [Add] Check for multitexture abilities and texture leaks. 2013-07-20 19:06:36 +01:00
Allanis
5584c3171c [Add] Gave menu screen a nice finished look. 2013-07-19 20:12:24 +01:00
Allanis
17db004ba1 [Fix] Tweaked a little bit, and the transitions is perfectly smooth now. 2013-07-19 19:18:04 +01:00
Allanis
86f7480826 [Add] Animated nebulae ftw!!! 2013-07-19 19:05:01 +01:00
Allanis
06fec494a5 [Fix] Nebulae is now fully working. 2013-07-19 15:01:48 +01:00
Allanis
cd158e5102 [Add] Nebulae almost working, There is a major graphical bug however. 2013-07-19 14:25:15 +01:00
Allanis
86b2ef3fe1 [Add] Initialize nebulae and use it in menu. 2013-07-15 12:24:51 +01:00
Allanis
fefc7e793c [Add] Nebulae render function. 2013-07-14 15:09:39 +01:00
Allanis
02e136520e [Add] -G option to force regeneration of nebulae. 2013-07-13 16:56:08 +01:00
Allanis
897fb9918d [Add] Now we will initialize the nebulae. 2013-07-13 16:38:29 +01:00
Allanis
40df85b5ab [Change] Some needed cleanup in perlin noise stuff. 2013-07-12 22:33:03 +01:00
Allanis
243795e068 [Add] Give errors on unsupported OS code. 2013-07-12 19:11:10 +01:00
Allanis
5ed5cf6b6d [Change] Hardcoded everything to have three dimensions. [perlin noise.] 2013-07-12 19:05:39 +01:00
Allanis
02e8b560fa [Fix] Forgot to give prototype for noise_generateNebulae(). 2013-07-12 17:45:24 +01:00
Allanis
ec6cabf2fe [Add] Some SSE stuff for speedups. 2013-07-11 18:44:37 +01:00
Allanis
1442259c0b [Add] Nebulae generation code. (Not using it at the minute). 2013-07-11 17:43:33 +01:00
Allanis
e4e7bf4b17 [Add] save png method to save a surface to a file as png. 2013-07-11 16:42:18 +01:00
Allanis
4fd8308706 [Change] Moving things around a litting in perling.* I made a little mess. 2013-07-11 16:16:38 +01:00
Allanis
2d1040b703 [Fix] Stupid me, last commit I was checking for a prefix instead of suffix. :/ 2013-07-11 16:01:55 +01:00
Allanis
4c1ee89ffb [Add] Fancy new "cloud" generator. This needs some heavy tweaking/cleanup. 2013-07-10 22:58:31 +01:00
Allanis
b8bafb4700 [Add] More planet functions for ai: ai.getrndplanet() and ai.getlandplanet(). 2013-07-10 19:30:58 +01:00
Allanis
09636a6c90 [Change] Need to run enter and takeoff hooks on load game. 2013-07-10 18:39:16 +01:00
Allanis
abab808387 [Fix] Bug with changing hyperspace path after selecting a route. 2013-07-10 18:32:13 +01:00
Allanis
2ec09b0ee3 [Add] ai.haslockon() to check for locked on missiles. 2013-07-10 18:04:36 +01:00
Allanis
7a6f27da43 [Add] Warn the player when a missile is locked onto her. 2013-07-09 19:03:03 +01:00
Allanis
f7c10bf329 [Add] Pilots now keep track of how many weapons are locked onto them. 2013-07-09 18:53:55 +01:00
Allanis
1f8e6a22fe [Change] Merged together some semi-redundant code in weapon_create. 2013-07-09 17:17:53 +01:00
Allanis
dcf093b13e [Add] Two new hooks: Board and disable. Also made lua debug more verbose. 2013-07-09 16:11:14 +01:00
Allanis
6099849f4f [Fix] A few warnings. 2013-07-08 22:34:19 +01:00
Allanis
c8b99cb35f [Change] Increased AL_GAIN somewhat. 2013-07-08 22:11:21 +01:00
Allanis
a580cdeed3 [Change] ai.dist() now accepts pilot id's as parameter. 2013-07-07 19:11:14 +01:00
Allanis
ef5a8e5a5f [Fix] Few lua script fixes. 2013-07-06 21:42:29 +01:00
Allanis
10418a5ba9 [Change] Knockback is now dependent on DamageType. 2013-07-06 19:10:34 +01:00
Allanis
698b22a324 [Change] Player no longer "hardcoded" into pilot_stack[0]. 2013-07-06 17:28:26 +01:00
Allanis
715fecfa03 [Change] Missed another /2 in binary pilot search. 2013-07-06 16:44:54 +01:00
Allanis
ab277eabb4 [Change] pilot_free uses memmove. 2013-07-06 16:42:28 +01:00
Allanis
30b6dfed77 [Add] Weapons save their faction and take that into account. 2013-07-06 16:35:42 +01:00
Allanis
71fdcffd07 [Add] Ai now calculates optimal distance when shooting. 2013-07-06 16:28:00 +01:00
Allanis
00fbe34b62 [Fix] Bug with unlimited range turret bolts. 2013-07-06 15:34:33 +01:00
Allanis
bbc46d0eef [Fix] Segfault when player dies. 2013-07-06 15:29:01 +01:00
Allanis
7a66419f7c [Fix] Fuel loads properly now. 2013-07-06 14:46:06 +01:00
Allanis
26211ee1f5 [Change] Switched SPFX timers to something more sane. 2013-07-06 13:02:34 +01:00
Allanis
90707480d9 [Change] Swithced weapon timer methods to something a little more sane. 2013-07-05 15:33:07 +01:00
Allanis
8213cb9f48 [Change] Switched l+(h-l)/2 to (h+l) >> 1 in binary search. 2013-07-04 13:43:24 +01:00
Allanis
19e3e818a4 [Change] Renamed pilots and mpilots to pilot_nstack and pilot_mstack. 2013-07-04 13:33:38 +01:00
Allanis
c20fe36c27 [Change] Place turrets before missiles. 2013-07-03 17:44:55 +01:00
Allanis
8e6e690388 [Change] Outfit_getTech now sorts by type and price. 2013-07-02 13:11:25 +01:00
Allanis
9dc797a8a3 [Add] Just a few more comments. :/ 2013-07-01 19:49:13 +01:00
Allanis
203079bcfa [Add] Check for errors when using "include". 2013-06-30 17:19:40 +01:00
Allanis
05fe285d87 [Change] Now load the basic lua stuff. 2013-06-30 17:17:09 +01:00
Allanis
cad5bd932c [Change] No longer calling luaopen directly. 2013-06-30 17:07:06 +01:00
Allanis
d692035039 [Add] Lua wrappers for luaL_newState and luaopen_base. 2013-06-29 17:58:01 +01:00
Allanis
185039ae62 [Change] Cleaned up some variable/function names, also added -Wshadow CFLAG. 2013-06-28 16:08:56 +01:00
Allanis
5eff5317c6 [Add] Using -Wpointer-arith flag. 2013-06-28 13:23:01 +01:00
Allanis
14fed140c3 [Change] A little opengl code cleanup. 2013-06-28 13:05:32 +01:00
Allanis
c70b87743c [Change] Let radiation weapons do a bit more shield damage. 2013-06-27 23:22:34 +01:00
Allanis
c8c23ef4bb [Change] Death menu button labels. 2013-06-27 23:03:27 +01:00
Allanis
d53caec803 [Change] Renamed ships to ship_nstack to follow current convention. 2013-06-26 21:21:46 +01:00
Allanis
a041751ec1 [Add] More debug magicz for misn_lua. 2013-06-26 20:54:12 +01:00
Allanis
692fb388df [Add] Missions can now mark systems. [Fix] Seg fault when switching pilots. 2013-06-26 00:28:16 +01:00
Allanis
73d8e18a2a [Add] Fuel is saved too now. 2013-06-25 22:34:15 +01:00
Allanis
d11eabd358 [Add] New outfit: Star map, allows you to see two jump points from current location. 2013-06-25 22:21:56 +01:00
Allanis
5760978e56 [Change] Moved A* jump pathfinding from space.c to map.c. 2013-06-25 21:07:54 +01:00
Allanis
700e47cd57 [Add] Use flags now for systems to allow missions to mark them. 2013-06-24 21:48:57 +01:00
Allanis
6c3d96ba51 [Add] Pathfinding avoids unknown systems. 2013-06-23 20:42:33 +01:00
Allanis
10a4791d81 [Add] Magor: You don't already know all the star system location. Go explore. 2013-06-23 19:22:07 +01:00
Allanis
b0d4415cff [Change] No longer use int id's for outfit types. [Add] Heavy Ion Turret. 2013-06-23 16:42:16 +01:00
Steven Arnow
84c90b5c97 Your SDL include lines .-. 2013-06-23 16:21:16 +02:00
Allanis
1d2b530fdc [Add] New damage types: Ion and Radiation. 2013-06-23 15:02:05 +01:00
Allanis
0941c2d2d7 [Fix] Button getting selected when it shouldn't. 2013-06-23 13:32:34 +01:00
Allanis
046259db79 [Change] Lowering default ms delay to trigger afterburner from 500 to 200. 2013-06-23 13:28:32 +01:00
Allanis
1051a39a09 [Fix] Now you can't rumble afterburner when in toolkit or hyperspacing. 2013-06-23 13:24:29 +01:00
Allanis
fed0d8c798 [Add] New ship to system. 2013-06-23 13:20:22 +01:00
Allanis
07f69e58c6 [Change] Turns out pairs is in the lua base library and we need that. 2013-06-23 13:00:00 +01:00
Allanis
a99c82b47c [Add] Another ship! :D 2013-06-23 12:56:54 +01:00
Allanis
b7b590ba8f [Fix] Oh, --help was wrong about width and hight setting. :/ 2013-06-23 01:03:58 +01:00
Allanis
a2ee4ea0ee [Change] Optimised image loading, loading graphics once only. 2013-06-23 00:10:58 +01:00
Allanis
53f1da128c [Change] Make ships appear to enter from hyperspace, I'm not completely satisfied yet. 2013-06-22 22:01:19 +01:00
Allanis
9cfb07eb59 [Change] Lowered threshold to skip frames (now under 4FPS skips). 2013-06-22 21:50:11 +01:00
Allanis
7fd06bd265 [Fix] Doxygen comments. 2013-06-22 21:48:25 +01:00
Steven Arnow
858295b3f4 Ahem. Forgot headers. Apparently, all the source/header should be updated. Woops 2013-06-22 22:17:28 +02:00
Steven Arnow
a2bb0df939 All C++-comments in src/ should now be C89 comments 2013-06-22 22:10:25 +02:00
Allanis
d8705a6f7a [Fix] New player cleanup stuff. 2013-06-22 20:43:57 +01:00
Allanis
d195480622 [Change] Formalized space station types. 2013-06-22 19:21:51 +01:00
Steven Arnow
efa8b80eb9 Added NULL-pointer check for testing purposes 2013-06-22 18:51:14 +02:00
Allanis
03ca0bf5d2 [Add] Adding a ton more systems, optimised graphics etc. 2013-06-22 17:19:13 +01:00
Allanis
883523e1e5 [Fix] Another seg fault with music system when disabled. 2013-06-22 15:37:56 +01:00
Allanis
dca1a33c36 [Fix] Problems with system with one unlandable planet. 2013-06-21 23:30:10 +01:00
Allanis
3f269033be [Fix] Segfault when running Lephisto muted. 2013-06-21 22:02:21 +01:00
Allanis
f5039ca320 [Change] Cosmetic tweakage. 2013-06-21 20:34:01 +01:00
Allanis
47cf24d254 [Fix] A* bugs where because of a typo. Changed to Djikstra now though. 2013-06-16 16:24:39 +01:00
Allanis
bc0ebf678e [Fix] Pathfinding doesn't seg fault anymore? 2013-06-16 16:05:04 +01:00
Allanis
7547bb80c5 [Change] Exiting from a game drops you to main menu instead of simply quiting. 2013-06-16 12:45:51 +01:00
Allanis
5800461f1d [Add] Possibility to delete save games. 2013-06-16 02:25:04 +01:00
Allanis
2120f5da90 [Fix] Accidently used assignment operator rather than logical to check if a file exists. :/ 2013-06-16 02:09:58 +01:00
Allanis
234a73635c [Fix] Forgot to load snd/music.lua into packfile. 2013-06-16 01:12:59 +01:00
Allanis
25cd9e3ae5 [Fix] type trying to enable a button. 2013-06-15 20:29:11 +01:00
Allanis
7e0963ad35 [Fix] Possible buffer overflows with strncpy. 2013-06-14 13:50:08 +01:00
Allanis
edd3f9cd54 [Add] Doxygen support. 2013-06-11 23:56:43 +01:00
Allanis
16baff189e [Change] Added a few nazi flags, and fixed code up a little. 2013-06-11 22:50:04 +01:00
Allanis
56d0b46b14 Merge branch 'testing' 2013-06-10 21:16:22 +01:00
Allanis
d5b80c1522 [Change] Improved music handling. 2013-06-10 21:15:48 +01:00
Allanis
5864bf9cdf Merge branch 'testing' 2013-06-10 19:20:15 +01:00
Allanis
82f724eb04 [Add] Music is now controlled by lua, now we can set music based on scenario. ^.^ 2013-06-10 19:19:26 +01:00
Allanis
5e975e5d3b Merge branch 'testing' 2013-06-10 00:42:44 +01:00
Allanis
3c4383b325 [Change] Cleaned up the ai lua wrappers a bit, needs plenty more work. 2013-06-10 00:42:08 +01:00
Allanis
f15b2b50a6 Merge branch 'testing' 2013-06-09 19:35:16 +01:00
Allanis
e57c6768b7 [Change] Began cleaning lua wrappers up a bit. 2013-06-09 19:33:26 +01:00
Allanis
8976622b73 [Change] Make sounds play fully. 2013-06-09 17:09:35 +01:00
Allanis
331cc86c98 [Fix] Potential issues with reallocs. Added more comments too. 2013-06-09 17:04:44 +01:00
Allanis
44dbdaaf91 [Fix] Changed some input things to hopefully prevent blocking. 2013-06-09 16:39:48 +01:00
Allanis
ebb67fd966 [Fix] Forgot to exit alut. 2013-06-09 16:21:37 +01:00
Allanis
12eae87db9 [Add] Shoot me. But I have added alut as a dep. It loads sounds well. Engine sounds are now playing too. 2013-06-09 16:19:54 +01:00
Allanis
8d3d58ffb4 [Things] An assortment of fixes, also added afterburner sounds. 2013-06-06 21:44:57 +01:00
Allanis
b2eb68d38c [Fix] Typo errors..... 2013-06-04 20:28:56 +01:00
Allanis
7f74fbfff4 [Fix] Some sound cleanup and fixed potential bugs. 2013-06-04 19:43:39 +01:00
Allanis
7fc15f650c [Fix] Corrected small desciation on all sprites. 2013-06-04 17:02:42 +01:00
Allanis
fb326610f6 [Fix] [Phase 4] Clean up sounds a better. Fixed segfaults. Added some more sounds. 2013-06-04 16:58:38 +01:00
Allanis
f191a1d824 [Fix] [Phase 3] Sound is enabled by default again. 2013-06-04 16:40:30 +01:00
Allanis
2ac26a5aed [Fix] [Phase 2] Almost there, Don't use this build, it is unstable. 2013-06-04 16:32:15 +01:00
Allanis
6870dd2057 [Add] Sound System [Phase 1] Cleaned up and made a few fixed ready for [phase 2.] 2013-06-04 16:08:59 +01:00
Allanis
65e25f6ce0 [Change] Moved from damage_armour and co, to just damage and damagetype. 2013-06-04 12:06:39 +01:00
Allanis
493f67691e [Change] New philosophy. When you swap ships, your cargo should stay with you, will fix issues. Also, major outfit add/rm cleanup. 2013-06-03 22:22:50 +01:00
Allanis
123ddb3d46 [Add] Cargo affects weight. Also fixed bug when changing ships. 2013-06-02 16:43:16 +01:00
Allanis
28e936b828 [Change] Use a config file from home directory. 2013-06-02 16:28:37 +01:00
Allanis
00730b50a7 [Clean] gl_screen.[wh] = SCREEN_[WH] in most places. 2013-06-02 14:43:24 +01:00
Allanis
d8f3372abe [Fix] Some outstanding bugs in OpenGL textures. 2013-06-02 14:12:15 +01:00
Allanis
a6805df42d [Fix] Segfault when trying to land on a system with no planets. 2013-06-02 13:57:00 +01:00
Allanis
fee98162a6 [Fix] OpenGL blitting stuff. 2013-06-01 21:59:08 +01:00
Allanis
61cb4a3f67 [Change] Have pilots re-calculate cargo load when calculating stats. 2013-06-01 20:25:40 +01:00
Allanis
d0171998c4 [Fix] Delete a hook that shouldn't be there for some reason it get's stuck.
[Fix] Makefile infinate loop.
2013-06-01 19:49:14 +01:00
Allanis
cec46124f8 [Change] Updated TODO. 2013-06-01 19:37:52 +01:00
Allanis
9701687dc7 [Fix] I haz been told that older versions of gcc won't compile this. I say FFFFUUUUU!! 2013-06-01 19:34:40 +01:00
Allanis
273607eda0 [Add] You can now use lua as conditions for missions. 2013-06-01 19:11:38 +01:00
Allanis
848a5e120d [Fix] Added PLAYER_CREATING flag to fix all creation/death issues propperly. 2013-06-01 18:39:37 +01:00
Allanis
3ff2885fd2 [Fix] Annoying ass bug with overwriting a pilot that is dead!! 2013-06-01 18:11:56 +01:00