Commit Graph

79 Commits

Author SHA1 Message Date
Rtch90
ee7e8a1409 [Fix] Adding newline at the end of files. 2012-01-11 02:27:39 +00:00
Tamir Atias
640a0f23c9 Merge branch 'master' of https://github.com/Allanis/Unuk 2012-01-11 04:10:25 +02:00
Tamir Atias
b508308115 [Add] World Manager.
[Fix] Added newlines in end of files.
2012-01-11 04:07:35 +02:00
Rtch90
a9a881ea8b Merge branch 'master' of github.com:Allanis/Unuk 2012-01-11 01:49:18 +00:00
Rtch90
497c6c077c [Change] Unuk has full keyboard use now. 2012-01-11 01:47:55 +00:00
Tamir Atias
db6c8e695e [Fix] Comments in ButtonGroup.cpp gave a wrong explanation. 2012-01-11 03:32:45 +02:00
Tamir Atias
8a155673b8 [Fix] Forgot to add ButtonGroup.h and ButtonGroup.cpp. 2012-01-10 06:35:23 +02:00
Tamir Atias
3b54b1d28d [Add] Buttons groups.
[Add] Main menu arrow navigation.
2012-01-10 06:32:05 +02:00
Rtch90
57d51f6a99 [Fix] NOW it's fixed, and I fixed KonoM's initial bug. 2012-01-10 02:48:17 +00:00
Rtch90
688f4629a3 [Fix] Sorry, I ended up breaking KonoM's hard werk in my bitch fit! 2012-01-10 02:46:15 +00:00
Rtch90
19d9f2e898 [Change] Being a bitch! 2012-01-10 02:37:52 +00:00
Tamir Atias
dba8045011 [ADD] In-game menu navigation using arrow keys. 2012-01-10 04:20:52 +02:00
Rtch90
3ae7e7dc17 [Change] For now we will have a static camera and limit player boundary to screen width and height.
-- Reason 1: y coord seems to bug out if we go over y600.

-- Reason 2: We do not need any more than the screen width height for the initial portfolio project.
2012-01-08 23:38:08 +00:00
Rtch90
88b17ee73b [Change] Added arrow key support. (wasd) is not so comfortable when your fingers rest on (asdf). 2012-01-08 21:02:27 +00:00
Rtch90
63d78f6c45 [Fix] Somehow I forgot to do a fill of the rectangle in Rect::Draw(void) 2012-01-07 23:34:53 +00:00
Rtch90
943916ce8c [Fix] Makefiles now work. I am sure I did this about 3-4 commits ago.... 2012-01-07 16:46:04 +00:00
Rtch90
6e1a02f70f [Add] A* Pathfinding almost complete. 2012-01-07 01:47:07 +00:00
Rtch90
2874786ae6 [Fix] I knew Git would leave the conflict headers in there like a bitch! 2012-01-06 00:56:37 +00:00
Rtch90
9173235610 Merge branch 'playground'
Conflicts:
	src/libUnuk/Makefile
2012-01-06 00:53:27 +00:00
Rtch90
589268a94f [Add] Just the beginning of an A* implementation.
-- I have gone back to makefiles and text editors as QT bored me.
-- I know, there is nothing here.. I just want to look busy. :P
2012-01-06 00:47:12 +00:00
Rtch90
b97bbd5702 [Fix] Updated Makefile to include memory manager.
-- I will work on pathfinding now..
2012-01-05 19:17:39 +00:00
Rtch90
f3fd1861bc [Change] Overloaded new/delete operators.
-- Less travelling to kernal mode ftw.
2012-01-05 17:11:29 +00:00
Tamir Atias
72e1b90df7 [ADD] Word wrapping. 2012-01-05 17:35:08 +02:00
Tamir Atias
6fe0ea2b24 [ADD] Multi-line text rendering. 2012-01-05 07:19:29 +02:00
Rtch90
0f9c39ec1b [Add] Added Memory Manager.
-- Supports allocation of memory.
-- Memory Dealocation.
-- Arrays!
-- etc :D

'tis a bit mapped memory manager.
2012-01-03 01:43:33 +00:00
Rtch90
8db54e61bc [Add] Memory Allocation is almost ready. Avoid using this build!!! I am not finished. 2011-12-31 03:02:49 +00:00
Rtch90
23e8686dad [Add] Adding start of Memory Managment algorithm, Sorry I have been doing nothing, I am back however!!!!!! 2011-12-31 00:45:46 +00:00
Tamir Atias
277111a678 [FIX] Fixed warnings. 2011-12-30 03:16:32 +02:00
Rtch90
3ee91c42ac [Remove] Removed test health stuff to make way for real implementation. 2011-12-29 22:00:49 +00:00
Tamir Atias
5befe97969 [FIX] Map drawing based on camera offset.
[FIX] Speech bubble not following camera.
2011-12-29 22:10:31 +02:00
Rtch90
3533f5c607 [Change] SetCamera() is called once again. 2011-12-28 22:41:39 +00:00
Tamir Atias
73210e0451 [FIX] Fixed exception when quitting. 2011-12-29 00:15:51 +02:00
Rtch90
ba51d9cf5f [Shrug] Some crap KonoM did! No idea what. 2011-12-28 03:24:07 +00:00
Rtch90
c90b9fd53a [Fix] Just initializing int fps; in game.cpp upon declaration. 2011-12-28 02:53:01 +00:00
Rtch90
ab999c39c4 [Add] Unuk is live on both Linux and Windows platforms!
-- Thank KonoM for being in charge of the Windows build!
2011-12-28 02:35:18 +00:00
Rtch90
4990e2e1a5 [Add] Added basic player health system. 2011-12-28 00:56:07 +00:00
Rtch90
34d1b8f9e9 [Add] Making a start adding character health. Testing branches more than anything.. 2011-12-24 22:45:21 +00:00
Rtch90
639b59da7e Speach bubbles now work. Going to create an experimental branch. 2011-12-24 16:02:10 +00:00
Rtch90
17b03fdb16 [Change] Clamped boundaries to the window width and height. 2011-12-23 19:51:24 +00:00
Rtch90
34dacbe5cb [Add] Adding some new tiles. Need to get camera working again... 2011-12-22 02:36:20 +00:00
Rtch90
1fec16968b [FIX] It kinda helps if I lay the tiles rather than just grab the return value, right? :/ 2011-12-20 01:13:47 +00:00
Rtch90
ebb8c1e303 Nothing to say.. 2011-12-19 22:48:07 +00:00
Rtch90
3437130216 [Cleanup] Just a tad bit of cleaning, not been productive today. 2011-12-18 21:37:57 +00:00
Rtch90
854c820140 [Change] Simply changed naming convention of private members to _member; rather than m_member; 2011-12-17 23:41:22 +00:00
Rtch90
2f05f06f10 [Change] FPS is now implemented fully..
[Add] Made a start with some Dialogue box stuff.
2011-12-17 22:53:20 +00:00
Rtch90
d047eeebdd [Add] Added an FPS class. 2011-12-17 22:10:08 +00:00
Rtch90
5d4aa118a0 [Fix] Makefiles work for real this time.. 2011-12-17 20:31:51 +00:00
Rtch90
8e746c2913 [Change] Fixed Makefiles up to actually build all objects. 2011-12-17 20:04:17 +00:00
Rtch90
eb120e1252 [Fix] NPC animation sequence. 2011-12-17 17:05:01 +00:00
Rtch90
3c10632e78 Fixed Segmentation fault caused by Tile collision being out of bounds. 2011-12-17 14:05:50 +00:00