Commit Graph

267 Commits

Author SHA1 Message Date
Tamir Atias
d6e09057b5 Merge branch 'master' of https://github.com/Allanis/Unuk 2012-02-05 22:09:51 +02:00
Tamir Atias
3724a3121e [Add] Ways of death.
[Add] Generation area is now larger.
2012-02-05 22:09:07 +02:00
Rtch90
156322f4d6 Merge branch 'master' of github.com:Allanis/Unuk 2012-02-05 17:56:49 +00:00
Rtch90
b97775fd47 [Remove] Taking water out of the map XML 2012-02-05 17:56:11 +00:00
Tamir Atias
a24caab545 [Fix] EXP bar not reading EXP map correctly. 2012-02-05 19:54:28 +02:00
Tamir Atias
1c22f624e6 [Add] Amount of generated NPCs is now level dependent. 2012-02-05 19:51:26 +02:00
Tamir Atias
815e1b338d [Fix] EXP table was not read correctly. 2012-02-05 19:41:12 +02:00
Tamir Atias
fcb1d02db0 [Remove] Speech bubbles.
[Fix] NPCs now collide with the player.
2012-02-05 19:37:01 +02:00
Tamir Atias
a7367551c6 [Remove] Transitions from map file.
[Fix] Bug in which NPCs collide with themselves.
2012-02-05 18:56:29 +02:00
Tamir Atias
1924c7e01e [Fix] Qt Creator project no longer links Qt. 2012-02-05 18:40:58 +02:00
Tamir Atias
ac883d6b64 [Remove] Map transitions are they were not in use.
[Fix] Invisible collision in bottom left.
2012-02-05 18:14:11 +02:00
Tamir Atias
3e9c83428d [Fix] Collision testing is now more accurate. 2012-02-05 17:54:11 +02:00
Tamir Atias
cc258c35e0 [Fix] Supposedly fixed spawning on top of NPCs. 2012-02-05 00:30:42 +02:00
Tamir Atias
90e3ff7a22 [Fix] NPCs and Player shall no longer spawn inside entities! 2012-02-04 23:51:45 +02:00
Tamir Atias
228371376d [Fix] Weird exception bug on change level. 2012-02-04 23:12:28 +02:00
Rtch90
5e0130019d [Add] Finished off the rest of this pathfinding shiz. Enjoy KonoM!! 2012-02-04 21:05:56 +00:00
Rtch90
67ff7dc171 [Add] Nothing interesting just methods to grab specific nodes.. 2012-02-04 20:34:43 +00:00
Rtch90
c30739a610 [Add] Some more work on pathfinding.
-- Decided to stick with ANSI/ISO standards by keeping template implementation inside the header it came from as apposed to exporting it into another compilation unit. This stops gcc from bitching at me!
2012-02-04 18:27:29 +00:00
Rtch90
1dcbb82b72 [Add] SearchStep(void) method now implemented.
-- Yes, there is some code I have held back for now..
2012-02-04 15:04:22 +00:00
Rtch90
19df24c12c [Fix] Heh, this code won't do any good in the destructer..
-- Let the drunk codin' commence.
2012-02-03 21:10:14 +00:00
Rtch90
9d8493376e [Fix] FFFFUUUUUUU Templates. I WILL CONQUORR!!!!! 2012-02-03 20:57:17 +00:00
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