Marek Kochanowicz
|
ea9b6fa37e
|
view button
|
2014-03-19 12:01:36 +01:00 |
|
Marek Kochanowicz
|
8f3103ce65
|
added preview button
|
2014-03-19 11:43:25 +01:00 |
|
Marek Kochanowicz
|
6416ae90d2
|
Merge branch 'preview' of https://github.com/zinnschlag/openmw into Editor-Dialog
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/view/world/subviews.cpp
|
2014-03-19 10:23:15 +01:00 |
|
Marek Kochanowicz
|
010160d047
|
missed those :/
|
2014-03-18 20:56:55 +01:00 |
|
Marek Kochanowicz
|
c0b2b783cb
|
use more proper creators
|
2014-03-18 20:53:21 +01:00 |
|
Marek Kochanowicz
|
db774b02d7
|
clone and create buttons work
|
2014-03-18 09:36:22 +01:00 |
|
Marek Kochanowicz
|
95afca0558
|
delete record button
|
2014-03-17 19:28:41 +01:00 |
|
Marek Kochanowicz
|
7296b09357
|
revert button
|
2014-03-17 19:18:18 +01:00 |
|
Marek Kochanowicz
|
09ba547630
|
use tool buttons with icons
|
2014-03-17 15:35:36 +01:00 |
|
Marc Zinnschlag
|
20ea859aac
|
adjusted the far clip distance
|
2014-03-16 17:14:44 +01:00 |
|
sirherrbatka
|
3c8eeb8c48
|
added comment
|
2014-03-16 17:11:13 +01:00 |
|
Marc Zinnschlag
|
6b11265fbc
|
consider scale and orientation when previewing reference
|
2014-03-16 17:06:45 +01:00 |
|
Marc Zinnschlag
|
48ea93d890
|
less random camera start position
|
2014-03-16 17:06:30 +01:00 |
|
sirherrbatka
|
4a0d1ba272
|
do not cast and check multiple times
|
2014-03-16 17:06:11 +01:00 |
|
Marc Zinnschlag
|
fa042a8aca
|
use proper title for reference prewview subviews (avoid internal ID)
|
2014-03-16 13:22:32 +01:00 |
|
Marc Zinnschlag
|
c36dfef972
|
prewview subview
|
2014-03-16 12:44:01 +01:00 |
|
Marek Kochanowicz
|
4a623ace71
|
disabling works
|
2014-03-13 18:41:37 +01:00 |
|
Marek Kochanowicz
|
c97172d89c
|
fixed segfault and prevent drops from other documents
|
2014-03-13 17:00:14 +01:00 |
|
Marek Kochanowicz
|
e1a4b64efb
|
fixed segfault
|
2014-03-13 16:50:04 +01:00 |
|
Marek Kochanowicz
|
dd755a00e4
|
fix for the bug (?)
|
2014-03-13 08:52:37 +01:00 |
|
Marek Kochanowicz
|
cc1ceb35ce
|
drag and drop works
|
2014-03-12 20:34:55 +01:00 |
|
Marek Kochanowicz
|
fd4829141d
|
succesfully connected the signals
|
2014-03-12 19:55:51 +01:00 |
|
Marek Kochanowicz
|
1bf67e7390
|
added the new qlineedit subclass
|
2014-03-12 19:36:46 +01:00 |
|
Marek Kochanowicz
|
30a0c82e22
|
this code segfaults, but i don't know why
|
2014-03-12 16:28:10 +01:00 |
|
Marek Kochanowicz
|
919065db32
|
fixed segfault
|
2014-03-12 16:06:59 +01:00 |
|
Marek Kochanowicz
|
d1290ac556
|
skip deleled or erased records
|
2014-03-12 15:46:27 +01:00 |
|
Marek Kochanowicz
|
2278eb5e91
|
handle locking
|
2014-03-12 15:17:49 +01:00 |
|
Marek Kochanowicz
|
1a9d4204d2
|
correction
|
2014-03-12 15:07:17 +01:00 |
|
Marek Kochanowicz
|
2e226e63b6
|
change universalid of base subview after pressing next or prev
|
2014-03-12 13:04:40 +01:00 |
|
Marek Kochanowicz
|
cb9bcc3cc1
|
buttons are functional
|
2014-03-12 12:25:37 +01:00 |
|
Marek Kochanowicz
|
299b7a6ce6
|
Added buttons, they don't do anything.
|
2014-03-12 11:08:04 +01:00 |
|
Marek Kochanowicz
|
8d50af547a
|
created editwidget
|
2014-03-12 10:39:28 +01:00 |
|
Marek Kochanowicz
|
865e6b52ae
|
scroll area
|
2014-03-11 21:21:05 +01:00 |
|
Marek Kochanowicz
|
c422dc6eed
|
Refactorisation.
|
2014-03-11 20:40:31 +01:00 |
|
Marek Kochanowicz
|
5ad572346b
|
referencables also work now
|
2014-03-11 13:02:25 +01:00 |
|
Marek Kochanowicz
|
1edf5a4414
|
registered additional subviews.
|
2014-03-11 10:47:30 +01:00 |
|
Marek Kochanowicz
|
87286232d7
|
fixed bug, god bless overloading
|
2014-03-11 09:38:53 +01:00 |
|
Marek Kochanowicz
|
a25271f0b6
|
moving bloat away from the dispatcher
|
2014-03-11 09:14:13 +01:00 |
|
Marc Zinnschlag
|
ef1364878f
|
moved test cube from SceneWidget to WorldspaceWidget
|
2014-03-10 18:35:49 +01:00 |
|
Marek Kochanowicz
|
17b521cec8
|
additional check
|
2014-03-10 17:57:40 +01:00 |
|
Marek Kochanowicz
|
f4614c2c63
|
use qlabels for not editable fields
|
2014-03-10 17:52:45 +01:00 |
|
Marek Kochanowicz
|
089732419a
|
introduce longString
|
2014-03-10 17:18:29 +01:00 |
|
Marek Kochanowicz
|
cc96a38921
|
use qlinedit for the var
|
2014-03-10 13:27:52 +01:00 |
|
Marek Kochanowicz
|
874847c959
|
handle color
|
2014-03-10 13:25:01 +01:00 |
|
Marc Zinnschlag
|
7812427836
|
added Preview submenu item; fixed View issues regarding exterior cells
|
2014-03-10 12:44:34 +01:00 |
|
Marek Kochanowicz
|
73cb3ac0ed
|
embelishing
|
2014-03-10 12:04:03 +01:00 |
|
Marek Kochanowicz
|
361bc55973
|
dont force trying display
|
2014-03-10 09:47:41 +01:00 |
|
Marek Kochanowicz
|
9ab920bd80
|
display id and other not editable data
|
2014-03-10 09:37:53 +01:00 |
|
Marek Kochanowicz
|
b2fdaa74b0
|
trying to set the size policy
|
2014-03-09 18:44:04 +01:00 |
|
Marc Zinnschlag
|
2b17f5dde9
|
register resources locations on editor startup
|
2014-03-09 12:32:21 +01:00 |
|
Marek Kochanowicz
|
7eb10756d4
|
some extra views enabled
|
2014-03-09 08:58:24 +01:00 |
|
Marek Kochanowicz
|
0447be7e7a
|
register extra views. do not display id
|
2014-03-08 17:24:00 +01:00 |
|
Marek Kochanowicz
|
1f1774b5e1
|
changing the enumdelegate seteditordata
|
2014-03-08 16:54:05 +01:00 |
|
Marek Kochanowicz
|
9612c6a6fd
|
handle also bool boxes
|
2014-03-08 16:50:42 +01:00 |
|
Marek Kochanowicz
|
08ccae6b49
|
handle comboboxes
|
2014-03-08 16:21:49 +01:00 |
|
Marek Kochanowicz
|
a8b11829d4
|
disable not editable widgets
|
2014-03-08 15:18:40 +01:00 |
|
Marek Kochanowicz
|
3c60345d6b
|
nest wrapper into the proxy class
|
2014-03-08 15:15:00 +01:00 |
|
Marek Kochanowicz
|
2e6b45dafb
|
edit view, savind works
|
2014-03-07 22:17:40 +01:00 |
|
Marek Kochanowicz
|
020e3f8fc5
|
Merge branch 'master' of https://github.com/zinnschlag/openmw into dialogoue3
|
2014-03-07 17:16:38 +01:00 |
|
Marek Kochanowicz
|
f0a45fa15f
|
just saved progress
|
2014-03-07 17:15:43 +01:00 |
|
Marek Kochanowicz
|
b0ae78e889
|
basicly enabled code
|
2014-03-06 20:10:13 +01:00 |
|
Marc Zinnschlag
|
f1353dc84f
|
Merge branch 'scene'
|
2014-03-06 16:46:44 +01:00 |
|
Marc Zinnschlag
|
516a3b9abd
|
close interior cell view when cell is deleted
|
2014-03-06 16:40:08 +01:00 |
|
Marc Zinnschlag
|
0254a209f6
|
some general cleanup
|
2014-03-06 13:51:21 +01:00 |
|
Marc Zinnschlag
|
f04348fb8e
|
do not offer view action for cells flagged as deleted
|
2014-03-06 13:43:06 +01:00 |
|
Marc Zinnschlag
|
4a119c8f46
|
ambient lighting in interior cells
|
2014-03-06 13:02:21 +01:00 |
|
Marc Zinnschlag
|
7e0f0c8402
|
fixed SceneWidget destructor
|
2014-03-06 12:42:09 +01:00 |
|
Marc Zinnschlag
|
397921e457
|
specialising WorldspaceWdiget into paged and unpaged subclasses
|
2014-03-06 10:13:39 +01:00 |
|
Marc Zinnschlag
|
7386d3eb0b
|
moved navigation into the WorldspaceWidget
|
2014-03-06 10:01:23 +01:00 |
|
scrawl
|
edb5a54092
|
Include some more required Ogre headers explicitely.
|
2014-03-05 21:46:37 +01:00 |
|
Marc Zinnschlag
|
a264e86e13
|
subclasses scene widget for worldspace scenes
|
2014-03-04 14:47:43 +01:00 |
|
Marc Zinnschlag
|
26c2f28879
|
replaced global world->scene menu item with individual view context menu items in cell and reference tables
|
2014-03-02 22:43:44 +01:00 |
|
Marc Zinnschlag
|
55195f819a
|
changed edit requests from row index format to UniversalId/hint format
|
2014-03-02 22:34:41 +01:00 |
|
Marc Zinnschlag
|
797f5527ee
|
added hint parameter for UniversalId viewing requests
|
2014-03-02 13:29:02 +01:00 |
|
Marc Zinnschlag
|
cb3994281c
|
changed UniversalId::Type_Scene from index to string ID argument (argument is the worldspace)
|
2014-03-02 13:11:15 +01:00 |
|
Marc Zinnschlag
|
536a0e0ab0
|
added orbit navigation mode
|
2014-03-01 14:15:04 +01:00 |
|
Marc Zinnschlag
|
4d3abeedcb
|
keep camera upright in 1st person mode
|
2014-02-28 13:37:01 +01:00 |
|
Marc Zinnschlag
|
ae637d6abc
|
rolling
|
2014-02-28 11:58:03 +01:00 |
|
Marc Zinnschlag
|
4eea2c7a86
|
added free navigation mode
|
2014-02-27 15:42:59 +01:00 |
|
Marc Zinnschlag
|
c977b2a756
|
moved implementation of the 1st person camera into a separate file
|
2014-02-27 15:23:14 +01:00 |
|
Marc Zinnschlag
|
14c3bfcf62
|
added navigation class
|
2014-02-27 14:46:06 +01:00 |
|
Marc Zinnschlag
|
8f73cc9268
|
added navigation mode selection
|
2014-02-25 14:59:46 +01:00 |
|
Marc Zinnschlag
|
526d75df51
|
inverted ctrl key
|
2014-02-25 14:30:38 +01:00 |
|
Marc Zinnschlag
|
644f5cb8de
|
fixed mouse button release detection
|
2014-02-25 14:28:55 +01:00 |
|
Marc Zinnschlag
|
e33bd4d508
|
camera rotation via ctrl-left button drag
|
2014-02-25 14:24:35 +01:00 |
|
Marc Zinnschlag
|
e987199949
|
getting rid of some magic numbers
|
2014-02-25 14:14:53 +01:00 |
|
Marc Zinnschlag
|
07d20a2013
|
camera panning via left button drag
|
2014-02-25 14:09:07 +01:00 |
|
Marc Zinnschlag
|
b9107addc0
|
mouse wheel zooming
|
2014-02-25 13:39:49 +01:00 |
|
Marc Zinnschlag
|
b6ae521aa5
|
moving the camera with A and D keys
|
2014-02-25 13:31:15 +01:00 |
|
Marc Zinnschlag
|
af50575259
|
use shift key to speed up camera movement
|
2014-02-25 13:17:15 +01:00 |
|
Marc Zinnschlag
|
8081c067a6
|
moving the camera with W and S keys
|
2014-02-25 13:09:37 +01:00 |
|
Marc Zinnschlag
|
4ec4599be3
|
added navigation mode enum to SceneWidget
|
2014-02-25 12:30:45 +01:00 |
|
Marc Zinnschlag
|
6ec86564d1
|
re-enabled OGRE in OpenCS; cleaned up startup
|
2014-02-25 11:58:32 +01:00 |
|
Nikolay Kasyanov
|
59508e914f
|
Fixed OpenCS build on OS X
|
2014-02-22 01:17:58 +04:00 |
|
Marek Kochanowicz
|
e348c6baa9
|
accept drops from filters table. Cool. ☺
|
2014-02-21 13:50:59 +01:00 |
|
Marek Kochanowicz
|
e2dce53543
|
additional check on droping to prevent exception
|
2014-02-21 12:55:01 +01:00 |
|
Marek Kochanowicz
|
fcf17805a0
|
Installing basic event filter
|
2014-02-21 12:48:39 +01:00 |
|
Marek Kochanowicz
|
55e9083570
|
refactorisation
|
2014-02-21 10:27:23 +01:00 |
|
Marek Kochanowicz
|
1c35a85adf
|
fixed bugs, added extra display_type
|
2014-02-20 19:27:51 +01:00 |
|
Marek Kochanowicz
|
7dff34ebf1
|
Features implemented. Time to debug.
|
2014-02-20 19:15:09 +01:00 |
|
Marek Kochanowicz
|
3ad6df1f92
|
try with the passing action
|
2014-02-20 17:54:18 +01:00 |
|
Marek Kochanowicz
|
38a86b5015
|
We can handle droping multiple records
|
2014-02-20 16:01:54 +01:00 |
|
Marek Kochanowicz
|
b788ab8b4c
|
correcting
|
2014-02-20 14:10:03 +01:00 |
|
Marek Kochanowicz
|
4fe21dc38f
|
Const correctness
|
2014-02-20 12:43:09 +01:00 |
|
Marek Kochanowicz
|
eb3cbaa4e1
|
Create filter on droping record.
|
2014-02-20 12:25:47 +01:00 |
|
Marek Kochanowicz
|
c7b3e139aa
|
Propagate signal to the edit widget
|
2014-02-20 11:07:04 +01:00 |
|
Marek Kochanowicz
|
fca7701359
|
Column titles retrived and passed to the filterbox.
|
2014-02-19 16:15:51 +01:00 |
|
Marek Kochanowicz
|
d7a1abb30b
|
emit signal with types (will be connected to the tablesubview)
|
2014-02-19 12:55:39 +01:00 |
|
Marek Kochanowicz
|
dd95ed8e4c
|
Accept drops on the filterbox
|
2014-02-19 12:32:48 +01:00 |
|
Marek Kochanowicz
|
569533eeae
|
Merge branch 'master' of https://github.com/zinnschlag/openmw into DragDrop
|
2014-02-19 11:23:53 +01:00 |
|
Marek Kochanowicz
|
e9664d80bd
|
make convert enumns public static
|
2014-02-19 11:22:47 +01:00 |
|
Marc Zinnschlag
|
02c6c65705
|
Merge remote-tracking branch 'sirherrbatka/DragDrop'
|
2014-02-17 09:55:50 +01:00 |
|
Marek Kochanowicz
|
2bb9e47507
|
Improvements.
|
2014-02-17 08:58:55 +01:00 |
|
Marek Kochanowicz
|
e1a0f60041
|
allow _foo ids without qoute
|
2014-02-16 20:26:22 +01:00 |
|
Marek Kochanowicz
|
b83817e05e
|
May only include alphanumeric characters and underscores and may not start with a number.
|
2014-02-16 20:18:28 +01:00 |
|
Marek Kochanowicz
|
3cc23a9cb3
|
very basic, but safe putting down " "
|
2014-02-16 18:41:42 +01:00 |
|
Nikolay Kasyanov
|
4e28fd85a3
|
Fixed build on OS X
|
2014-02-16 20:22:46 +04:00 |
|
Marc Zinnschlag
|
6ac64bbe15
|
Merge branch 'script'
Conflicts:
readme.txt
|
2014-02-16 12:12:56 +01:00 |
|
Marek Kochanowicz
|
17af865a9f
|
checking for the source of the drop, reject those from other files for now
|
2014-02-16 09:51:33 +01:00 |
|
Marek Kochanowicz
|
cbe1fe2f95
|
removed misplaced bracket
|
2014-02-15 22:38:59 +01:00 |
|
Marek Kochanowicz
|
45d9364195
|
Put the id in the quote.
|
2014-02-15 22:14:27 +01:00 |
|
Marek Kochanowicz
|
ec8c8a9d88
|
-journalinfo +topic
|
2014-02-15 22:05:42 +01:00 |
|
Marek Kochanowicz
|
41606a67e4
|
implemented whitelist of allowed types in the scripts
|
2014-02-15 20:49:09 +01:00 |
|
Marek Kochanowicz
|
930b77e60a
|
allow drag and drop into the script edit window.
|
2014-02-15 19:52:40 +01:00 |
|
Marek Kochanowicz
|
97fe5465bf
|
created new files
|
2014-02-15 17:55:18 +01:00 |
|
Marc Zinnschlag
|
0afa61eed5
|
fixed referenceable-loading in case of more than one content file
|
2014-02-15 15:50:17 +01:00 |
|
Marc Zinnschlag
|
2007a3e902
|
improved script check error messages
|
2014-02-15 13:25:38 +01:00 |
|
Marek Kochanowicz
|
56be62b956
|
small reformatting
|
2014-02-15 13:23:51 +01:00 |
|
Marek Kochanowicz
|
4ee90c24e5
|
more readable code.
|
2014-02-15 13:22:14 +01:00 |
|
Marc Zinnschlag
|
4e04131957
|
fixing case broke sorting in script context
|
2014-02-15 13:09:43 +01:00 |
|
Marc Zinnschlag
|
2130ec39d6
|
disable warnings by default in script verifier
|
2014-02-15 12:58:34 +01:00 |
|
Marek Kochanowicz
|
b1f63947e8
|
Checking if the drop comes from same document.
|
2014-02-15 12:40:07 +01:00 |
|
Marek Kochanowicz
|
d6820b977e
|
store const ref to the document in the table.
|
2014-02-15 12:22:32 +01:00 |
|
Marek Kochanowicz
|
f3dc45f1ec
|
long line split.
|
2014-02-14 15:29:10 +01:00 |
|
Marek Kochanowicz
|
37d262b147
|
Splited very long line.
|
2014-02-14 15:12:34 +01:00 |
|
Marc Zinnschlag
|
7b8802588e
|
Merge remote-tracking branch 'sirherrbatka/DragDrop'
|
2014-02-14 14:28:30 +01:00 |
|
Marek Kochanowicz
|
aafde926d3
|
Documentation, corrections.
|
2014-02-14 14:04:36 +01:00 |
|
Marc Zinnschlag
|
e17af4231a
|
added script verifier
|
2014-02-14 13:38:30 +01:00 |
|
Marc Zinnschlag
|
0ff744c2ff
|
fixed CSMWorld::ScriptContext::isJournalId
|
2014-02-14 12:56:05 +01:00 |
|
Marek Kochanowicz
|
ae418f2538
|
nicer formatting
|
2014-02-14 12:51:50 +01:00 |
|
Marc Zinnschlag
|
0a8ffbfb1d
|
added missing implementation for CSMWorld::ScriptContext::getMemberType
|
2014-02-14 12:46:54 +01:00 |
|
Marc Zinnschlag
|
910d62e4b8
|
added missing implementation for CSMWorld::ScriptContext::getGlobalType
|
2014-02-14 11:59:33 +01:00 |
|
Marc Zinnschlag
|
053b3dc371
|
Merge branch 'openmw-28'
Conflicts:
CMakeLists.txt
|
2014-02-13 20:57:28 +01:00 |
|
Marek Kochanowicz
|
40cc108e54
|
drag and drop works.
|
2014-02-13 20:19:51 +01:00 |
|
Marek Kochanowicz
|
1bcc6d6918
|
using new icon.
|
2014-02-13 19:14:17 +01:00 |
|
Marek Kochanowicz
|
2afe3f3e57
|
Introduced multitype icon.
|
2014-02-13 19:00:35 +01:00 |
|
Marek Kochanowicz
|
6662560cbc
|
new displays for referencable table columns
|
2014-02-13 15:43:19 +01:00 |
|
Marc Zinnschlag
|
d6e212a02b
|
Merge branch 'master' into script
|
2014-02-13 15:02:02 +01:00 |
|
Marc Zinnschlag
|
e9238b456d
|
use case-insensitive sorting in columns
|
2014-02-13 15:01:10 +01:00 |
|
Marek Kochanowicz
|
09d3c7a446
|
Attempt to match types. Does not work at the moment.
|
2014-02-13 13:54:09 +01:00 |
|
Marek Kochanowicz
|
71b2fc1c70
|
Introduced method to access display type.
|
2014-02-13 10:55:31 +01:00 |
|
Marek Kochanowicz
|
5f3f867a10
|
Implemented convertEnums function
|
2014-02-13 10:21:49 +01:00 |
|
Marek Kochanowicz
|
c142089bfe
|
Merge branch 'master' of https://github.com/zinnschlag/openmw into DragDrop
|
2014-02-12 13:13:32 +01:00 |
|
Marek Kochanowicz
|
c00834a8de
|
added some iostream garbage.
|
2014-02-12 13:12:58 +01:00 |
|
Marek Kochanowicz
|
8dfdd87a07
|
Merge branch 'DnD' of https://github.com/gugus/openmw into DragDrop
Conflicts:
apps/opencs/view/world/table.cpp
|
2014-02-12 12:12:53 +01:00 |
|
Marek Kochanowicz
|
62c9c77ddf
|
Compiles now.
|
2014-02-12 11:42:19 +01:00 |
|
gus
|
6cf561f713
|
get index to where we are dropping
|
2014-02-12 11:32:01 +01:00 |
|
gus
|
2e33ab3a13
|
droping somewhat works
|
2014-02-12 11:16:12 +01:00 |
|
Marek Kochanowicz
|
e1a39b8388
|
Replaced some display_string with specific type. Damn, i wish this is correct ;-)
|
2014-02-12 09:24:08 +01:00 |
|
Marek Kochanowicz
|
fc135fbfee
|
Added new Display types
|
2014-02-12 09:04:52 +01:00 |
|
Marek Kochanowicz
|
53e2e8415d
|
replaced start with exec
|
2014-02-11 12:25:21 +01:00 |
|
gus
|
df46218acc
|
try droping
|
2014-02-10 16:48:04 +01:00 |
|
Marc Zinnschlag
|
3b990795c4
|
added access to remote access of local variables of global scripts
|
2014-02-10 14:45:55 +01:00 |
|
gus
|
b5006c5dbd
|
compile fix
|
2014-02-09 15:33:00 +01:00 |
|
Marek Kochanowicz
|
3b8f04c0f3
|
Allow multi-item drag.
|
2014-02-05 11:44:08 +01:00 |
|
Marek Kochanowicz
|
f01b02c42d
|
Changed format.
|
2014-02-05 11:24:33 +01:00 |
|
Marek Kochanowicz
|
76b729ac9b
|
Removed getUniversalid interface.
|
2014-02-05 11:19:55 +01:00 |
|
Marek Kochanowicz
|
04287cb87a
|
Provide method to return whole data vector from tablemimedata.
|
2014-02-04 19:42:52 +01:00 |
|
Marek Kochanowicz
|
8b799683c1
|
Display QPixMap with dragged object.
|
2014-02-04 18:48:18 +01:00 |
|
Marek Kochanowicz
|
3439940a8e
|
Tablemimedata able to handle vector of objects and return icon.
|
2014-02-04 18:38:31 +01:00 |
|
Marek Kochanowicz
|
423b2906be
|
Yes, you can drag. But not drop.
|
2014-02-04 11:40:48 +01:00 |
|
Marek Kochanowicz
|
dc80bfff55
|
Attempt to get basic tablemimedata subclass.
|
2014-02-04 09:13:40 +01:00 |
|
Marc Zinnschlag
|
914ab1b8ab
|
allow 'x' instead of 'getjournalindex x'
|
2014-02-02 15:08:27 +01:00 |
|
Marek Kochanowicz
|
a36cc26434
|
Created new files for TableMimeData class.
|
2014-02-01 19:06:41 +01:00 |
|
Marc Zinnschlag
|
1b5301eec0
|
Merge branch 'savedgame'
Conflicts:
apps/openmw/mwbase/mechanicsmanager.hpp
apps/openmw/mwbase/soundmanager.hpp
apps/openmw/mwgui/mapwindow.hpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
apps/openmw/mwsound/soundmanagerimp.hpp
components/esm/loadcell.cpp
|
2014-02-01 18:16:32 +01:00 |
|
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
|
d3000ce099
|
whitespaces removed again.
|
2014-01-27 19:47:54 +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
|
ed0ba906cf
|
removed needless include
|
2014-01-27 15:05:29 +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
|
71d6364754
|
Chaninging variables name to follow our policy.
|
2014-01-27 13:13:39 +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
|
032c542396
|
improving the cell cloning.
|
2014-01-24 20:34:33 +01:00 |
|
scrawl
|
03cf383be7
|
Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame
Conflicts:
apps/openmw/mwgui/referenceinterface.cpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
apps/openmw/mwscript/cellextensions.cpp
apps/openmw/mwworld/cells.cpp
apps/openmw/mwworld/cells.hpp
apps/openmw/mwworld/cellstore.cpp
apps/openmw/mwworld/store.cpp
apps/openmw/mwworld/worldimp.cpp
|
2014-01-24 18:28:35 +01:00 |
|
scrawl
|
786ed6ca5b
|
Include some required Ogre headers explicitely
|
2014-01-24 15:02:34 +01:00 |
|