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

203 Commits

Author SHA1 Message Date
Rtch90
6affe7344b [Add] Laying out a lovely foundation.. Getting dirty with some generic programming. 2012-02-03 16:19:03 +00:00
Tamir Atias
571f97e7cb Merge branch 'master' of github.com:Allanis/Unuk 2012-02-03 17:20:10 +02:00
Tamir Atias
a04ad1f985 [Add] Multiple saves. 2012-02-03 17:19:33 +02:00
Rtch90
fa83500d15 [Fix] Changed typename to class in template paremeter list. 2012-02-03 15:15:54 +00:00
Rtch90
86c102f3d2 [Add] Working some more on AStar pathfinding. This is going to get messy. 2012-02-03 15:09:28 +00:00
Rtch90
816ea51c86 [Remove] Removed instantiation of Game* game as KonoM seemd to have moved it. 2012-02-03 00:16:09 +00:00
Tamir Atias
9a23bd1547 [Add] New & Load in main menu now functioning properly. 2012-02-03 01:43:47 +02:00
Tamir Atias
db79f97f31 [Add] Player now relocating on level change. 
[Fix] Unused parameter warning.
 2012-02-03 01:11:40 +02:00
Rtch90
0e89b66788 [Add] Declaring a load of methods I think I may be needing! 
-- Let the codin' begin!
 2012-02-02 23:08:00 +00:00
Tamir Atias
f2d9434b9c [Add] Creating savegame if it doesn't exist. 2012-02-03 01:00:48 +02:00
Tamir Atias
5be88716c3 Merge branch 'master' of github.com:Allanis/Unuk 2012-02-03 00:49:18 +02:00
Tamir Atias
620c55736b [Add] Made ESC quit from main menu. 2012-02-03 00:48:56 +02:00
Rtch90
6c8ad292c9 [Add] Preparing Pathfinding for some ass whooping!! 2012-02-02 22:48:06 +00:00
Rtch90
f7bc3fbae5 [Add] Comparison method for the cost two nodes. 2012-02-02 22:37:46 +00:00
Rtch90
f2f4c43545 [Remove] Darn annoying test speach bubble!! 
-- Ima get back to work on pathfinding.
 2012-02-02 22:30:47 +00:00
Tamir Atias
7f9426acbc [Add] Player level, experience points and health are now being saved. 2012-02-03 00:03:16 +02:00
Tamir Atias
4808d8b45d [Add] NPCs now generating randomally. 
[Add] Map is regenerated after all NPCs are killed.
[Fix] Bugs regarding level up system.
[Fix] Unuk-QT.pro.user is now ignored.
 2012-02-02 23:30:40 +02:00
Rtch90
7d1a1b1295 [Change] Turned off debug text unless 'p' is pressed. 
[Remove] Gave some of KonoM's debug stuff the axe.
 2012-02-02 00:09:24 +00:00
Rtch90
f7ae1af267 [Change] Cleaned up some of KonoM's Unit tests and GUI. 2012-02-01 23:59:23 +00:00
Rtch90
76517a7a5f Merge branch 'master' of github.com:Allanis/Unuk 2012-02-01 23:46:13 +00:00
Rtch90
a3ec190f61 [Add] Getting to work on pathfinding, my last one was not complete. 
[Fix] Fixed .gitignore
 2012-02-01 23:44:04 +00:00
Tamir Atias
7c63598b1a [Change] Event History box is now more translucent. 2012-02-02 01:33:15 +02:00
Tamir Atias
3e01f285e4 Merge branch 'master' of github.com:Allanis/Unuk 
Conflicts:
	Unuk-QT/Makefile
 2012-02-02 01:13:46 +02:00
Tamir Atias
9c06cdaa34 [Add] Pimped out Event History box to Sara's request. 2012-02-02 01:12:13 +02:00
Rtch90
ef9bbd3db3 [Remove] Scrapped redundant files. Added UnukQT/Makefile to .gitignore for easier calibration. 2012-02-01 22:57:19 +00:00
Rtch90
b584069280 [Remove] Blasted out a now irrelevent comment! I am no longer drunk codin'. 2012-02-01 19:45:29 +00:00
Rtch90
444abf9f59 Merge branch 'master' of github.com:Allanis/Unuk 
Conflicts:
	Unuk-QT/Makefile
 2012-02-01 19:40:00 +00:00
Rtch90
75b71a8f8c [Add] Added MathBox and Finished Vector shit! I'm on FIRE!!!! 2012-02-01 19:38:31 +00:00
Tamir Atias
19396577f8 [Fix] Killed all warnings. Ice cold, baby. 2012-02-01 21:36:59 +02:00
Rtch90
b94cfb69fa [Fix] Saveing from a none collision area so I can bleeding move.... 2012-02-01 18:42:24 +00:00
root
5c2330c16b [Fix] Exp in the Exp Gained event was wrong. 2012-02-01 20:38:23 +02:00
Tamir Atias
ed3eabb7e7 [Add] Improvements to level generation. 2012-02-01 20:04:49 +02:00
Rtch90
50a948152d [Remove] Killed my new/delete overloads in Character.h to stop KonoM from bitching at me. 2012-02-01 17:52:26 +00:00
Rtch90
1b2ea15604 [Add] Adding dot/cross product calculations, also added some normalize methods. 2012-02-01 17:11:46 +00:00
Rtch90
c04291a3e4 [Add] Adding a bunch of overloaded operators to vector stuff. 2012-02-01 16:54:27 +00:00
Rtch90
2910f5cfd4 [Add] More vector work, added some Length and Distance methods. 2012-02-01 16:36:23 +00:00
Rtch90
61a6f2202a Merge branch 'master' of github.com:Allanis/Unuk 
Conflicts:
	Unuk-QT/Makefile
 2012-02-01 16:13:22 +00:00
Rtch90
88e4ec3c2d [Add] Adding some vector math, It is not complete yet. But just to let you know I AM working! :D 2012-02-01 16:09:05 +00:00
Tamir Atias
f573eae356 [Fix] Attacking distance check was wrong. 2012-02-01 12:54:09 +02:00
root
d6027ce0f9 [Add] Initial procedural generation stuff. 2012-02-01 04:25:32 +02:00
Tamir Atias
dfa2d88008 [Add] Levels and leveling up! 2012-02-01 02:15:54 +02:00
Tamir Atias
3dd248156b [Fix] Added EventHistory.cpp and EventHistory.h to VS project. 
-- What the hell happened to them?!
[Add] Event history box is now translucent.
 2012-01-18 13:59:28 +02:00
Tamir Atias
ae81b99958 [Add] Event history box. 2012-01-16 20:20:01 +02:00
Tamir Atias
112c1c5725 [Fix] Removed debug player health drop. 2012-01-16 18:15:11 +02:00
Tamir Atias
f1a003a04f [Fix] Health bar duration never stopped. 2012-01-16 18:10:15 +02:00
Rtch90
4e338bb799 [Fix] Clearing buffers when entering MainMenu as apposed to InGameMenu. 2012-01-16 16:05:53 +00:00
Tamir Atias
ca3eb4ece7 [Add] Health bar now shows only when character is being attacked. 2012-01-16 17:53:18 +02:00
Tamir Atias
4481a46889 [Fix] Added missing header and source file for Bar. 
[Add] Health bars for characters.
 2012-01-16 06:54:17 +02:00
Tamir Atias
c69213695a [Add] Bar class for progress bars. 2012-01-16 06:32:54 +02:00
Tamir Atias
3e6076b724 [Fix] Removed git tags <__< 2012-01-15 17:07:51 +02:00
Tamir Atias
200dcb15e9 Merge branch 'master' of https://github.com/Allanis/Unuk 
Conflicts:
	src/Unuk/Game.cpp
 2012-01-15 17:04:50 +02:00
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
Rtch90
25fb91c2ad [Fix] Replaced Map.o with LevelGen.o 2012-01-15 14:55:47 +00: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
a8df00cb17 [Fix] Renaming directory Ui to UI! 2012-01-14 03:39:10 +00:00
Rtch90
9b5f9abe9f [Fix] Makefiles now work accorfing to new architecture. 2012-01-14 02:43:05 +00: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
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
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
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