Commit Graph

692 Commits

Author SHA1 Message Date
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
Allanis
f91505b950 [Change] Some code cleanup and made map a little more sane when selecting paths. 2013-06-01 18:07:45 +01:00
Allanis
91aa3268c0 [Fix] Slight graphical bug in map that VLack complained about, and I thing @medek. 2013-06-01 17:46:45 +01:00
Allanis
39871138e6 [Add] Conserve hyperspace path when taking off. 2013-06-01 17:39:20 +01:00
Allanis
6932ea8a8a [Add] Taken @medek 's advice and wrote my own saver for lua rather than using pluto. A lot cleaner and faster. 2013-06-01 17:31:50 +01:00
Allanis
304bc81ea1 [Add] mission/hook save disabled right now - Pluto is still being a bitch! 2013-05-30 18:33:15 +01:00
Allanis
d4e46a6210 [Clean] WTF is this?! 2013-05-25 18:01:25 +01:00
Allanis
a90f0d66c0 [Add] Missions are now loaded! Still need to load hooks for them to work. 2013-05-25 00:56:36 +01:00
Allanis
484b482c4b [Fix] Issue with pilot being marked as hostile when not hostile. :/ 2013-05-23 21:36:51 +01:00
Allanis
e4f76c9b08 [Add] Be a little trickiar when generating mission id's. 2013-05-23 21:34:42 +01:00
Allanis
97baac1c3e [Add] Comments to base64. 2013-05-23 21:30:49 +01:00
Allanis
a064eec5eb [Fix] Minor decode bug in base64 2013-05-23 21:26:05 +01:00
Allanis
0195e84cca [Change] Meh. 2013-05-23 20:26:09 +01:00
Allanis
5060e9b7ba [Change] Just a few bits of cleanup. 2013-05-23 20:13:41 +01:00
Allanis
ad212c78d1 [Fix] Killed warnings for base64 2013-05-23 19:50:13 +01:00
Allanis
7cf183ea88 [Fix] Base64 encoder/decoder actually werks now! 2013-05-23 19:46:23 +01:00