Marc Zinnschlag
|
1d34f5e096
|
Merge remote-tracking branch 'sirherrbatka/cloning'
Conflicts:
apps/opencs/model/world/refiddata.cpp
|
2014-01-28 12:40:14 +01:00 |
|
Marek Kochanowicz
|
2bd98a69ab
|
Corrections, according to the comments. Thanks for the review. :-)
|
2014-01-28 11:16:48 +01:00 |
|
Marek Kochanowicz
|
62ea0bb066
|
Cleared whitespaces.
|
2014-01-27 19:40:05 +01:00 |
|
Marek Kochanowicz
|
c82db915f1
|
Removed needless includes
|
2014-01-27 19:32:51 +01:00 |
|
Marek Kochanowicz
|
d0b07de7ef
|
Corrected bug mentioned by zini.
|
2014-01-27 16:59:18 +01:00 |
|
Marek Kochanowicz
|
9c579dbd6c
|
ok, that should be enough
|
2014-01-27 15:03:29 +01:00 |
|
Marek Kochanowicz
|
84e07c95b1
|
formatting
|
2014-01-27 15:02:29 +01:00 |
|
Marek Kochanowicz
|
51115fa5be
|
spaces around operators
|
2014-01-27 14:56:57 +01:00 |
|
Marek Kochanowicz
|
c91ae86084
|
is there something that can generate diff from two git branches? Using github for this is kinda annoying.
|
2014-01-27 14:53:39 +01:00 |
|
Marek Kochanowicz
|
52176d6435
|
reforfucking
|
2014-01-27 14:51:57 +01:00 |
|
Marek Kochanowicz
|
2b71568bb6
|
still reformating
|
2014-01-27 14:50:36 +01:00 |
|
Marek Kochanowicz
|
316debb827
|
reformating
|
2014-01-27 14:46:58 +01:00 |
|
Marek Kochanowicz
|
4d6fb31610
|
reformating
|
2014-01-27 14:45:07 +01:00 |
|
Marek Kochanowicz
|
2899f04a3f
|
reformatting
|
2014-01-27 14:43:12 +01:00 |
|
Marek Kochanowicz
|
6a0b5defd7
|
removed needless member value.
|
2014-01-27 13:42:08 +01:00 |
|
Marek Kochanowicz
|
bb62efc3d8
|
Removed pointless includes.
|
2014-01-27 13:36:01 +01:00 |
|
Marek Kochanowicz
|
aa6d1ff4c3
|
removed needless argument for cloning
|
2014-01-27 13:08:14 +01:00 |
|
Marek Kochanowicz
|
be8b978a89
|
corrected mistake in data
|
2014-01-27 12:23:03 +01:00 |
|
Marek Kochanowicz
|
62c2259c87
|
removing coordinates handling
|
2014-01-27 10:10:23 +01:00 |
|
Marek Kochanowicz
|
01be9386d6
|
Id to the coordinates with the boost and explicit specialisations of template member functions.
|
2014-01-24 11:22:20 +01:00 |
|
Marek Kochanowicz
|
1b1ecafdd8
|
introduced missing columns to data
|
2014-01-23 15:13:37 +01:00 |
|
Marek Kochanowicz
|
4d9d31b25e
|
refrences cloning does not work
|
2014-01-23 09:41:09 +01:00 |
|
Marek Kochanowicz
|
b3b51992ef
|
copying references.
|
2014-01-21 21:37:21 +01:00 |
|
Marek Kochanowicz
|
bc0130f8d8
|
do not double check if record is deleted
|
2014-01-21 10:35:08 +01:00 |
|
Marek Kochanowicz
|
9b56b6585b
|
Cloning works for referencables as well.
|
2014-01-21 09:43:02 +01:00 |
|
Marek Kochanowicz
|
d0a52b7b24
|
mostly refreshing view.
|
2014-01-20 18:28:06 +01:00 |
|
Marek Kochanowicz
|
92ee252eef
|
Small correction.
|
2014-01-20 16:39:42 +01:00 |
|
Marek Kochanowicz
|
5a52715701
|
implemented check for deletion. But it seems flawed.
|
2014-01-20 15:58:19 +01:00 |
|
Marek Kochanowicz
|
38636fab9a
|
added setId to adapter
|
2014-01-20 14:38:20 +01:00 |
|
Marek Kochanowicz
|
a45339bbe6
|
lower case in command, not in the collection
|
2014-01-20 14:14:59 +01:00 |
|
Marek Kochanowicz
|
33620a001b
|
Cloning works for single record type tables. Well, kinda.
|
2014-01-20 13:59:00 +01:00 |
|
Marek Kochanowicz
|
0ea2bb7c4c
|
Working on commands
|
2014-01-19 16:49:39 +01:00 |
|
scrawl
|
805843d7ff
|
Closes #1086: Implement blood effects
|
2014-01-17 11:27:13 +01:00 |
|
Marc Zinnschlag
|
bf1a37dc38
|
Merge remote-tracking branch 'sirherrbatka/referencables_verifer'
|
2014-01-15 14:29:54 +01:00 |
|
greye
|
15d946415e
|
minor cleanup
Removed case folding via std::transform, excessive lowerCase()
replaced with ciEqual().
|
2014-01-14 12:46:53 +04:00 |
|
scrawl
|
14b70a3ce6
|
Implement AI related magic effects (calm, frenzy, rally, demoralize, turn undead)
|
2014-01-05 01:34:35 +01:00 |
|
Marek Kochanowicz
|
aa05ffcf60
|
Splited some long argument lists to the multiple lines.
|
2014-01-04 13:05:19 +01:00 |
|
Marek Kochanowicz
|
24f090ca98
|
Finishing stuff.
|
2014-01-03 11:31:54 +01:00 |
|
Marek Kochanowicz
|
79bc149c73
|
reverting refidata.hpp
|
2013-12-30 18:47:19 +01:00 |
|
Marek Kochanowicz
|
a7de04d0a4
|
reverting refiddata.cpp
|
2013-12-30 18:46:18 +01:00 |
|
Marek Kochanowicz
|
4a1987ddec
|
correcting
|
2013-12-30 18:41:16 +01:00 |
|
Marek Kochanowicz
|
3758fe3834
|
reformatted
|
2013-12-30 13:23:16 +01:00 |
|
Marek Kochanowicz
|
03235bf0a2
|
NPC. Still WIP.
|
2013-12-27 22:13:55 +01:00 |
|
Marek Kochanowicz
|
f04a727af6
|
removed set sizes, consted sizes, added itemleveledlist check
|
2013-12-26 18:40:47 +01:00 |
|
Marek Kochanowicz
|
1da56e1790
|
checkin leveled items lists
|
2013-12-26 18:28:24 +01:00 |
|
Marek Kochanowicz
|
360a939aa0
|
Working on leveled lists now.
|
2013-12-26 15:35:58 +01:00 |
|
Marek Kochanowicz
|
6c95cea4c4
|
Added ingredient check
|
2013-12-26 15:24:52 +01:00 |
|
Marek Kochanowicz
|
c1715779fa
|
Added door check with related methods.
|
2013-12-26 12:59:43 +01:00 |
|
Marek Kochanowicz
|
32046070d5
|
Added getCreatures
|
2013-12-22 14:44:22 +01:00 |
|
Marek Kochanowicz
|
dc594da0de
|
added getContainers
|
2013-12-22 14:34:29 +01:00 |
|