Commit Graph

79 Commits

Author SHA1 Message Date
Rtch90
f2d6345a61 [Add] Adding more collision crap.
[Add] Adding an NPC entitity.
2012-04-12 17:45:17 +01:00
Tamir Atias
26ad9ed3f8 Merge branch 'master' of github.com:Allanis/LibD 2012-04-12 19:12:34 +03:00
Tamir Atias
06acb9e9a6 [Add] Playing music.
[Add] Background Music for maps.
2012-04-12 19:11:56 +03:00
Rtch90
7c02c23663 [Add] Added a TileCollision class to store some collision data. 2012-04-12 17:00:05 +01:00
Rtch90
ac1923fc46 [Remove] Removed GLWindow.* as we no longer use them. 2012-04-12 16:11:36 +01:00
Rtch90
79872d8452 [Fix] Re-adding some of my AABB stuff, now we know that it is not causing problems. 2012-04-12 16:04:33 +01:00
Tamir Atias
06e13c3c33 [Fix] Initialized some uninitialized variables.
[Fix] Changed Allanis' bounding box class to use SDL surfaces.
[Add] Initial Qt Creator support in Windows.
2012-04-12 18:01:06 +03:00
Rtch90
1a2ba29855 [Fix?] Attempting to fix some seg faults. It seems KonoM's recource management is causing problems. 2012-04-12 15:04:46 +01:00
Tamir Atias
06171f3671 [Fix] Game was initialized before SDL. 2012-04-12 04:43:38 +03:00
Rtch90
6b5607797b [ERROR] Seg faults everywhere.. WOO!! 2012-04-12 02:37:31 +01:00
Rtch90
84d3121bfb [Fix] Fixed Qt's project file. 2012-04-12 02:29:57 +01:00
Tamir Atias
abd57fcf78 Merge branch 'master' of github.com:Allanis/LibD 2012-04-12 04:09:28 +03:00
Tamir Atias
c783228588 [Fix] Scrolling is now done. 2012-04-12 04:09:03 +03:00
Rtch90
68251906c9 [Add] Adding some more collision stuff. Going to finish up tomorrow. 2012-04-12 02:06:57 +01:00
Rtch90
0510520308 Merge branch 'master' of github.com:Allanis/LibD 2012-04-12 01:55:41 +01:00
Rtch90
b360a2a894 [Add] Half way through axis aligned bounding box implementation. 2012-04-12 01:55:07 +01:00
Tamir Atias
06ee0fbdda Merge branch 'master' of github.com:Allanis/LibD 2012-04-12 03:54:15 +03:00
Tamir Atias
deb832f7e2 [Add] Initial map scrolling. 2012-04-12 03:53:42 +03:00
Rtch90
11367621ef [Fix] Fixed KonoM's Qt project attempt. 2012-04-12 01:16:49 +01:00
Tamir Atias
2de0088860 Merge branch 'master' of github.com:Allanis/LibD 2012-04-12 03:08:24 +03:00
Tamir Atias
89d50ea8fb [Add] Level loading! 2012-04-12 03:07:45 +03:00
Rtch90
566c2217b9 [Add] Frecking finished the AABB!! (I think, got to go test the thing now - But it's in.) 2012-04-12 00:49:50 +01:00
Rtch90
c1b19ea178 [Add] Working on AABB, trying to find the top left and bottom right of a surface. 2012-04-12 00:33:44 +01:00
Rtch90
48e08fa576 [Fix] Fixed KonoM's resource manager shit. typenames had not been declared. 2012-04-12 00:07:56 +01:00
Tamir Atias
c32aeda9ee [Fix] ResourceManager stuff. 2012-04-12 02:04:56 +03:00
Tamir Atias
0cad1e8128 [Fix] Allanis' AABB errors. 2012-04-12 01:50:44 +03:00
Rtch90
3b9b640984 [Fuckknows] <<< Refer to header.. 2012-04-11 23:40:12 +01:00
Rtch90
729f0c55f1 Merge branch 'master' of github.com:Allanis/LibD 2012-04-11 23:39:27 +01:00
Tamir Atias
a21b067cc0 [Fix] Possibly fixed Qt project? 2012-04-12 01:35:32 +03:00
Rtch90
f64bbb6e89 Merge branch 'master' of github.com:Allanis/LibD
Conflicts:
	src/Actor/Player.cpp
2012-04-11 23:32:30 +01:00
Rtch90
1e1149aabc [Add] Adding axis aligned bounding boxs for collision detection. Needed to commit to pull. 2012-04-11 23:30:22 +01:00
Tamir Atias
b2fb84dcee [Add] Loading texture from sprite class.
[Add] Resource management!
2012-04-12 01:28:26 +03:00
Tamir Atias
96a2929c08 [Add] KonoM's TMX parser library. 2012-04-12 00:59:30 +03:00
Tamir Atias
b5bc5149fb [Add] Now it is possible to draw regions of a sprite. 2012-04-12 00:24:03 +03:00
Rtch90
51502ccd3a [Add] Adding a nice sprite into the mix. 2012-04-10 23:38:20 +01:00
Rtch90
6241b32288 [Add] Added mutators for the x/y coordinates of a sprite.
[Add] Implemented Input methods and made a moveable entity.
2012-04-10 23:29:19 +01:00
Rtch90
e894dddcb7 [Remove] Removed the ResizeWindow() function from Globals. 2012-04-09 21:27:14 +01:00
Rtch90
c4789fd077 [Add] Added a method to resize the GL window, so the canvas resizes too! 2012-04-09 21:23:16 +01:00
Rtch90
616ed1bca5 [Add] Added the ability to resize ones window. 2012-04-09 21:09:48 +01:00
Tamir Atias
abddca4c8a [Fix] Fixed some of Allanis' SDL initialisation errors. 2012-04-09 23:00:48 +03:00
Rtch90
bf6de9b9b0 [Change] Moving to SDL instead of X11 and WINAPI 2012-04-09 20:46:54 +01:00
Rtch90
b7949795ae [Change] Moving from X11 and WinAPI to SDL for window creation.
[Add] Added some player class stuff.
2012-04-08 22:56:16 +01:00
Rtch90
ea553a7b62 [Shrug] Uh, got annoyed at X11 input shit.. I guess I'll sort it later. 2012-04-08 19:39:46 +01:00
Tamir Atias
931f7d59a0 [Add] Input stuff in Windows.
[Fix] Coordinate system is now correct.
2012-04-08 21:23:52 +03:00
Rtch90
60366c7ad0 [Add] Implemented Input decices. 2012-04-08 18:16:35 +01:00
Rtch90
a277545963 [Add] Added a Qt project for those silly IDE users. :D 2012-04-08 17:11:02 +01:00
Rtch90
6ce0a5602d [Fix] Just adding a newline to the end of Globals.* 2012-04-08 16:54:41 +01:00
Rtch90
8e17066be1 [Add] Added some input structures and methods.
[Fix/Clean] Makefiles are uh.. a bitch!
2012-04-08 16:51:50 +01:00
Tamir Atias
0bc96ae060 [Fix] Added missing files from Allanis' last commits. 2012-04-08 03:58:30 +03:00
Tamir Atias
aa0fb54cb2 Merge branch 'master' of https://github.com/Allanis/LibD 2012-04-08 03:57:20 +03:00