mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 02:49:55 +00:00
Code Issues Releases Wiki Activity
8161 commits 38 branches 54 tags 122 MiB
Commit graph

8161 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marc Zinnschlag
c995533e07 Merge branch 'dialogue' into saving 
Conflicts:
	apps/opencs/model/world/columnimp.hpp
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/data.cpp
	components/esm/loaddial.hpp
 2013-10-21 16:45:43 +02:00
Marek Kochanowicz
b23df42817 Removed old comment. Changed to set resources path correctly. 2013-10-21 16:06:16 +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
Marek Kochanowicz
b138533bf3 renamed defaultfilter.omwaddon.project to defaultfilters. 2013-10-20 17:21: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
Marek Kochanowicz
96b6787255 Getting rid of extension. Correcting tiny mistake in filters file. 2013-10-20 10:56:27 +02:00
Marek Kochanowicz
6b293961b4 This appears to work. 2013-10-20 10:02:33 +02:00
Marek Kochanowicz
155662860c Added configrue file in cmake. Hopefully it will copy defaultfilters file. 2013-10-20 09:50:16 +02:00
Marek Kochanowicz
cafea438bd Added missing light filter. 2013-10-20 09:44:10 +02:00
Marek Kochanowicz
762cbf6278 Changed gauntlets filter. It showes now both gauntlets and bracers. 2013-10-19 18:51:36 +02:00
Marek Kochanowicz
184456892b Added check to load custom filters set when present. 2013-10-19 18:43:47 +02:00
Marek Kochanowicz
4e26a61db3 Removed command line handling. Maybe zini will let me to implement it later. Implemented switch to handle resources directory. TODO: check for defaultfilters on data path. 2013-10-18 22:11:14 +02:00
Marek Kochanowicz
a7002e8a09 Implements switch (--help and --resources), and copying defaultfilters.omwaddon.project. Seems to work. 2013-10-17 18:21:41 +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
Marek Kochanowicz
3000386443 failed attempt on switch adding. 2013-10-16 13:07:26 +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
Alex "rainChu" Haddad
cfc3093320 Reverted conditional compiling 2013-10-12 10:46:44 -04:00