eff648e3ab
Show unhandled SDL events in hexadecimal (easier to compare with the enum)
11 years ago
e7b9b6d87a
Fix a confusing variable name
11 years ago
a3dffd5d57
Add some missing SDL to MyGUI key translations.
...
Most importantly to allow numpad enter as alternative to return key.
11 years ago
edb5a54092
Include some more required Ogre headers explicitely.
11 years ago
ab224f93c9
remove our stdint.h version that uses boost and force usage of system stdint.h
11 years ago
5539c75ef0
Typo fix to avoid divide by zero.
11 years ago
439018e706
Get rid of useless return values
11 years ago
c004fb778f
Get rid of underscore defines. They are reserved by the standard.
11 years ago
6d27ebabb6
Integrate AddGlow with material controllers
11 years ago
19e5978a01
Merge branch 'master' of https://github.com/zinnschlag/openmw
...
Conflicts:
apps/openmw/main.cpp
11 years ago
4bc4af6bf0
Enable microcode caching for Ogre 1.9+
11 years ago
bfd79bfbe6
Various fixes for CppCheck warnings.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
11 years ago
bcf61331ab
Bring back the option to not grab mouse. Useful if running in a mouse-controlled GUI debugger.
11 years ago
7f735c2c4c
Release and show the cursor when focus lost
11 years ago
3452bd2e0b
Add glow effect for enchanted items
11 years ago
b7bb7d6902
Merge remote-tracking branch 'scrawl/master'
...
Conflicts:
apps/opencs/editor.cpp
11 years ago
c3d9bc31bb
Fix exiting OpenMW via the window close button (regression)
11 years ago
e6960d915a
Add simple Ogre widget
11 years ago
2fb059e2fa
Don't destroy the SDL window twice
11 years ago
6f64b1b9db
cmake option to use system tinyxml instead of embedded one
11 years ago
b737d958e1
Merge remote-tracking branch 'kcat/master'
...
Conflicts:
extern/sdl4ogre/cursormanager.hpp
11 years ago
1026e89810
Don't assume TexturePtr is a class
11 years ago
f12d5b728a
Ogre 1.9 compatibility changes
11 years ago
d3d6dfbde8
Refactored loading screen
...
- Add loading progress for data files, global map, terrain
- Refactored and improved cell loading progress
12 years ago
6dc216af3d
Fix a typo, caused occasional white spots on local map render
12 years ago
e7500b22ba
Fixed listener call issue spotted by @scrawl
12 years ago
b8cd3f3915
Merge remote-tracking branch 'corristo/master'
12 years ago
3849c8488c
Use SDL_False instead of -1
12 years ago
4e9ef31375
Added missing(?) break
12 years ago
98216544de
screw tabs
12 years ago
130141ecac
Merge remote-tracking branch 'corristo/master'
12 years ago
e552eccaa4
Fixed endless message loop after trying to resize window on OS X
12 years ago
66608d5c92
Fixed compilation os OS X after moving SDL windowing code to extern/sdl4ogre
12 years ago
7dc30a01cd
Some changes suggested by cppcheck
12 years ago
6164e5bae6
Restored window resizing
12 years ago
50a0d16f8f
Pass only the X11 window to Ogre, otherwise it would treat it as parentWindowHandle instead of externalWindowHandle. parentWindowHandle does not seem to play nice with SDL and occasionally crashes with a GLXBadDrawable error on startup.
12 years ago
b16bc69479
Removed the no longer needed --debug switch
12 years ago
b16c92c2f5
Better handle SDL_TEXTINPUT events
12 years ago
03682184c6
Enable SDL_TEXTINPUT events only when a text input widget currently has key focus
12 years ago
88acebf808
Fix an uninitalized member, and also make sure the mouse is captured when OpenMW starts
12 years ago
5252ffa104
More cleanup
12 years ago
6958940131
Ignore repeated keystrokes, except for text input events
12 years ago
f1ff9b69b3
Mouse grab and relative input need to be disabled when the mouse leaves the window; Disabled resolution switching / window resizing for now due to several glitches
12 years ago
4fb32f7f05
Moved window resize messages to sdlinputwrapper
12 years ago
14a2a26a56
Fullscreen resizing fix
12 years ago
403704b92a
Use openmw.png for SDL_SetWindowIcon
12 years ago
918a1655bb
Restored HW cursor rotation and resolution/fullscreen switching
12 years ago
495aeb5d3b
Merge branch 'master' into HEAD
...
Conflicts:
CMakeLists.txt
apps/openmw/engine.cpp
apps/openmw/mwgui/cursorreplace.cpp
apps/openmw/mwgui/cursorreplace.hpp
apps/openmw/mwgui/windowmanagerimp.cpp
apps/openmw/mwgui/windowmanagerimp.hpp
apps/openmw/mwinput/inputmanagerimp.cpp
libs/openengine/ogre/renderer.cpp
12 years ago
1e7cf4ae1c
GLES2 experiment
12 years ago
a54f8c7ee2
Removed an optimization that caused problems on 32 bit builds
12 years ago
8845c0cee1
Camera relative sky rendering. Now we no longer need to keep sky position in sync with camera.
12 years ago
d6e9cb114e
Forgot to add directory
12 years ago
062ff189a2
Merge branch 'master' into memory
12 years ago
6fbd940a2f
Fix warning issued by GCC 4.8 in oics/tinyxml.cpp
...
Fix warning issued by GCC 4.8 (and as far I remember 4.7 too)
about not supported "%lf" format string:
openmw/extern/oics/tinyxml.cpp: In member function ‘void TiXmlAttribute::SetDoubleValue(double)’:
openmw/extern/oics/tinyxml.cpp:1269:50: warning: ISO C++98 does not support the ‘%lf’ gnu_printf format [-Wformat=]
TIXML_SNPRINTF( buf, sizeof(buf), "%lf", _value);
^
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
12 years ago
75dcf52552
Sync extern/shiny, set memory budgets for texture and mesh managers (however this has no effect yet and depends on changes in Ogre being made)
12 years ago
23b477a938
Fix normal maps with spaces in filename not getting loaded
12 years ago
5625d73d84
Bump texture support
12 years ago
7f8d659f3c
Fix transparency sorting
12 years ago
62c711d709
Small change to delete microcode cache more aggressively.
12 years ago
814969dcae
Cache integrity check uses relative paths, so that changing the build folder works without reset
12 years ago
a7d910614f
extern/shiny update: made caching more robust
12 years ago
bf037b7d29
Removed problematic ModVertexAlpha method, now done in shader
12 years ago
10a3caa504
more resizing fixes from scrawl, share an SDLWindow between the input wrapper and the engine
12 years ago
043e29c620
Have SDL manage the window instead of OGRE to work around SDL Windows bugs (grumble)
12 years ago
b6ec64485c
fix includes for Windows
12 years ago
eb08f407d3
Oops, remove resource leak in the input wrapper.
12 years ago
5a6589af01
extract cursor management to a separate class, have windowmanager communicate with it. Initialize SDL during engine start
12 years ago
d71b583855
fix const cast, fix comment
12 years ago
651a654985
clean up our cursors during destruction
12 years ago
eeacb04fe2
Fully working hardware cursors (if you compile SDL2 with XCursor support)
12 years ago
f9b064d1bc
add preliminary hardware cursor support into sdl4ogre and windowmanagerimp, handle alt-tabbing away from fullscreen gracefully
12 years ago
1117105039
fix compile error with boost includes
12 years ago
a030c03513
support the printscreen button properly
12 years ago
403b6756f5
remove dependency on boost::locale, use system mouse position in in-game menus
12 years ago
601d79ef3f
fix the mouse wheel in mygui
12 years ago
ed644259ce
Move SDL helpers to their own package in extern/, allow conversion from sdl to ois keycodes, (maybe) fix unicode handling
12 years ago
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
12 years ago
f85679db93
Merge branch 'master' into sdl_input
12 years ago
00a2a5c358
remove some more of my mess
12 years ago
3b1d285cf3
fix compile errors, work with unmodified SDL
12 years ago
e18cf452d4
Updated shiny again. Some recent changes were accidently overwritten by eduard on 12/30/2012
12 years ago
884d3ea4d8
Rip out OIS, fill the holes with SDL goodness. WIP.
12 years ago
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
12 years ago
693eeabeca
shiny: fix GLSL texture units when shaders were disabled
12 years ago
7b35b82833
adding shiny
12 years ago
fb3ac6ad4a
no submodule
12 years ago
94f2937c8f
missed a warning
12 years ago
d97184cd4d
fixing some warnings
12 years ago
1f087645a7
update shiny to auto-delete the corresponding cache if a shader was edited
12 years ago
6ac2a12296
item selection working on the preview
12 years ago
b516813b28
fix a problem with older boost versions
12 years ago
21a8dc5ae7
silenced a completely pointless warning
12 years ago
c27ff546e4
shader cache
12 years ago
d7572d815e
Do not define OIS_DYNAMIC_LIB in ICSPrerequisites.h
...
Fixes http://bugs.openmw.org/issues/381
13 years ago
86d6f190bf
Input system rewrite
13 years ago
6077965d27
fix the directx startup issue on windows
13 years ago
d5384403f3
forgot something else
13 years ago
5572421576
submodule update for "fix a typo"
13 years ago
ac5bd38df9
some cmake fixes
13 years ago
268987835d
fix the crash
13 years ago
f0b3142966
switch to glsl 1.2
13 years ago
b2dcf5adcd
support system install for boost wave
13 years ago
6bfcf2bc1b
- exchanged the preprocessor again, no warnings now
...
- disable line directives for now, causing some trouble
13 years ago
21728020f6
fixed the water on local map
13 years ago
9d7470e14c
temp commit
13 years ago
739455e6f8
new water WIP, caustics, chromatic abberation, accurate fresnel, underwater reflection, etc
13 years ago
778e59ee37
terrain as it was before, with about 4x less code
13 years ago
93c641efa7
terrain albedo
13 years ago
16c2ea3a75
terrain colourmap
13 years ago
7731e9a6fa
finished cleaning up sky
13 years ago
b8384162b6
merge
13 years ago
ad7383be43
sky
13 years ago
b2313be6d7
submodule update
13 years ago
865bfc6f47
sync mrt_output setting
13 years ago
1a9f59d5d4
shadows
13 years ago
07fd9986ef
accidently removed the map.
13 years ago
b803d0e949
converted shadow caster shader
13 years ago
81d30ff63a
temp commit
13 years ago
e517e75d09
update
13 years ago
a095572205
fixed some textures, started with sky
13 years ago
71c865e2e9
let there be light
13 years ago
33c48b9481
update
13 years ago
9bd888d9a1
transparency
13 years ago
19ecc7f890
fix performance
13 years ago
f8e3213996
fog, mrt depth
13 years ago
a1e48b0feb
builds now
13 years ago
24399a45c1
add submodule with current code
13 years ago
250fcab7c2
moved the mygui resources to a more suitable location
13 years ago
6827aac42c
fix all mygui.log warnings, fix journal
13 years ago
75d5714fe0
TextEdit, TextBoxEdit, DispEdit fix more consistent
13 years ago
d67ee8b511
console fix more consitent
13 years ago
6b4a35667c
fix window titles
13 years ago
755e05e742
fixed ListBox selected item colour
13 years ago
d1508f5a59
List -> ListBox
13 years ago
560e702973
fixed scroll bars
13 years ago
26aae9d2ce
fix class name typo
13 years ago
161d519206
fixed the dialogue history topic selection
13 years ago
3b76f6dcf4
fixed console log
13 years ago
43349eb539
fixed console command line
13 years ago
ceea51fe9f
fixed TextEdit, TextBoxEdit, DispositionEdit
13 years ago
9933de7c6a
Edit -> EditBox
13 years ago
0af8591c03
Window_MinMax
13 years ago
433a318abb
colour -> textcolour
13 years ago
37290d9638
fix text colours
13 years ago
98f3192448
forgot to git add some stuff
13 years ago
9b31b6272f
fixed the mouse cursors and fixed MWAttribute & MWSkill
13 years ago
2f662a226c
replaced all the StaticText in layouts
13 years ago
64212c0ee6
replaced all the StaticImage and StaticText in code
13 years ago
99461765da
restored another bunch of stuff
13 years ago
0d56a55756
restored journal window background
13 years ago
66baf9ec81
Merge branch 'master' into mygui
13 years ago
3a00fbb950
removed mygui from source tree and use system install instead
13 years ago
4bdfbb6d4f
Merge branch 'master' into dialogue
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
13 years ago
694a537b57
- removed caelum sources, resources, build scripts
13 years ago
d9945a976d
Merge remote branch 'gus/DialogueSystem' into dialogue
13 years ago
abe38e5f87
Started to weire the dialogue manager and the dialogue GUI
13 years ago
6d4fa9274e
Moved OpenEngine systems into their appropriate classes
13 years ago
e3631003e9
Merge remote branch 'yacoby/detailed_fps'
13 years ago
e73640e720
Improved code, added labels to the counter
13 years ago
edbf4f7bdc
forgot to update core.xml
13 years ago
ba2fc27c2d
oups forgot Cmake stuff
13 years ago
eb4dea3d87
Previous/Next button implemented
13 years ago
18e4b73a86
Added a more detailed fps counter displaying the triangle and batch count
13 years ago
9031f62962
The journal is now in the center of the screen.
13 years ago
0178e22605
correct CMake error
13 years ago
bc51ba5a38
Add the journal window (J key). It's still not in the right position.
13 years ago
b157273cd9
Merge branch 'next'
...
Conflicts:
apps/openmw/main.cpp
14 years ago
ac9b1715d5
Added new command line option: "encoding"
...
Added new command line option: "encoding" which allow to
change font encoding used in game messages.
Currently there are three evailable encodings:
win1250 - Central and Eastern European (languages
that use Latin script, such as Polish,
Czech, Slovak, Hungarian, Slovene, Bosnian,
Croatian, Serbian (Latin script),
Romanian and Albanian)
win1251 - languages that use the Cyrillic alphabet
such as Russian, Bulgarian, Serbian Cyrillic
and others
win1252 - Western European (Latin) - default
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
14 years ago
b7c006b898
Mac: further fixes for new resource folder location
14 years ago
23194a932f
creating the buttons on the fly
14 years ago
5db8e8c449
InterMessageBox game mode
14 years ago
e77240dceb
basics for InteractiveMessageBox
14 years ago
d74f834735
make to boxes apear on the correct place even if the oldest is erased
14 years ago
6dc35247da
Word wrap for MessageBox
14 years ago
fc25ccef4e
MW_Dialog set ro right propertys
14 years ago
aab07f379e
added openmw_messagebox_layout.xml to CMakeLists.txt
14 years ago
2d93705baa
created xml file for the layout; MessageBox class
14 years ago
4e7a056e9e
Now working mac app bundle generated during build
...
(includes plugins & resources).
Still need to copy frameworks before deployment.
FindOGRE.cmake finds Ogre plugins dir on OS X.
Default OS X data path set to the data subdir
near .app.
README_Mac updated.
14 years ago
9ddd8e6bf7
README_Mac updated, removed dependency from uuid library on OS X
14 years ago
3b47eb4a69
Two quick fixes for building a windows x64 release
14 years ago
3351d1571e
center text in fps counter
14 years ago
53ac8776ec
added box for fps counter and changed font colour to white
14 years ago
eb58f22ea5
added text alignment to fpscounter widget
14 years ago
5132531f73
added fps counter
14 years ago
15a7cc0674
That should solve link-time problems when building with mingw.
...
Not supplying "SUBSYSTEM:" flags to mingw linker.
Linking mygui with libwinmm - should resolve reference to timeGetTime().
14 years ago
be5562cb2c
Added dialouge window
14 years ago
debf1e3c4f
Updated all remaining dialogs to use the MW_Dialog skin and adjusted window sizes accordingly.
14 years ago
1c1d33e723
Initial work on the stat review dialog.
14 years ago
c45811770a
Added a custom widget for displaying dynamic stats (health, magicka, fatigue). Can show a title/label, graphical bar and detailed text.
14 years ago
232164bfb0
Implemented the final dialog for Generate Class which shows the class that was chosen by the game based on the players chosen questions. The class is currently hardcoded to Acrobat.
14 years ago
b364d47b0b
Implemented the Class Choice dialog which allows the player to choose between three ways to define a class.
...
Added a generic infobox dialog which displays some text and a set of buttons (vertical only for now), this is used for the Class Choice dialogs and the dialogs which shows various questions the player must choose from. The questions are currently hardcoded.
Added more gui states to handle the extra class dialogs (Generate, Pick or Create).
14 years ago
efd9def3a8
Added separate skin sub-elements for the dialog skin which does not show the resize pointer.
14 years ago
8acf04fc08
Added dialog for editing description in custom class dialog.
14 years ago
ee101440a2
Continued work on Class Create dialog. Added sub-dialogs for picking specialization, attribute and skill. Also added some definitions in ESM for attributes and specializations.
14 years ago
d97dad7a86
Initial work on the Class Create dialog.
14 years ago
cd3e976b7c
Added birthsign dialog and spell effect widget.
14 years ago
cd8b88dea1
Introduced custom widgets (skill and attribute) which should make it easier to make new windows. Changed race and class dialog to use the new skill and attribute widgets.
14 years ago
eec34e9f0e
Added dialog for picking class from a list.
14 years ago
001fc0c6e8
The content of the skill list in the stat window is now scrollable with a vertical scroller.
14 years ago
3d01e51254
Added text skin SandBrightText which is a slightly brighter version of SandText, used for group labels in skill list.
14 years ago
scrawl
Bret Curtis
cc9cii
Lukasz Gromanowski
Marc Zinnschlag
Chris Robinson
Nikolay Kasyanov
Jordan Milne
eduard
Michael Mc Donnell
gugus
Cris Mihalache
Jacob Essex
Sebastian Wick
Ace
sergoz
Yuri Krupenin
Jan-Peter Nilsson
Jan Borsodi