Rtch/Unuk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
141 Commits 1 Branch 0 Tags 15 MiB
a79a193ba2
Commit Graph

141 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tamir Atias
a79a193ba2 Merge branch 'master' of https://github.com/Allanis/Unuk 
[Fix] Renamed Map to LevelGen in visual studio.

Conflicts:
	src/Unuk/Game.cpp
 2012-01-15 17:04:03 +02:00
Tamir Atias
e565fb7007 [Add] Health bar for player. 2012-01-15 16:55:11 +02:00
Rtch90
a7e2891d89 [Add] New character sheets from Moosader - Not final. 
[Change] Re-structured Map stuff a little.
 2012-01-15 14:28:37 +00:00
Rtch90
1aa2c4246e [Add] Getting to work on procedural map generation.. 2012-01-14 13:56:50 +00:00
Tamir Atias
4ee9354769 Merge branch 'master' of https://github.com/Allanis/Unuk 2012-01-14 06:45:39 +02:00
Tamir Atias
cb3c463261 [Add] Player can now attack NPCs. 2012-01-14 06:44:23 +02:00
Rtch90
c75d6f189e [Remove] I am sure this crap was in .gitignore?!?!? 2012-01-14 03:42:54 +00:00
Rtch90
a8df00cb17 [Fix] Renaming directory Ui to UI! 2012-01-14 03:39:10 +00:00
Rtch90
1feac5012d Merge branch 'master' of github.com:Allanis/Unuk 2012-01-14 02:44:11 +00:00
Rtch90
9b5f9abe9f [Fix] Makefiles now work accorfing to new architecture. 2012-01-14 02:43:05 +00:00
Tamir Atias
f6946dc4a3 [FIX] Windows build now working. 2012-01-14 03:53:04 +02:00
Rtch90
0078e2aeaa [Fix] .gitignore decided not to add recursively add /Unuk/srs/libUnuk ... 2012-01-13 23:34:03 +00:00
Rtch90
4e94b83ac6 [Change] I had a big clean up. sorted libUnuk into sub directories. 
-- Teehee, KonoM will have a tough time with VS now. :D
 2012-01-13 23:28:22 +00:00
Rtch90
c0af7f601f [Change] Copyrighed under SaraCraft as apposed to Allanis. 2012-01-11 03:04:10 +00:00
Rtch90
5db87e7433 [Change] Moved from header guards to #pragma once to compensate for Tamirs' lack of style. Joke. :) 2012-01-11 02:43:49 +00:00
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
77d959d0ec [Fix] _ingameMenu->SetStatus(false); is now set after save/load for user feedback. 
[Add] Quickly utilised debug logger.
 2012-01-07 03:55:58 +00:00
Rtch90
9e82f7d5d2 [Fix] Implemented loading from InGameMenu. 2012-01-07 03:32:57 +00:00
Tamir Atias
be43761f0f Merge branch 'master' of https://github.com/Allanis/Unuk 2012-01-07 04:51:28 +02:00
Tamir Atias
d128c32af3 [FIX] Now using stringstream instead of itoa to stringify. 2012-01-07 04:49:10 +02:00
Rtch90
76fb4d2771 [Test] Last one, sorry for all the spam! 2012-01-07 02:22:56 +00:00
Rtch90
ede2bfc678 [Test] Commiting, Commiting, I think 10th commit test? mahbe. 2012-01-07 02:19:39 +00:00
Rtch90
85aa0a1046 [Test] I think this is nine. 2012-01-07 02:18:12 +00:00
Rtch90
cfc879a5aa [Test] I um.. Lost count, I think this is 8. 2012-01-07 02:17:27 +00:00
Rtch90
cb58d97678 [Test] SPAM SPAM SPAM 2012-01-07 02:16:34 +00:00
Rtch90
e210698a6f [Test] Seventh commit test. 2012-01-07 02:16:05 +00:00
Rtch90
482d807c34 [Test] Sixth Commit I think! 2012-01-07 02:15:12 +00:00
Rtch90
c4583d3f14 [Test] Sorry for the spam folks! 2012-01-07 02:14:30 +00:00
Rtch90
1821f8ec06 [Test] Testing Git parser at http://saracraft.net AGAIN! 2012-01-07 02:13:52 +00:00
Rtch90
6f7d8c2e47 [Test] Testing Git parser at http://saracraft.net 2012-01-07 02:12:42 +00:00
Rtch90
700edeb245 [Test] Testing Git parser at http://saracraft.net 2012-01-07 02:12:11 +00:00
Rtch90
5cd12187db [Test] Testing Git parsing.. 13 commits to do.. Eh!! 2012-01-07 02:10:58 +00:00
Rtch90
936014d8d9 Merge branch 'master' of github.com:Allanis/Unuk 2012-01-07 01:48:01 +00:00
Rtch90
6e1a02f70f [Add] A* Pathfinding almost complete. 2012-01-07 01:47:07 +00:00
Tamir Atias
cb4f7f54d1 [ADD] Saving game! 
[ADD] AStar files to VC++ project.
 2012-01-07 03:30:06 +02:00