Commit Graph

186 Commits

Author SHA1 Message Date
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
4bbf0002c9 [Fix] Added some more sources to Qt project. 2012-01-30 01:06:26 +02:00
Tamir Atias
5fdc8edbac [Fix] Added missing headers and sources to QT project. 2012-01-30 01:04:47 +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
Rtch90
285479cda6 [Fix] Character sheet animation sequence has been corrected.
-- I am still working on procedural map generation, just in a seperate branch.
2012-01-16 00:46:57 +00: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