Marc Zinnschlag
15b7d3263c
subclass ESM::DialInfo to keep track of parent topic
2013-11-01 17:43:45 +01:00
Marc Zinnschlag
ea0e8be0d3
disallow sorting (via column headers) in info tables
2013-10-31 13:40:14 +01:00
Marc Zinnschlag
90aa8f9db6
fixed dialogue record loading with multiple content files
2013-10-31 13:11:15 +01:00
Marc Zinnschlag
767cb54e7c
added missing columns to journal info table
2013-10-31 12:54:55 +01:00
Marc Zinnschlag
69f28ee4be
split info records between journal and topic info tables
2013-10-31 12:16:45 +01:00
Marc Zinnschlag
ba88c94d58
first attempt at an info record collection
2013-10-29 13:18:22 +01:00
Marc Zinnschlag
45f5a66bcc
use result of getAppendIndex instead of always appending at the end
2013-10-29 09:27:23 +01:00
Marc Zinnschlag
9a80e11182
reimplemented add and appendBlankRecord via insertRecord
2013-10-27 14:13:10 +01:00
Marc Zinnschlag
525d6fadec
added Collection insert function for arbitrary position and reimplemented appendRecord in via this function
2013-10-27 14:00:25 +01:00
Marc Zinnschlag
67bc0a0c70
additional modification to the IDValidator (restricting relaxed mode slightly more)
2013-10-22 11:32:10 +02:00
Marc Zinnschlag
dc473221e7
added ID-argument to CollectionBase::getAppendIndex (required for info record collection)
2013-10-22 11:21:12 +02:00
Marc Zinnschlag
aa61948801
relaxed rules for new IDs when ID is also a user visible text
2013-10-22 11:08:37 +02:00
Marc Zinnschlag
88e09159c4
splitting off characters menu from mechanics menu (was getting too big)
2013-10-21 18:04:40 +02:00
Marc Zinnschlag
3b85d97087
handle deleted dialogue records
2013-10-21 15:38:13 +02:00
Marc Zinnschlag
dc12648a3e
add fixed dialogue records when creating a new omwgame file
2013-10-21 14:26:54 +02:00
Marc Zinnschlag
c0e5501431
disallow the deletion of non-topic, non-journal dialogue records
2013-10-21 13:58:47 +02:00
Marc Zinnschlag
0be157efea
set dialogue type for newly created dialogue records
2013-10-21 13:39:13 +02:00
Marc Zinnschlag
75c5316ad7
added dialogue type column to topics table
2013-10-20 17:26:09 +02:00
Marc Zinnschlag
adf3a41a83
added topic and journal tables
2013-10-20 17:15:32 +02:00
Marc Zinnschlag
ebf7732912
some cleanup
2013-10-20 15:48:39 +02:00
scrawl
3a3f2a37c8
Add cut, copy & paste of text
2013-10-17 12:47:49 +02:00
Marc Zinnschlag
74f7071b82
Merge remote-tracking branch 'jeaye/gitignore'
2013-10-17 10:25:41 +02:00
jeaye
04735a6734
Extend .gitignore
...
Organize .gitignore to make it easier to add to
Ignore only binaries, not directories
Removed some invalid ignores (.cfg, .desktop, etc)
Better globbing
2013-10-16 14:44:18 -07:00
Marc Zinnschlag
8c139783b7
silenced a warning
2013-10-16 21:33:11 +02:00
Marc Zinnschlag
19bd0f90b9
Merge remote-tracking branch 'rainChu/torches'
2013-10-16 21:24:45 +02:00
Alex "rainChu" Haddad
65818155d8
Fixed punctuation consistency
2013-10-16 15:14:35 -04:00
Alex "rainChu" Haddad
e11da5c0a3
Added a constructor to Light CustomData
2013-10-16 15:13:36 -04:00
Marc Zinnschlag
8995cd8543
reverted gitignore changes
2013-10-16 20:35:39 +02:00
jeaye
5f4e2d2cf2
Organize .gitignore to make it easier to add to
2013-10-15 22:29:51 -07:00
jeaye
8d8ba0257e
Added common untracked files to .gitignore
2013-10-15 22:17:50 -07:00
Alex "rainChu" Haddad
2643214ca6
Lights extinguish underwater
2013-10-15 21:50:32 -04:00
Alex "rainChu" Haddad
30ee3c5cf6
Equipped torches and lights run out of fuel
2013-10-15 21:50:14 -04:00
Emanuel Guevel
ba4b8a37e2
Remember pressed message box button longer
...
Remember which button was pressed until a new interactive message box is
displayed or until the pressed button number is read.
Before that, it was not possible to get the pressed button after the
message box was hidden/destroyed.
2013-10-14 12:55:06 +02:00
Marc Zinnschlag
db7ea30483
allow float values in cell for value tests
2013-10-14 11:15:36 +02:00
Marc Zinnschlag
679754b305
corrected an error message
2013-10-14 11:06:59 +02:00
Marc Zinnschlag
9b0766b678
minor fix in ValueNode::toString
2013-10-14 10:58:11 +02:00
Marc Zinnschlag
4905f1c8ab
make testing empty cells against an empty string yield true
2013-10-13 21:54:36 +02:00
Marc Zinnschlag
ce8694c84e
Merge remote-tracking branch 'scrawl/master'
2013-10-13 18:55:49 +02:00
scrawl
683ad40e21
No need for this ifdef since there is a default argument.
2013-10-13 18:28:22 +02:00
scrawl
2fb059e2fa
Don't destroy the SDL window twice
2013-10-13 18:20:55 +02:00
scrawl
fa264935ff
We can apply vsync at runtime now that the Ogre bug is fixed.
2013-10-13 17:56:26 +02:00
scrawl
f504ab42fe
Turn off vsync while in the loading screen
2013-10-13 17:52:14 +02:00
Marc Zinnschlag
b8ae195a46
Merge branch 'scene'
2013-10-13 15:42:27 +02:00
Marc Zinnschlag
4624bed899
changed handling of scene toolbar button icons
2013-10-13 15:41:48 +02:00
Marc Zinnschlag
c8d0fb8c4e
updated credits file
2013-10-13 14:43:59 +02:00
Marc Zinnschlag
fc5afe430b
Merge remote-tracking branch 'potatoesmaster/fatigue-restoration'
2013-10-13 14:40:48 +02:00
Emanuel Guevel
dcfff79460
Regenerate fatigue over time
2013-10-13 00:40:27 +02:00
Marc Zinnschlag
708cde2688
Merge remote-tracking branch 'jordan-ayers/topic/COC-Exterior-Cell-Selection'
2013-10-12 23:18:19 +02:00
Jordan Ayers
141382b8c0
COC Command: Exterior cell selection fix.
...
Return the northernmost cell of the easternmost matching column for Ext. cells.
2013-10-12 14:48:37 -05:00
Marc Zinnschlag
608d154ad7
Merge remote-tracking branch 'rainChu/master'
2013-10-12 20:31:33 +02:00