Elderme
ae5f71e50e
Merge branch 'master' into skybox_refactoring
2015-08-07 15:12:56 +02:00
Elderme
87b493aaa2
Cleaned code
2015-08-07 15:11:32 +02:00
Elderme
f583fafd97
Fixed bug (SH textures were not taken into account)
2015-08-07 14:26:38 +02:00
Elderme
30ecf34b37
Spherical harmonics coefficients are no longer recomputed when the ambient light do not change
2015-08-07 13:50:44 +02:00
Marianne Gagnon
518a55d1e3
Fix quad requirements issue causing rescues to wrong quad
2015-08-06 20:24:20 -04:00
Marianne Gagnon
fac5d6550b
Fix use-after-free bug in profile management
2015-08-06 19:40:41 -04:00
Elderme
351be306e1
Fixed memory leak: skybox textures are now freed in VRAM when deleting Skybox
2015-08-06 14:58:45 +02:00
Elderme
9ea3d4958a
Improved coding style and added doxygen comments in ShericalHarmonics class
2015-08-06 14:47:38 +02:00
deve
e1f61040e5
Use unique_ptr instead of auto_ptr
2015-08-06 13:54:29 +02:00
deve
75c1f02615
Restore using unique_ptr instead of auto_ptr in tinygettext.
...
It fixes compiler warnings on gcc 5.1 due to auto_ptr deprecation. It also makes our tinygettext fork closer to the upstream sources. And we use c++11 in other places anyway.
2015-08-06 13:54:11 +02:00
hiker
52e8df44fd
Fixed compiler warning.
2015-08-06 16:47:41 +10:00
hiker
a19119a2f2
Merge remote-tracking branch 'origin/master' into lensdust
2015-08-06 16:40:00 +10:00
Elderme
0b479a8bb0
Moved spherical harmonics things from IBL.cpp to ShericalHarmonics class
2015-08-05 11:13:25 +02:00
hiker
41f744baf3
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-08-05 17:02:55 +10:00
hiker
b44f0605dc
Try to bring karts quicker back on the ground when the kart is
...
on its side, without overcompensating (and therefore shaking)
when the kart is only slightly non-parallel to the ground
when flying.
2015-08-05 17:00:40 +10:00
Marianne Gagnon
c2feb458af
When restoring ribbon selection, consider that maybe the ribbon does not anymore contain as many items as previously. Fixes #2260
2015-08-04 19:31:38 -04:00
Marianne Gagnon
bd85f51779
Improve memory management in GP manager, fixes #2261
2015-08-04 19:26:12 -04:00
hiker
f36672c104
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-08-05 08:16:10 +10:00
hiker
9e75d28eeb
Write the reverse flag into history files.
2015-08-05 08:15:31 +10:00
hiker
93a5a91628
Fix #2152 (star effect not showing in graphics level 1).
2015-08-05 08:07:58 +10:00
konstin
cdfa571855
remove patch file
2015-08-04 11:15:29 +02:00
Elderme
c3f77a3b72
Fixed kart selection screen rendering (ambient light was broken)
2015-08-04 10:49:39 +02:00
hiker
4f4a1c0373
Added support for reverse mode in history files.
2015-08-04 17:14:36 +10:00
hiker
2a56cc6241
Fix 2192 (key names like "Left" are not translatable).
2015-08-04 09:45:38 +10:00
hiker
340dec329c
Support to mirror a texture around U or V axis if a track is driven
...
in reverse.
2015-08-03 23:25:11 +10:00
hiker
6f11156c04
Fixed crash if a player kart in a saved GP is deleted.
2015-08-03 22:02:13 +10:00
Elderme
53b6ab0a48
Moved specular probe computations from IBL files to Skybox class
2015-08-03 11:35:51 +02:00
hiker
8d0cad3cb8
Use proper call instead of hard coded constant.
2015-08-03 15:44:44 +10:00
hiker
a852cf94fb
Don't save random GPs (which can not be continued anyway), and allow only
...
one saved data set (for each GP and difficulty). Previously saved 'random'
GPs (which can't be continued anyway) are deleted now, cleaning up the
config.xml file.
2015-08-03 15:10:36 +10:00
hiker
085627364c
Fix #2162 (switch kart when loading a GP).
2015-08-03 07:53:21 +10:00
Elderme
6fc28b5d7c
Removed render_skybox.cpp file
2015-08-02 23:07:05 +02:00
Elderme
3a50a4d5d2
Moved remaining spherical harmonic things from render_skybox.cpp to SphericalHarmonic class
2015-08-02 23:01:52 +02:00
Elderme
2817fda910
Merge branch 'master' into skybox_refactoring
2015-08-02 00:09:10 +02:00
Elderme
a8b16bb1d4
Fixed bug in tracks without skybox
2015-08-01 23:45:46 +02:00
hiker
2f902f769d
Fixed minor memory leak.
2015-08-01 22:02:00 +10:00
hiker
78c592e4e5
Added a file with a 'unique filename' with version number which is used by STK
...
to detect that stk is reading the right data files (and therefore avoids #2073 ,
in which stk finds the wrong data directory).
2015-07-31 22:06:21 +10:00
hiker
b6165ce5f5
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-07-31 16:51:27 +10:00
hiker
a81366c414
Removed rescue-code duplication in battle mode and soccer mode.
2015-07-31 16:27:52 +10:00
hiker
431853b451
Removed some unused code, added better error message in case
...
stk_config.xml could not be found.
2015-07-31 15:45:25 +10:00
hiker
9557ad9be9
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-07-31 07:51:23 +10:00
hiker
25c1880c18
Fixed rescue in soccer mode (which would previously used World's
...
moveKartAfterRescue, not its own custom function).
2015-07-31 07:49:54 +10:00
Tobias Markus
a9761e30da
Fix various issues reported by coverity
2015-07-30 18:46:01 +02:00
Elderme
8642e14bc3
Removed m_diffuse_coefficients_calculated attribute in RTT (diffuse coefficients are now managed in SphericalHarmonic class)
2015-07-30 17:51:42 +02:00
hiker
bf858dd3ff
Fixed compiler warning.
2015-07-30 17:14:18 +10:00
hiker
7799e9835d
Added a getStartTransform function to World. Use this to change
...
the start position of the non-leader karts in a FTL race, so that
those karts now start at the end of all start positions, and not
directly behind the leader.
2015-07-30 17:12:48 +10:00
Elderme
39d1c87b11
Fixed incorrect rendering when there is no spherical harmonic textures
2015-07-30 08:14:57 +02:00
Elderme
97ed8b2dbf
splitted skybox class in Skybox and SphericalHarmonic classes
2015-07-30 08:14:57 +02:00
Elderme
3640e4a69a
Move skybox things from irr_driver to Skybox class.
2015-07-30 08:14:57 +02:00
Elderme
cf40c402ba
Add a Skybox class
2015-07-30 08:14:57 +02:00
Marianne Gagnon
738e7bc780
Fix inverted if condition in input options screen, fixes #2255
2015-07-29 18:55:40 -04:00
hiker
b18d0275fd
Display a finish (survival) time in FTL result screen.
2015-07-29 17:27:43 +10:00
hiker
d27ba5f6fe
Fix #2249 (show points and points increasing in a FTL GP).
2015-07-29 08:58:42 +10:00
hiker
6ada5a0666
Revert "Properly ignore the leader in the ftl scoreboard"
...
(this patch only fixed the problem that happens when a non-leader
is number one. By now the code has fixed that it is guaranteed
that the leader is always number one, so this patch is not
necessary anymore, and it complicates the loop).
This reverts commit e9d78326fb
.
Conflicts:
src/states_screens/race_result_gui.cpp
2015-07-29 08:12:23 +10:00
hiker
3f468b254c
Removed unused/duplicated code, use World::setKartPosition instead
...
of Kart::setPosition (since this will keep an index array up-to-date).
2015-07-29 07:59:46 +10:00
hiker
8dbaea6456
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-07-28 09:40:27 +10:00
hiker
5efb44a430
Fixed scores in FTL GPs. All score handling is now done by the World,
...
not race manager (which removes if tests).
2015-07-28 09:39:00 +10:00
hiker
5c66273712
Fixed compiler warning.
2015-07-27 16:41:46 +10:00
hiker
95b86ea914
Fixed #2247 .
2015-07-27 09:56:58 +10:00
auriamg
35949b198a
Merge pull request #2252 from tobbi/fix_story_mode_crash
...
Fix crash when loading story mode
2015-07-26 19:06:20 -04:00
Marianne Gagnon
51fe38f76e
Use <cmath> instead of <math.h>, apparently fixes OSX compilation. Closes #2253
2015-07-26 19:05:05 -04:00
auriamg
df1bb8b3dd
Merge pull request #1956 from Flakebi/feature
...
Use camera position for LoD instead of the kart position, fixes #1742
2015-07-26 18:54:22 -04:00
Tobias Markus
fcc3e75a99
Fix crash when loading story mode
2015-07-26 16:41:36 +02:00
samuncle
51bd87d303
ground work for lens dust
2015-07-26 04:48:29 +02:00
Marianne Gagnon
4356dfde0c
Document missing command-line option, fixes #2095
2015-07-25 20:06:42 -04:00
Marianne Gagnon
e0dd736a7c
Main menu : prevent text on mouse over from overflowing the bounds of the screen. FIxes #2163
2015-07-25 19:55:17 -04:00
hiker
d9e806f610
Changed unsigned int to int (dest_pos can become negative, and
...
while de-facto it still works with unsigned, it's just bad style :) ).
2015-07-26 00:32:11 +10:00
hiker
a9aa37ea97
Minor code style fixes.
2015-07-26 00:31:15 +10:00
hiker
c8909b9197
Fixed missing display of points for non-winners in a FTL GP (partly fix
...
for #2249 ).
2015-07-26 00:30:09 +10:00
hiker
cd256061e1
Fix #2248 (crash when taking screenshot). The assert was not appropriate
...
(avoiding the call to clearAllMessages would have been quite ugly).
2015-07-26 00:26:43 +10:00
hiker
76a779fc1c
Merge branch 'ftl-scoreboard' of https://github.com/Flakebi/stk-code into Flakebi-ftl-scoreboard
2015-07-25 12:17:02 +10:00
hiker
622d0821cf
Fixed rescue (which my previous commit broke).
2015-07-24 21:38:35 +10:00
hiker
6345272727
Removed unnecessary #include in kart.hpp.
2015-07-24 16:51:03 +10:00
hiker
ac779d0652
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-07-24 16:40:37 +10:00
hiker
a2c4160ce0
Added TerrainInfo raycast to debug view.
2015-07-24 16:37:13 +10:00
hiker
cefce3152c
Fixed #2246 .
2015-07-24 16:36:55 +10:00
hiker
672314fbe2
Added camera-at-side-of-kart debug mode.
2015-07-24 11:00:13 +10:00
hiker
8bc398a1c1
Merge remote-tracking branch 'origin/master' into Flakebi-fixes
2015-07-24 10:23:47 +10:00
Marianne Gagnon
aacf1293da
Eliminated karts in GPs get 0 points. Fixes #2177
2015-07-23 20:01:54 -04:00
Marianne Gagnon
5c27769ceb
Fix uninitialized variable use, fixes #2179
2015-07-23 19:52:30 -04:00
Marianne Gagnon
52313c1468
Draw achievements a bit later so that they are on top. FIxes #2237
2015-07-23 19:21:43 -04:00
auriamg
5164a55472
Merge pull request #2244 from Flakebi/addons-rtl
...
Fix reversed rtl string part
2015-07-22 18:35:22 -04:00
hiker
2f51406e3d
Made field-of-view configurable in the config file.
2015-07-22 08:12:44 +10:00
Flakebi
2eb0f151b7
Fix reversed rtl string part
2015-07-21 11:52:23 +02:00
hiker
bb058deea5
Avoid that the kart is 'shaking' backwards/forwards when flying.
2015-07-21 16:56:51 +10:00
hiker
cd8fd7fb16
Merge remote-tracking branch 'origin/master' into Flakebi-fixes
2015-07-20 09:10:05 +10:00
hiker
8be383015c
Simplified shadow interface.
2015-07-19 13:44:05 +10:00
hiker
91c40e27c2
Reduced number of parameters for Shadow.
2015-07-18 23:41:27 +10:00
hiker
dc68f5f122
Fixed crash when real shadows are used.
2015-07-18 12:26:18 +10:00
hiker
802d4897fe
Removed unused kart properties settings.
2015-07-18 12:24:56 +10:00
hiker
e755a7eda8
Merge remote-tracking branch 'origin/master' into graphical_chassis_to_physical_chassis
2015-07-18 11:53:49 +10:00
hiker
ffb3c2ce4c
Moved visual slightly higher (hopefully as much as in the previous implementation),
...
to avoid that the visual chassis disappears into the ground.
2015-07-18 11:42:33 +10:00
hiker
d94f6ffe66
Added documentation about the visual chassis and wheel positioniong.
...
Removed unused/old coda, and moved kart at exactly the same position
as they are in blender.
2015-07-18 10:21:01 +10:00
Marianne Gagnon
675b0b9458
Improve scripting error handling, more work on different shapes for collision triggers
2015-07-17 19:18:12 -04:00
Marianne Gagnon
3cb57358a3
Fix #2242
2015-07-16 19:38:34 -04:00
hiker
68cea42648
Fixed visual position of chassis, wheels and shadow.
2015-07-15 16:35:09 +10:00
Marianne Gagnon
84e78e0d40
Some cleanup to check structures, start adding new cylinder check structure (WIP)
2015-07-14 19:00:00 -04:00
hiker
8c842fb2e8
Fixed incorrect uage of radians.
2015-07-14 22:32:09 +10:00
hiker
210e4fb4ec
Removed optional setting for random-wheel rotation.
2015-07-14 17:36:03 +10:00
hiker
9f687fd6cf
Removed unnecessary computation (now that physics does not include
...
wheel rotation).
2015-07-14 17:27:06 +10:00
Marianne Gagnon
77fac34e41
More cleanup to remove hardcoded things in favor of scripting, and start work to allow for more action trigger shapes (work in progress)
2015-07-13 20:27:16 -04:00
hiker
93282f8abf
Completely removed the usage of a physical wheel radius in the physics, it was
...
never really necessary, the phsyics are basically the same). Wheel rotation is
was refactored to be completely done in KartModel now.
2015-07-09 23:59:53 +10:00
hiker
0345565ea8
Fixed handling of tall karts (accidentally committed debug version).
2015-07-09 16:39:40 +10:00
hiker
3b9e85af0b
Converted bullet's TravelCM (i.e. in cm) into Travel (i.e. in m).
2015-07-09 00:06:19 +10:00
hiker
aa7bf607bf
Minor cosmetic changes.
2015-07-08 16:38:01 +10:00
hiker
7b11e51f2b
Coding style fixes.
2015-07-08 08:31:32 +10:00
hiker
a28ea76b90
Fix wheel position for karts that are too high.
2015-07-08 08:25:10 +10:00
hiker
9eab818d53
Added fused speed-position commands to the commands to be dropped
...
when the sfx queue is too full.
2015-07-08 08:23:55 +10:00
hiker
43f9cf39bc
Fix shadow to be always on the ground, even when a skid-jump is done.
2015-07-08 08:23:25 +10:00
hiker
62e2f05607
Fixed shadow position, improved wheel position.
2015-07-07 17:02:09 +10:00
hiker
12f942c258
Moved debug camera a bit further back.
2015-07-07 17:00:24 +10:00
Flakebi
84e3b9dbe9
Remove SKID_OLD code
2015-07-03 15:38:20 +02:00
Flakebi
d2ca7d11d7
Remove unused/commented out code
2015-07-03 15:36:45 +02:00
Flakebi
fbf26df23d
Merge branch 'master' into fixes
...
Conflicts:
src/graphics/2dutils.cpp
src/graphics/graphics_restrictions.cpp
src/graphics/render_skybox.cpp
src/graphics/rtts.hpp
2015-07-03 15:29:53 +02:00
hiker
70da00de7d
Merge branch 'master' into graphical_chassis_to_physical_chassis
2015-07-03 16:39:20 +10:00
hiker
9b562d31f4
Replaced Widget's set(De)Activated functions with one setActive(bool)
...
function, which simplifies code for various screen a lot.
2015-07-03 16:19:28 +10:00
hiker
8059544b21
Try to fix advanced pipeline.
2015-07-03 08:22:39 +10:00
hiker
f3dee7241f
Merge branch 'master' into graphical_chassis_to_physical_chassis
2015-07-03 08:15:08 +10:00
hiker
ad3a5ac730
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-07-03 08:13:39 +10:00
hiker
747aa39bdf
Disable artificial shadow if shader-based shadows are available.
2015-07-03 08:12:55 +10:00
hiker
97499759ec
Revert "Remove shadow blob"
...
This reverts commit 33c0dfe7c2
.
2015-07-03 07:55:50 +10:00
hiker
0631d10f91
Move graphical chassis and wheels to be at the same location as the physical ones.
2015-07-03 07:49:27 +10:00
hiker
369ed86380
Added 'behind kart' camera which helps debugging graphical
...
vs physical chassis position issues.
2015-07-02 16:39:13 +10:00
hiker
34d22a32c7
Improved distance calculation (so that the same distance to the rear
...
of each kart is reached).
2015-07-02 16:35:51 +10:00
hiker
799b4cdf7e
Minor code cleanup.
2015-07-02 08:04:37 +10:00
hiker
04c84fd23d
Moved skidding lights from Kart into KartGFX.
2015-07-01 18:57:44 +10:00
Marianne Gagnon
92974fc4b3
Fix scripting crash
2015-06-30 21:35:17 -04:00
hiker
8aabb30687
Fixed memory leak.
2015-07-01 08:58:15 +10:00
hiker
576270bb17
Coding style changes, removed dead code and unused variables.
2015-07-01 08:57:40 +10:00
hiker
4ec423ff35
Coding style improvements.
2015-07-01 08:22:43 +10:00
hiker
f82bb996ea
Fixed memory leaks of lights.
2015-07-01 08:04:10 +10:00
hiker
b41035a008
Moved nitro_light from Kart into KartGFX.
2015-06-30 21:49:20 +10:00
hiker
42114c163c
Minor refactoring to move more code into KartGFX.
2015-06-30 16:59:48 +10:00
hiker
1bafdf528f
Fix wheel-view camera.
2015-06-29 16:17:14 +10:00
Marianne Gagnon
1ceb05c2cb
More scripting functions to control particles
2015-06-28 19:10:43 -04:00
Marianne Gagnon
eda00e12f9
Expose length method in scripting vector3
2015-06-28 19:03:09 -04:00
Marianne Gagnon
68eb4eb359
Start work to control particle emitters from scripts, and allow getting kart velocity from script
2015-06-28 19:00:25 -04:00
hiker
08529e167f
Fixed memory leak.
2015-06-29 08:41:46 +10:00
hiker
a9958a60a8
Minor cosmetical changes.
2015-06-29 08:41:20 +10:00
hiker
0dc2e66039
Fixed compiler warnings.
2015-06-29 08:24:31 +10:00
hiker
11a213fa8d
Significantly reduced number of audio sfx commands: instead of sending
...
7 commands for each kart (when only engine is actually playing),
now there is only one command being sent: positions of sfx that are
not playing are not sent anymore, a duplication engine position was
removed, and speed and position are combined into one event.
2015-06-29 08:09:42 +10:00
Marianne Gagnon
f992b864e1
More work on moving track objects via scripting
2015-06-25 19:33:28 -04:00
Marianne Gagnon
be81a7fd11
Increase size of popup, text was truncated at least in french
2015-06-23 18:46:36 -04:00
Marianne Gagnon
74f19f0cbc
Start working on scripting API to move objects
2015-06-22 19:36:30 -04:00
Marianne Gagnon
0fdc7a2d98
Use plural form for resolution change message, fixes #2219 . ALso fix crash in tinygettext code handling plural forms
2015-06-22 19:26:20 -04:00
Marianne Gagnon
ae18901bb2
Try fixing travis build
2015-06-21 19:57:06 -04:00
Marianne Gagnon
b73469caf1
Extend scripting API with random and timeout functions
2015-06-21 19:44:22 -04:00
Marianne Gagnon
9119f5f291
Fixes for scripting documentation
2015-06-21 18:43:31 -04:00
Marianne Gagnon
90cf3176d1
Start adding an audio scripting API, and also fix a deadlock in sfx_manager due to improper release of locks
2015-06-21 18:31:16 -04:00
Marianne Gagnon
789384a7bf
Fix loading scripts in local library nodes
2015-06-18 19:24:39 -04:00
Marianne Gagnon
8119b59af0
More fixes on intially hidden objects
2015-06-18 19:09:13 -04:00
Marianne Gagnon
403d61e754
Allow creating initially hidden objects, that can later be shown through scripting
2015-06-17 19:33:53 -04:00
Marianne Gagnon
b3cc5f9f0d
Try to fix Travis build
2015-06-15 20:09:22 -04:00
Marianne Gagnon
01b9ee2a63
RTT: calculate diffuse coefficients only once
2015-06-15 19:47:52 -04:00
Marianne Gagnon
fa027c11da
Work on hiding/showing library nodes (especially when they contain movable children, which are a special case)
2015-06-15 19:44:31 -04:00
Marianne Gagnon
db55c35ed1
Disable bloom / depth-of-field when using physics debug modes, makes lines easier to see
2015-06-15 19:38:12 -04:00
Marianne Gagnon
97100db507
RTT: avoid computing diffuse coefficients every frame
2015-06-15 19:21:34 -04:00
hiker
edbb6892e0
Added comments.
2015-06-13 12:34:33 +10:00
Marianne Gagnon
e35d5a07b4
Little hack : make the kart selection screen seem faster by moving the cursor immediately, and loading the kart model only on next frame. See #2216
2015-06-11 20:22:30 -04:00
Tobias Markus
b32fff8dad
Fix flags on GetModule call
2015-06-12 00:28:55 +02:00
hiker
d95bdc2ea9
Merge branch 'master' of github.com:supertuxkart/stk-code
2015-06-10 23:18:48 +10:00
hiker
09227fa19d
Finally fully fixed #2213 .
2015-06-10 23:18:06 +10:00
hiker
860135376d
Start to fix resolution change by properly freeing data.
2015-06-10 10:33:47 +10:00
hiker
0162407ff3
Added proper ref-counting.
2015-06-10 10:33:06 +10:00
Marianne Gagnon
32edaa25fe
Adjust load and cleanup sequence for scripts, enabling scripts in library objects
2015-06-09 20:24:17 -04:00
Marianne Gagnon
cb510840ae
Work on scripting, namely improving interaction with library objects
2015-06-05 19:34:46 -04:00
Marianne Gagnon
238578c921
More work towards handling library nodes in scripting
2015-06-04 20:12:03 -04:00
hiker
9531f0b3a4
Merge remote-tracking branch 'origin/master' into refactor_shaders
2015-06-05 09:13:27 +10:00
Marianne Gagnon
bd006c875e
Let track objects know what library object they are part of, paving the way for scripting to interact with library objects
2015-06-03 20:34:58 -04:00
hiker
9a1cba3ac8
Merge remote-tracking branch 'origin/master' into refactor_shaders
2015-06-03 15:11:27 +10:00
hiker
9094cbd31a
Added NoCopy to FrameBuffer objects (copying a frame buffer e.g.
...
as a parameter to a function can lead to incorrect results, likely
because on exit of the function, data in the (copied) frame buffer
object is freed, and then not available for OpenGL anymore.
2015-06-03 15:10:11 +10:00
hiker
f59d277f3e
Improve handling of sudden steeper uphill section by increasing the
...
suspension force, which makes it less likely for the kart to hit
the terrain.
2015-06-03 09:03:40 +10:00
hiker
d4f3fc88d6
Merged pull requests #2191 .
2015-06-02 14:50:32 +10:00
hiker
2cf4341916
Merge remote-tracking branch 'origin/master' into refactor_shaders
2015-06-02 14:49:50 +10:00
hiker
1dabb39ed4
Fixed warnings most likely caused by copying a frame buffer object
...
(missing &), added several const to frame buffer references.
2015-06-02 14:19:15 +10:00
hiker
8fd0b9186a
Merge pull request #2198 from nado/Fix-#2164
...
Fix #2164 : Resized max length of mail address up to 254 chars
2015-06-02 13:47:54 +10:00
Dmitry Marakasov
cfbec1f470
Include cerrno for errno; fixes clang compilation error
2015-06-02 04:36:30 +03:00
hiker
a51d56a6e5
Merge remote-tracking branch 'origin/master' into refactor_shaders
...
Conflicts:
src/tracks/track_object_presentation.cpp
2015-06-01 09:28:23 +10:00
Marianne Gagnon
b3d97241d7
Scripting : cleanup, add poweruptype enum
2015-05-31 18:39:40 -04:00
Marianne Gagnon
501dd14bb6
More scripting work on item-object collisions
2015-05-31 18:20:52 -04:00
hiker
9b2994c975
Added documentation to shader base classes.
2015-06-01 08:19:31 +10:00
hiker
2f287fbee6
Removed unused clean-shader functionality (which is now done by
...
shader.?pp), removed global shader name variable.
2015-06-01 08:14:56 +10:00
Marianne Gagnon
8ef16c146e
Scripting work : improve flyable vs object collision callbacks. More work to do still.
2015-05-31 18:09:51 -04:00
hiker
51fb693455
Remove all kill functions for shader reloading after all shaders
...
have been deleted.
2015-05-30 12:37:39 +10:00
hiker
642216da83
Minor coding style change.
2015-05-30 12:16:38 +10:00
hiker
e5a7f27f19
Renamed files to follow our coding style.
2015-05-30 12:16:11 +10:00
hiker
48235a5d77
Turned ShadowMatrices into a stand-alone proper class.
2015-05-30 11:29:08 +10:00
Marianne Gagnon
40ea7f94f0
Scripting work : improve object-kart collision callbacks
2015-05-28 19:57:36 -04:00
Marianne Gagnon
1ada542fa5
Continue porting overworld to scripting
2015-05-24 19:15:50 -04:00
Marianne Gagnon
4c02204eff
Start porting the overworld to scripting
2015-05-24 18:34:01 -04:00
hiker
855c59db09
Removed global variable shadowSplit (missing in previous commit).
2015-05-22 16:45:09 +10:00
hiker
0b2c44ed71
Removed unused function, minor coding style cleanup.
2015-05-22 16:44:22 +10:00
hiker
5ba3dee122
Moved global variable at least into a class.
2015-05-22 16:37:54 +10:00
hiker
ced9e55639
Moved shared shaders into Shaders class.
2015-05-22 16:26:30 +10:00
hiker
cbd5670764
DIE global function - rest in peace, push up the daisies, kick the bucket.
2015-05-22 11:09:51 +10:00
Marianne Gagnon
0a3daf9484
Scripting work : the tutorial is now completely scripting-powered, nothing hardcoded anymore
2015-05-21 20:26:28 -04:00
hiker
e4f29d4dea
Removed one more reference to global functions.
2015-05-22 10:00:26 +10:00
hiker
30fa3345e4
Removed more references to global function.
2015-05-22 09:57:28 +10:00
hiker
0f8d36889f
Remved references to global function.
2015-05-22 09:51:09 +10:00
hiker
813d80a792
Removed two more references to global function.
2015-05-22 09:45:48 +10:00
hiker
c21f6abeb7
Removed one more reference to global function.
2015-05-22 09:42:42 +10:00
hiker
8577f0d185
Removed one more reference to global function.
2015-05-22 09:40:46 +10:00
hiker
9048b6ffcd
Removed one more reference to global function.
2015-05-22 09:37:34 +10:00
hiker
cc9163ca77
Removed one more reference to global function, renamed functions
...
Bind and BindLayer to bind and bindLayer.
2015-05-22 09:29:42 +10:00
Marianne Gagnon
722cd0e181
Merge branch 'Scripting'
2015-05-21 19:29:01 -04:00
hiker
3a64d2c70e
Removed one more reference to global function.
2015-05-22 09:18:21 +10:00
hiker
d2a7e21632
Removed one more reference to global function.
2015-05-21 17:16:03 +10:00
hiker
18179bd18d
Removed one more reference.
2015-05-21 17:12:59 +10:00
hiker
2c68bd194c
Move more code into shader, removed one more reference to global function.
2015-05-21 17:09:53 +10:00
hiker
6f84a4dca1
Moved functionality into shader.
2015-05-21 16:59:40 +10:00
hiker
959d17ccb5
Moved one more reference to global function, minor coding style adjustments.
2015-05-21 16:46:46 +10:00
hiker
abbd54ffa0
Replaced another global function reference.
2015-05-21 16:43:41 +10:00
hiker
4d6a9726b6
Renamed shader.
2015-05-21 16:37:59 +10:00
hiker
dc8361b941
Fixed spelling of shader.
2015-05-21 11:19:40 +10:00
Marianne Gagnon
8113ea128b
Minor scripting work
2015-05-20 20:17:00 -04:00
hiker
101fcf5df7
Removed more references to global function.
2015-05-21 10:09:43 +10:00
hiker
e9c2f0ecf1
One less DrawFullScreenEffect function.
2015-05-20 17:18:55 +10:00
hiker
d437ffa3bf
Removed more accesses to global DrawFulLScreenEffect function.
2015-05-20 17:11:06 +10:00
hiker
8e6d9d2f41
Removed more references to global DrawFullScreenEffect function.
2015-05-20 16:53:30 +10:00
hiker
dec62d63ea
Fixed linux compilation.
2015-05-20 10:08:38 +10:00
hiker
063fb6b65f
Try to fix linux compilation.
2015-05-20 09:19:59 +10:00
hiker
4ef85d692c
Replaced one more call to DrawFulLScreenEffect.
2015-05-20 09:09:34 +10:00
hiker
e241f167a7
Started to remove global DrawFullScreenEffect template.
2015-05-20 08:41:03 +10:00
hiker
d64428db34
Moved more shaders, cleaned up unused code and other left-over bits.
2015-05-19 23:01:36 +10:00
hiker
e0b1e876f0
Moved more shaders.
2015-05-19 21:10:49 +10:00
hiker
ab4f77e80e
Moved more shaders.
2015-05-19 18:55:32 +10:00
hiker
0c2e6c1640
Moved more shaders.
2015-05-19 18:51:26 +10:00
hiker
553a0a8b58
Moved more shaders.
2015-05-19 16:40:47 +10:00
hiker
52017e31ea
Removed unused shader.
2015-05-19 16:36:24 +10:00
hiker
a401096487
Moved more shaders, minor cleanup of coding style in irr_driver.hpp.
2015-05-19 16:34:07 +10:00
hiker
e94c3e5d3f
Removed unused global variables.
2015-05-19 16:11:54 +10:00
hiker
6d8d78be73
Moved more shaders, moved createVAO into Shader.
2015-05-19 16:07:24 +10:00
hiker
2224f4ebfa
Removed unused shader.
2015-05-19 09:39:04 +10:00
hiker
283a7c58b9
Moved more shaders.
2015-05-19 09:36:28 +10:00
hiker
b40f84e89d
Moved more shaders.
2015-05-19 09:20:29 +10:00
hiker
8e4ee298e0
Moved shaders into render_lighting, fixed coding style for
...
render_lighting.
2015-05-18 21:33:26 +10:00
Nado
2b36759ba3
Resized max length of mail address up to 254 chars
2015-05-18 09:33:21 +02:00
hiker
6def0c752c
Moved more shaders.
2015-05-18 16:52:42 +10:00
hiker
90d7fac6c4
Fixed coding style.
2015-05-18 16:43:30 +10:00
Marianne Gagnon
e290e9003d
Tweak for scripting documentation
2015-05-17 20:12:39 -04:00
Marianne Gagnon
db4c6f4799
Work on scripting console
2015-05-17 20:03:53 -04:00
Marianne Gagnon
080936f144
Work on scripting
2015-05-17 19:27:25 -04:00
hiker
78220d5ed7
Moved more shaders.
2015-05-18 08:49:41 +10:00
hiker
3cb0c6f4c2
Fixed coding style in stkmesh.
2015-05-18 08:22:52 +10:00
hiker
37d787ff38
Fixed linux compilation.
2015-05-17 10:28:37 +10:00
hiker
a50d11df36
Try a different linux fix.
2015-05-17 10:04:01 +10:00
hiker
f0f230b042
Try to fix linux compilation.
2015-05-17 00:56:42 +10:00
hiker
1a09a09dd9
Removed now unnecessary parameter for assignSamplerNames.
2015-05-17 00:22:14 +10:00
hiker
e0ef910137
Renamed TextureRead to TextureShader.
2015-05-17 00:04:19 +10:00
hiker
329a4ac047
Removed multiple inheritance, instead made TextureRead inherit from
...
Shader. work in progress!
2015-05-16 10:39:33 +10:00
Marianne Gagnon
e23f854845
Scripting work
2015-05-14 19:27:32 -04:00