Tamir Atias
|
054e4f0c08
|
Merge branch 'master' of github.com:Allanis/LibD
|
2012-04-17 20:55:32 +03:00 |
|
Tamir Atias
|
38abbab93e
|
[Fix] Added back running.
[Fix] Collisions is only tested against lower half of the actor.
|
2012-04-17 20:54:41 +03:00 |
|
Rtch90
|
6b52c5ef96
|
[Fix] stricmp was not declared. Changed to srtcmp and included <string.h>
|
2012-04-17 18:47:14 +01:00 |
|
Tamir Atias
|
2c50be6573
|
[Fix] Flickery scrolling.
|
2012-04-17 20:41:55 +03:00 |
|
Tamir Atias
|
8028320cef
|
[Add] Tile based collisions.
|
2012-04-17 20:23:48 +03:00 |
|
Tamir Atias
|
e35cb64246
|
[Fix] Animation was farked!
[Fix] Strings are now allocated from the heap.
|
2012-04-17 03:58:42 +03:00 |
|
Rtch90
|
d4ede47353
|
[Fix] No idea.
|
2012-04-16 22:45:53 +01:00 |
|
Rtch90
|
0f1ccefc43
|
[Fix] Just a small fix with Animation sprite loading. Not done propperly.
|
2012-04-16 21:55:05 +01:00 |
|
Rtch90
|
42ecaaefd2
|
[Add] Added Animating sprites. -- Bit buggy right now.
|
2012-04-15 22:15:23 +01:00 |
|
Rtch90
|
cda3b3d086
|
[Change] Added a positional sprite method.
[Add] Added some more Animation. Not far off done now.
|
2012-04-15 14:45:31 +01:00 |
|
Rtch90
|
44f6fd070c
|
[Fix] Made a comment a little clearer.
|
2012-04-15 13:45:17 +01:00 |
|
Rtch90
|
d57835d806
|
[Fix] Fixed the orthorgraphic view bug Tamir introduced.
|
2012-04-15 13:42:10 +01:00 |
|
Rtch90
|
e6f773dd68
|
Merge branch 'master' of github.com:Allanis/LibD
|
2012-04-15 13:27:57 +01:00 |
|
Rtch90
|
f61e1d67de
|
[Add] Added animation sequence data serializer.
|
2012-04-15 13:26:34 +01:00 |
|
Tamir Atias
|
e6ef0c68c3
|
[Fix] Tiles getting borders when scrolling.
[Add] Allanis' String.* files to VC++ project.
[Fix] String.cpp not compiling.
|
2012-04-15 04:36:37 +03:00 |
|
Rtch90
|
8e7d526e4f
|
Merge branch 'master' of github.com:Allanis/LibD
|
2012-04-15 00:54:27 +01:00 |
|
Rtch90
|
cde92a8bbe
|
[Add] FREE FREE FREE AS A BIRD I'... I mean. Adding string class, so I can do some conversions.
|
2012-04-15 00:53:09 +01:00 |
|
Tamir Atias
|
6963a56c5c
|
[Add] Player and NPC now inherit Actor.
|
2012-04-15 00:59:12 +03:00 |
|
Tamir Atias
|
5ecbeede07
|
Merge branch 'master' of github.com:Allanis/LibD
|
2012-04-15 00:34:30 +03:00 |
|
Tamir Atias
|
9f464f3c14
|
[Add] Text rendering with SDL_ttf and OpenGL.
|
2012-04-15 00:33:15 +03:00 |
|
Rtch90
|
aca5147ddc
|
Merge branch 'master' of github.com:Allanis/LibD
|
2012-04-14 21:52:01 +01:00 |
|
Rtch90
|
66d01ce735
|
[Add] Added a class to read files, wanted something useful for animations. I will commit that soon.
|
2012-04-14 21:50:36 +01:00 |
|
Tamir Atias
|
8f06f70ad3
|
[Fix] Movement is now time based.
[Fix] Stuff was stretching on window resize.
|
2012-04-14 21:51:20 +03:00 |
|
Tamir Atias
|
d7bef996e6
|
[Fix] OpenAL was not shut down.
|
2012-04-14 21:34:03 +03:00 |
|
Rtch90
|
905e040f78
|
[Fix] Forgot to decrement the same value when shift is released, making it possible to increase your speed infinately.
|
2012-04-12 22:35:43 +01:00 |
|
Rtch90
|
6dcc65e9c9
|
[Add] You can run with shift now.
|
2012-04-12 22:32:38 +01:00 |
|
Rtch90
|
2c155b7ec1
|
[Add] TeeHee. I did a level.
|
2012-04-12 22:15:32 +01:00 |
|
Tamir Atias
|
a9677e47a9
|
[Fix] Fixed memory leak in Player.
[Fix] Added Actor.h and Actor.cpp to VC++ project.
|
2012-04-12 22:24:38 +03:00 |
|
Rtch90
|
61895f84af
|
[Add] Being super lazy, but I have done something..
|
2012-04-12 19:57:39 +01:00 |
|
Tamir Atias
|
0a0dbd18c3
|
Merge branch 'master' of github.com:Allanis/LibD
|
2012-04-12 21:54:55 +03:00 |
|
Tamir Atias
|
8393d50851
|
[Fix] Now only visible region of the map is drawn.
|
2012-04-12 21:54:28 +03:00 |
|
Rtch90
|
b2731c4cf5
|
[Add] Added arrow key movement, for those less capable of using wasd.
|
2012-04-12 19:18:29 +01:00 |
|
Rtch90
|
1997e82ee1
|
[Add] Adding some more method declarations to Actor.*
|
2012-04-12 19:14:47 +01:00 |
|
Rtch90
|
de6bd2d395
|
[Add] Initial actor base class.
|
2012-04-12 18:55:13 +01:00 |
|
Tamir Atias
|
ac0b5785a3
|
[Add] Some stones to the tileset made by Moosader.
[Fix] Empty tiles causing game to crash.
|
2012-04-12 20:36:13 +03:00 |
|
Rtch90
|
84bfde227a
|
[Remove] Removed AABB's for now.
[Add] Adding some NPC class stuff. Going to work on Actors now.
|
2012-04-12 18:32:45 +01:00 |
|
Rtch90
|
d5ed83dce7
|
[Fix] Fixed an invalid type cast from DWORD to an Uint32
|
2012-04-12 18:08:39 +01:00 |
|
Tamir Atias
|
a140cccd04
|
[Add] Added AABB rendering.
|
2012-04-12 20:05:05 +03:00 |
|
Tamir Atias
|
7aa8d9adb2
|
[Add] Sound effects.
[Add] Player walking sounds.
|
2012-04-12 19:50:19 +03:00 |
|
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
|
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
|
aa0fb54cb2
|
Merge branch 'master' of https://github.com/Allanis/LibD
|
2012-04-08 03:57:20 +03:00 |
|
Tamir Atias
|
38efab7bfc
|
[Fix] Temporary fix to sprite scaling & rotation.
|
2012-04-08 03:56:35 +03:00 |
|
Rtch90
|
449da95609
|
[Fix] Debug logger was not opening file for write as it was pointing to the wrong directory.
|
2012-04-08 01:18:36 +01:00 |
|
Rtch90
|
31a9694e74
|
[Change] moved some std::cerr crap to Debug::logger->message()
|
2012-04-08 01:13:13 +01:00 |
|
Rtch90
|
35ec1ed467
|
[Fix] Need to make sure we keep the makefiles up to date for us poor unix programmers.
|
2012-04-08 01:03:52 +01:00 |
|
Rtch90
|
52b5113ba0
|
Merge branch 'master' of github.com:Allanis/LibD
Conflicts:
src/Main/Game.cpp
|
2012-04-08 00:54:19 +01:00 |
|
Rtch90
|
66acfa15ca
|
[Add] Added Debug logging.
|
2012-04-08 00:51:03 +01:00 |
|
Tamir Atias
|
9ce32da119
|
[Add] Texture class.
[Fix] Texture loading.
[Add] Sprites.
|
2012-04-08 02:34:33 +03:00 |
|
Rtch90
|
09ac982feb
|
[Add] Added a bunch of math functions for us to do clever things with.
|
2012-04-07 23:10:11 +01:00 |
|
Tamir Atias
|
242af52bb8
|
Merge branch 'master' of https://github.com/Allanis/LibD
|
2012-04-08 00:43:55 +03:00 |
|
Tamir Atias
|
afa94b4a99
|
[Add] Windows support!
|
2012-04-08 00:43:20 +03:00 |
|
Rtch90
|
e8c4dec5d2
|
[Fix] Fixed Makefiles.
[Announcement] Tamir has joined the LibD development. :D
|
2012-04-07 22:33:25 +01:00 |
|
Rtch90
|
6cdbe7b209
|
-- [Add] Added Texture management.
-- [Add] Started a player class.
|
2012-04-07 19:48:47 +01:00 |
|
Rtch90
|
48a056984d
|
[Clean] Fixed formatting for good.
|
2012-04-07 15:03:03 +01:00 |
|
Rtch90
|
8834fcc762
|
[Clean] Tab formatting cleanup.. again......
|
2012-04-07 01:23:17 +01:00 |
|