Jordan Milne
b6ec64485c
fix includes for Windows
2013-01-12 17:52:26 -04:00
Jordan Milne
eb08f407d3
Oops, remove resource leak in the input wrapper.
2013-01-12 15:38:22 -04:00
Jordan Milne
5a6589af01
extract cursor management to a separate class, have windowmanager communicate with it. Initialize SDL during engine start
2013-01-12 11:57:29 -04:00
scrawl
d71b583855
fix const cast, fix comment
2013-01-11 22:25:34 +01:00
Jordan Milne
651a654985
clean up our cursors during destruction
2013-01-11 10:09:26 -04:00
Jordan Milne
eeacb04fe2
Fully working hardware cursors (if you compile SDL2 with XCursor support)
2013-01-11 09:32:29 -04:00
Jordan Milne
f9b064d1bc
add preliminary hardware cursor support into sdl4ogre and windowmanagerimp, handle alt-tabbing away from fullscreen gracefully
2013-01-11 08:27:59 -04:00
Jordan Milne
1117105039
fix compile error with boost includes
2013-01-11 00:37:04 -04:00
Jordan Milne
a030c03513
support the printscreen button properly
2013-01-10 23:53:19 -04:00
Jordan Milne
403b6756f5
remove dependency on boost::locale, use system mouse position in in-game menus
2013-01-10 23:29:51 -04:00
Jordan Milne
601d79ef3f
fix the mouse wheel in mygui
2013-01-10 17:59:49 -04:00
Jordan Milne
ed644259ce
Move SDL helpers to their own package in extern/, allow conversion from sdl to ois keycodes, (maybe) fix unicode handling
2013-01-10 17:21:47 -04:00
Jordan Milne
02ccb75894
Wrap the mouse to the window (except in debug mode)
...
Grab the mouse when not in the main menu (except in debug mode)
Always hide the cursor when it's over the window
Allow warping the mouse around
Handle ^C properly
2013-01-09 06:10:05 -04:00
Jordan Milne
f85679db93
Merge branch 'master' into sdl_input
2013-01-09 00:04:55 -04:00
Jordan Milne
00a2a5c358
remove some more of my mess
2013-01-08 21:04:36 -04:00
Jordan Milne
3b1d285cf3
fix compile errors, work with unmodified SDL
2013-01-08 21:01:58 -04:00
scrawl
e18cf452d4
Updated shiny again. Some recent changes were accidently overwritten by eduard on 12/30/2012
2013-01-08 13:24:40 +01:00
Jordan Milne
884d3ea4d8
Rip out OIS, fill the holes with SDL goodness. WIP.
2013-01-08 06:19:05 -04:00
eduard
c85400b809
Merge https://github.com/zinnschlag/openmw into comparestring
...
Conflicts:
apps/openmw/mwdialogue/dialoguemanagerimp.cpp
apps/openmw/mwworld/worldimp.cpp
components/esm_store/reclists.hpp
components/misc/stringops.hpp
2012-12-30 13:09:37 +01:00
scrawl
693eeabeca
shiny: fix GLSL texture units when shaders were disabled
2012-11-19 13:55:26 +01:00
scrawl
7b35b82833
adding shiny
2012-11-06 19:09:44 +01:00
scrawl
fb3ac6ad4a
no submodule
2012-11-06 19:08:15 +01:00
scrawl
94f2937c8f
missed a warning
2012-10-09 19:28:10 +02:00
scrawl
d97184cd4d
fixing some warnings
2012-10-09 17:48:44 +02:00
scrawl
1f087645a7
update shiny to auto-delete the corresponding cache if a shader was edited
2012-10-01 17:02:14 +02:00
scrawl
6ac2a12296
item selection working on the preview
2012-09-14 14:34:18 +02:00
scrawl
b516813b28
fix a problem with older boost versions
2012-09-09 15:08:11 +02:00
Marc Zinnschlag
21a8dc5ae7
silenced a completely pointless warning
2012-09-06 11:43:04 +02:00
scrawl
c27ff546e4
shader cache
2012-09-02 19:40:26 +02:00
Michael Mc Donnell
d7572d815e
Do not define OIS_DYNAMIC_LIB in ICSPrerequisites.h
...
Fixes http://bugs.openmw.org/issues/381
2012-08-28 15:32:12 -04:00
scrawl
86d6f190bf
Input system rewrite
2012-08-12 20:45:02 +02:00
scrawl
6077965d27
fix the directx startup issue on windows
2012-07-26 23:09:46 +02:00
scrawl
d5384403f3
forgot something else
2012-07-23 15:46:18 +02:00
scrawl
5572421576
submodule update for "fix a typo"
2012-07-23 15:40:10 +02:00
scrawl
ac5bd38df9
some cmake fixes
2012-07-23 14:59:57 +02:00
scrawl
268987835d
fix the crash
2012-07-23 12:19:53 +02:00
scrawl
f0b3142966
switch to glsl 1.2
2012-07-23 02:54:50 +02:00
scrawl
b2dcf5adcd
support system install for boost wave
2012-07-22 14:41:23 +02:00
scrawl
6bfcf2bc1b
- exchanged the preprocessor again, no warnings now
...
- disable line directives for now, causing some trouble
2012-07-22 02:45:39 +02:00
scrawl
21728020f6
fixed the water on local map
2012-07-20 14:45:42 +02:00
scrawl
9d7470e14c
temp commit
2012-07-19 20:18:34 +02:00
scrawl
739455e6f8
new water WIP, caustics, chromatic abberation, accurate fresnel, underwater reflection, etc
2012-07-19 16:23:30 +02:00
scrawl
778e59ee37
terrain as it was before, with about 4x less code
2012-07-15 08:21:43 +02:00
scrawl
93c641efa7
terrain albedo
2012-07-14 18:25:43 +02:00
scrawl
16c2ea3a75
terrain colourmap
2012-07-14 11:13:38 +02:00
scrawl
7731e9a6fa
finished cleaning up sky
2012-07-13 09:13:12 +02:00
scrawl
b8384162b6
merge
2012-07-13 06:16:55 +02:00
scrawl
ad7383be43
sky
2012-07-11 09:08:55 +02:00
scrawl
b2313be6d7
submodule update
2012-07-11 04:31:33 +02:00
scrawl
865bfc6f47
sync mrt_output setting
2012-07-11 02:31:03 +02:00
scrawl
1a9f59d5d4
shadows
2012-07-10 00:07:33 +02:00
scrawl
07fd9986ef
accidently removed the map.
2012-07-09 20:14:07 +02:00
scrawl
b803d0e949
converted shadow caster shader
2012-07-09 19:46:36 +02:00
scrawl
81d30ff63a
temp commit
2012-07-09 19:20:41 +02:00
scrawl
e517e75d09
update
2012-07-07 01:25:14 +02:00
scrawl
a095572205
fixed some textures, started with sky
2012-07-06 10:31:48 +02:00
scrawl
71c865e2e9
let there be light
2012-07-06 07:10:10 +02:00
scrawl
33c48b9481
update
2012-07-06 04:28:08 +02:00
scrawl
9bd888d9a1
transparency
2012-07-05 00:39:25 +02:00
scrawl
19ecc7f890
fix performance
2012-07-04 17:28:22 +02:00
scrawl
f8e3213996
fog, mrt depth
2012-07-04 16:57:14 +02:00
scrawl
a1e48b0feb
builds now
2012-07-03 22:48:16 +02:00
scrawl
24399a45c1
add submodule with current code
2012-07-03 22:27:22 +02:00
scrawl
250fcab7c2
moved the mygui resources to a more suitable location
2012-03-22 17:11:24 +01:00
scrawl
6827aac42c
fix all mygui.log warnings, fix journal
2012-03-22 17:02:02 +01:00
scrawl
75d5714fe0
TextEdit, TextBoxEdit, DispEdit fix more consistent
2012-03-22 16:45:27 +01:00
scrawl
d67ee8b511
console fix more consitent
2012-03-22 16:18:49 +01:00
scrawl
6b4a35667c
fix window titles
2012-03-22 16:13:36 +01:00
scrawl
755e05e742
fixed ListBox selected item colour
2012-03-22 16:04:11 +01:00
scrawl
d1508f5a59
List -> ListBox
2012-03-22 15:28:06 +01:00
scrawl
560e702973
fixed scroll bars
2012-03-22 15:23:23 +01:00
scrawl
26aae9d2ce
fix class name typo
2012-03-22 15:10:29 +01:00
scrawl
161d519206
fixed the dialogue history topic selection
2012-03-22 15:01:37 +01:00
scrawl
3b76f6dcf4
fixed console log
2012-03-22 13:44:39 +01:00
scrawl
43349eb539
fixed console command line
2012-03-22 13:34:02 +01:00
scrawl
ceea51fe9f
fixed TextEdit, TextBoxEdit, DispositionEdit
2012-03-22 13:29:54 +01:00
scrawl
9933de7c6a
Edit -> EditBox
2012-03-22 12:21:03 +01:00
scrawl
0af8591c03
Window_MinMax
2012-03-21 21:49:37 +01:00
scrawl
433a318abb
colour -> textcolour
2012-03-21 19:31:56 +01:00
scrawl
37290d9638
fix text colours
2012-03-21 19:23:32 +01:00
scrawl
98f3192448
forgot to git add some stuff
2012-03-21 18:38:08 +01:00
scrawl
9b31b6272f
fixed the mouse cursors and fixed MWAttribute & MWSkill
2012-03-21 16:07:56 +01:00
scrawl
2f662a226c
replaced all the StaticText in layouts
2012-03-21 14:56:12 +01:00
scrawl
64212c0ee6
replaced all the StaticImage and StaticText in code
2012-03-21 14:54:02 +01:00
scrawl
99461765da
restored another bunch of stuff
2012-03-21 14:00:24 +01:00
scrawl
0d56a55756
restored journal window background
2012-03-21 13:57:26 +01:00
scrawl
66baf9ec81
Merge branch 'master' into mygui
2012-03-20 20:02:30 +01:00
scrawl
3a00fbb950
removed mygui from source tree and use system install instead
2012-03-18 15:11:37 +01:00
Marc Zinnschlag
4bdfbb6d4f
Merge branch 'master' into dialogue
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
2012-03-05 11:34:06 +01:00
scrawl
694a537b57
- removed caelum sources, resources, build scripts
2012-02-21 00:14:20 +01:00
Marc Zinnschlag
d9945a976d
Merge remote branch 'gus/DialogueSystem' into dialogue
2012-02-12 13:47:04 +01:00
gugus
abe38e5f87
Started to weire the dialogue manager and the dialogue GUI
2012-02-05 10:54:56 +01:00
Cris Mihalache
6d4fa9274e
Moved OpenEngine systems into their appropriate classes
2012-01-29 17:31:18 +02:00
Marc Zinnschlag
e3631003e9
Merge remote branch 'yacoby/detailed_fps'
2012-01-17 14:04:00 +01:00
Jacob Essex
e73640e720
Improved code, added labels to the counter
2012-01-17 11:58:06 +00:00
gugus
edbf4f7bdc
forgot to update core.xml
2012-01-16 19:35:35 +01:00
gugus
ba2fc27c2d
oups forgot Cmake stuff
2012-01-16 18:10:16 +01:00
gugus
eb4dea3d87
Previous/Next button implemented
2012-01-16 17:46:25 +01:00
Jacob Essex
18e4b73a86
Added a more detailed fps counter displaying the triangle and batch count
2012-01-16 15:33:21 +00:00
gugus
9031f62962
The journal is now in the center of the screen.
2012-01-11 12:58:39 +01:00